fluidB
/
fluidb
1
0
Fork 0
Code Pull Requests Activity

new syntax

Browse Source
main
Ziyang Hu 2 years ago
parent 39700b4217
commit 66889889f1
6 changed files with 195 additions and 195 deletions
Show Stats Download Patch File Download Diff File

16
IN_PROG.md
Unescape Escape View File

@ -20,32 +20,32 @@ that uses Datalog for query and focuses on graph data.
## Teasers
In the following, `@route` refers to a relation with two columns named `src` and `dst`,
In the following, `*route` refers to a relation with two columns named `src` and `dst`,
representing routes between airports.
Find airports reachable by one stop from Frankfurt Airport (code `FRA`, the busiest airport in the world):
```js
?[dst] := @route{src: 'FRA', dst: stop},
@route{src: stop, dst}
?[dst] := *route{src: 'FRA', dst: stop},
*route{src: stop, dst}
```
Find _all_ airports reachable from Frankfurt (i.e., the transitive closure)
with code starting with the letter `A`:
```js
reachable[dst] := @route{src: 'FRA', dst}
reachable[dst] := reachable[src], @route{src, dst}
reachable[dst] := *route{src: 'FRA', dst}
reachable[dst] := reachable[src], *route{src, dst}
?[airport] := reachable[airport], starts_with(airport, 'A')
```
Compute the shortest path between Frankfurt and all airports in the world with recursion through aggregation:
```js
shortest_paths[dst, shortest(path)] := @route{src: 'FRA', dst},
shortest_paths[dst, shortest(path)] := *route{src: 'FRA', dst},
path = ['FRA', dst]
shortest_paths[dst, shortest(path)] := shortest_paths[stop, prev_path],
@route{src: stop, dst},
*route{src: stop, dst},
path = append(prev_path, dst)
?[dst, path] := shortest_paths[dst, path]
```
@ -54,7 +54,7 @@ Use a fixed rule to compute the shortest path:
```js
starting[airport] := airport = 'FRA'
?[src, dst, cost, path] <~ ShortestPathDijkstra(@route[], starting[])
?[src, dst, cost, path] <~ ShortestPathDijkstra(*route[], starting[])
```
## Learning Cozo

2
docs/source/stored.rst
Unescape Escape View File

@ -10,7 +10,7 @@ Stored relations
---------------------------
We already know how to query stored relations:
use the ``@relation[...]`` or ``@relation{...}`` atoms in inline or fixed rules.
use the ``*relation[...]`` or ``*relation{...}`` atoms in inline or fixed rules.
To manipulate stored relations, use one of the following query options:
.. module:: QueryOp

136
docs/tutorial/tutorial.ipynb
Unescape Escape View File

@ -1863,7 +1863,7 @@
}
],
"source": [
"?[a, b] := @stored[a, b]"
"?[a, b] := *stored[a, b]"
]
},
{
@ -1928,7 +1928,7 @@
}
],
"source": [
"?[a, b] := @stored{l2: b, l1: a}"
"?[a, b] := *stored{l2: b, l1: a}"
]
},
{
@ -1990,7 +1990,7 @@
}
],
"source": [
"?[l2] := @stored{l2}"
"?[l2] := *stored{l2}"
]
},
{
@ -2115,7 +2115,7 @@
}
],
"source": [
"?[l1, l2] := @stored[l1, l2]"
"?[l1, l2] := *stored[l1, l2]"
]
},
{
@ -2235,7 +2235,7 @@
}
],
"source": [
"?[l1, l2] := @stored[l1, l2]"
"?[l1, l2] := *stored[l1, l2]"
]
},
{
@ -2499,7 +2499,7 @@
}
],
"source": [
"?[a, b, c] := @fd[a, b, c]"
"?[a, b, c] := *fd[a, b, c]"
]
},
{
@ -2642,7 +2642,7 @@
}
],
"source": [
"?[a, b, c] := @fd[a, b, c]"
"?[a, b, c] := *fd[a, b, c]"
]
},
{
@ -2960,7 +2960,7 @@
}
],
"source": [
"?[loved_by_b_e] := @love['eve', loved_by_b_e], @love['bob', loved_by_b_e]"
"?[loved_by_b_e] := *love['eve', loved_by_b_e], *love['bob', loved_by_b_e]"
]
},
{
@ -3026,7 +3026,7 @@
}
],
"source": [
"?[loved_by_b_e] := @love['eve', loved_by_b_e] or @love['bob', loved_by_b_e], \n",
"?[loved_by_b_e] := *love['eve', loved_by_b_e] or *love['bob', loved_by_b_e], \n",
" loved_by_b_e != 'bob', \n",
" loved_by_b_e != 'eve'"
]
@ -3094,10 +3094,10 @@
}
],
"source": [
"?[loved_by_b_e] := @love['eve', loved_by_b_e], \n",
"?[loved_by_b_e] := *love['eve', loved_by_b_e], \n",
" loved_by_b_e != 'bob', \n",
" loved_by_b_e != 'eve'\n",
"?[loved_by_b_e] := @love['bob', loved_by_b_e], \n",
"?[loved_by_b_e] := *love['bob', loved_by_b_e], \n",
" loved_by_b_e != 'bob', \n",
" loved_by_b_e != 'eve'"
]
@ -3181,7 +3181,7 @@
}
],
"source": [
"?[loved] := @love[person, loved], !ends_with(person, 'e')"
"?[loved] := *love[person, loved], !ends_with(person, 'e')"
]
},
{
@ -3247,7 +3247,7 @@
}
],
"source": [
"?[loved_by_e_not_b] := @love['eve', loved_by_e_not_b], not @love['bob', loved_by_e_not_b]"
"?[loved_by_e_not_b] := *love['eve', loved_by_e_not_b], not *love['bob', loved_by_e_not_b]"
]
},
{
@ -3284,7 +3284,7 @@
"\n",
" \u001b[31m×\u001b[0m Symbol 'not_loved_by_b' in rule head is unbound\n",
" ╭────\n",
" \u001b[2m1\u001b[0m │ ?[not_loved_by_b] := not @love['bob', not_loved_by_b]\n",
" \u001b[2m1\u001b[0m │ ?[not_loved_by_b] := not *love['bob', not_loved_by_b]\n",
" · \u001b[35;1m ──────────────\u001b[0m\n",
" ╰────\n",
"\u001b[36m help: \u001b[0mNote that symbols occurring only in negated positions are not considered bound\n"
@ -3296,7 +3296,7 @@
}
],
"source": [
"?[not_loved_by_b] := not @love['bob', not_loved_by_b]"
"?[not_loved_by_b] := not *love['bob', not_loved_by_b]"
]
},
{
@ -3386,10 +3386,10 @@
}
],
"source": [
"the_population[p] := @love[p, _a]\n",
"the_population[p] := @love[_a, p]\n",
"the_population[p] := *love[p, _a]\n",
"the_population[p] := *love[_a, p]\n",
"\n",
"?[not_loved_by_b] := the_population[not_loved_by_b], not @love['bob', not_loved_by_b]"
"?[not_loved_by_b] := the_population[not_loved_by_b], not *love['bob', not_loved_by_b]"
]
},
{
@ -3471,8 +3471,8 @@
}
],
"source": [
"alice_love_chain[person] := @love['alice', person]\n",
"alice_love_chain[person] := alice_love_chain[in_person], @love[in_person, person]\n",
"alice_love_chain[person] := *love['alice', person]\n",
"alice_love_chain[person] := alice_love_chain[in_person], *love[in_person, person]\n",
"\n",
"?[chained] := alice_love_chain[chained]"
]
@ -3537,7 +3537,7 @@
}
],
"source": [
"alice_love_chain[person] := alice_love_chain[in_person], @love[in_person, person]\n",
"alice_love_chain[person] := alice_love_chain[in_person], *love[in_person, person]\n",
"\n",
"?[chained] := alice_love_chain[chained]"
]
@ -3689,7 +3689,7 @@
}
],
"source": [
"?[person, count(loved_by)] := @love[loved_by, person]"
"?[person, count(loved_by)] := *love[loved_by, person]"
]
},
{
@ -3806,7 +3806,7 @@
}
],
"source": [
"?[loving, loved] := @love{ loving, loved }"
"?[loving, loved] := *love{ loving, loved }"
]
},
{
@ -3870,7 +3870,7 @@
}
],
"source": [
"?[loving, loved] := @love{ loving, loved }\n",
"?[loving, loved] := *love{ loving, loved }\n",
"\n",
":limit 1"
]
@ -3966,7 +3966,7 @@
}
],
"source": [
"?[loving, loved] := @love{ loving, loved }\n",
"?[loving, loved] := *love{ loving, loved }\n",
"\n",
":order -loved, loving\n",
":offset 1"
@ -4163,7 +4163,7 @@
}
],
"source": [
"?[person, page_rank] <~ PageRank(@love[])\n",
"?[person, page_rank] <~ PageRank(*love[])\n",
"\n",
":order -page_rank"
]
@ -4635,8 +4635,8 @@
"?[entity, contained] :=\n",
" res[idx, fr_i, to_i, typ],\n",
" typ == 'contains',\n",
" @idx2code[fr_i, entity],\n",
" @idx2code[to_i, contained]\n",
" *idx2code[fr_i, entity],\n",
" *idx2code[to_i, contained]\n",
"\n",
"\n",
":replace contain { entity: String, contained: String }"
@ -4709,8 +4709,8 @@
"?[fr, to, dist] :=\n",
" res[idx, fr_i, to_i, typ, dist],\n",
" typ == 'route',\n",
" @idx2code[fr_i, fr],\n",
" @idx2code[to_i, to]\n",
" *idx2code[fr_i, fr],\n",
" *idx2code[to_i, to]\n",
"\n",
":replace route { fr: String, to: String => dist: Float }"
]
@ -5014,7 +5014,7 @@
}
],
"source": [
"?[code, city, desc, region, runways, lat, lon] := @airport{code, city, desc, region, runways, lat, lon}\n",
"?[code, city, desc, region, runways, lat, lon] := *airport{code, city, desc, region, runways, lat, lon}\n",
" \n",
":limit 5"
]
@ -5183,7 +5183,7 @@
}
],
"source": [
"?[code, city, desc, region, runways, lat, lon] := @airport{code, city, desc, region, runways, lat, lon}\n",
"?[code, city, desc, region, runways, lat, lon] := *airport{code, city, desc, region, runways, lat, lon}\n",
"\n",
":order -runways\n",
":limit 10"
@ -5248,7 +5248,7 @@
}
],
"source": [
"?[count(code)] := @airport{code}"
"?[count(code)] := *airport{code}"
]
},
{
@ -5440,7 +5440,7 @@
}
],
"source": [
"?[count(initial), initial] := @airport{code}, initial = first(chars(code))\n",
"?[count(initial), initial] := *airport{code}, initial = first(chars(code))\n",
"\n",
":order initial"
]
@ -5517,7 +5517,7 @@
],
"source": [
"?[count(r), count_unique(r), sum(r), min(r), max(r), mean(r), std_dev(r)] := \n",
" @airport{runways: r}"
" *airport{runways: r}"
]
},
{
@ -5595,7 +5595,7 @@
}
],
"source": [
"?[desc] := @country{code, desc}, not @airport{country: code}"
"?[desc] := *country{code, desc}, not *airport{country: code}"
]
},
{
@ -5718,7 +5718,7 @@
}
],
"source": [
"?[fr, to, dist] := @route{fr, to, dist}\n",
"?[fr, to, dist] := *route{fr, to, dist}\n",
"\n",
":limit 10"
]
@ -5927,7 +5927,7 @@
}
],
"source": [
"?[code, desc] := @airport{code, desc}, not @route{fr: code}, not @route{to: code}"
"?[code, desc] := *airport{code, desc}, not *route{fr: code}, not *route{to: code}"
]
},
{
@ -6014,7 +6014,7 @@
}
],
"source": [
"route_count[fr, count(fr)] := @route{fr}\n",
"route_count[fr, count(fr)] := *route{fr}\n",
"?[code, n] := route_count[code, n]\n",
"\n",
":sort -n\n",
@ -6080,9 +6080,9 @@
}
],
"source": [
"routes[unique(r)] := @contain['EU', fr],\n",
" @route{fr, to},\n",
" @airport{code: to, country: 'US'},\n",
"routes[unique(r)] := *contain['EU', fr],\n",
" *route{fr, to},\n",
" *airport{code: to, country: 'US'},\n",
" r = [fr, to]\n",
"?[n] := routes[rs], n = length(rs)"
]
@ -6146,9 +6146,9 @@
}
],
"source": [
"?[count_unique(to)] := @contain['EU', fr],\n",
" @route{fr, to},\n",
" @airport{code: to, country: 'US'}\n"
"?[count_unique(to)] := *contain['EU', fr],\n",
" *route{fr, to},\n",
" *airport{code: to, country: 'US'}\n"
]
},
{
@ -6235,7 +6235,7 @@
}
],
"source": [
"?[code, count(code)] := @airport{code, city: 'London', region: 'GB-ENG'}, @route{fr: code}"
"?[code, count(code)] := *airport{code, city: 'London', region: 'GB-ENG'}, *route{fr: code}"
]
},
{
@ -6305,9 +6305,9 @@
}
],
"source": [
"lon_uk_airports[code] := @airport{code, city: 'London', region: 'GB-ENG'}\n",
"one_hop[to] := lon_uk_airports[fr], @route{fr, to}, not lon_uk_airports[to];\n",
"?[count_unique(a3)] := one_hop[a2], @route{fr: a2, to: a3}, not lon_uk_airports[a3];"
"lon_uk_airports[code] := *airport{code, city: 'London', region: 'GB-ENG'}\n",
"one_hop[to] := lon_uk_airports[fr], *route{fr, to}, not lon_uk_airports[to];\n",
"?[count_unique(a3)] := one_hop[a2], *route{fr: a2, to: a3}, not lon_uk_airports[a3];"
]
},
{
@ -6419,8 +6419,8 @@
}
],
"source": [
"?[city, dist] := @route{fr: 'LGW', to, dist},\n",
" @airport{code: to, city}\n",
"?[city, dist] := *route{fr: 'LGW', to, dist},\n",
" *airport{code: to, city}\n",
":order -dist\n",
":limit 10"
]
@ -6514,7 +6514,7 @@
}
],
"source": [
"?[code, desc, lon, lat] := @airport{lon, lat, code, desc}, lon > -0.1, lon < 0.1"
"?[code, desc, lon, lat] := *airport{lon, lat, code, desc}, lon > -0.1, lon < 0.1"
]
},
{
@ -6603,8 +6603,8 @@
}
],
"source": [
"h_box[lon, lat] := @airport{code: 'LHR', lon, lat}\n",
"?[code, desc] := h_box[lhr_lon, lhr_lat], @airport{code, lon, lat, desc},\n",
"h_box[lon, lat] := *airport{code: 'LHR', lon, lat}\n",
"?[code, desc] := h_box[lhr_lon, lhr_lat], *airport{code, lon, lat, desc},\n",
" abs(lhr_lon - lon) < 1, abs(lhr_lat - lat) < 1"
]
},
@ -6667,8 +6667,8 @@
}
],
"source": [
"?[deg_diff] := @airport{code: 'SFO', lat: a_lat, lon: a_lon},\n",
" @airport{code: 'NRT', lat: b_lat, lon: b_lon},\n",
"?[deg_diff] := *airport{code: 'SFO', lat: a_lat, lon: a_lon},\n",
" *airport{code: 'NRT', lat: b_lat, lon: b_lon},\n",
" deg_diff = rad_to_deg(haversine_deg_input(a_lat, a_lon, b_lat, b_lon))"
]
},
@ -6737,11 +6737,11 @@
}
],
"source": [
"shortest[b, min(dist)] := @route{fr: 'LHR', to: b, dist} \n",
"shortest[b, min(dist)] := *route{fr: 'LHR', to: b, dist} \n",
" # Start with the airport 'LHR', retrieve a direct route from 'LHR' to b\n",
"\n",
"shortest[b, min(dist)] := shortest[c, d1], # Start with an existing shortest route from 'LHR' to c\n",
" @route{fr: c, to: b, dist: d2}, # Retrieve a direct route from c to b\n",
" *route{fr: c, to: b, dist: d2}, # Retrieve a direct route from c to b\n",
" dist = d1 + d2 # Add the distances\n",
"\n",
"?[dist] := shortest['YPO', dist] # Extract the answer for 'YPO'. \n",
@ -6821,7 +6821,7 @@
"source": [
"starting[] <- [['LHR']]\n",
"goal[] <- [['YPO']]\n",
"?[starting, goal, distance, path] <~ ShortestPathDijkstra(@route[], starting[], goal[])"
"?[starting, goal, distance, path] <~ ShortestPathDijkstra(*route[], starting[], goal[])"
]
},
{
@ -6962,7 +6962,7 @@
"source": [
"starting[] <- [['LHR']]\n",
"goal[] <- [['YPO']]\n",
"?[starting, goal, distance, path] <~ KShortestPathYen(@route[], starting[], goal[], k: 10)"
"?[starting, goal, distance, path] <~ KShortestPathYen(*route[], starting[], goal[], k: 10)"
]
},
{
@ -7036,10 +7036,10 @@
}
],
"source": [
"code_lat_lon[code, lat, lon] := @airport{code, lat, lon}\n",
"starting[code, lat, lon] := code = 'LHR', @airport{code, lat, lon};\n",
"goal[code, lat, lon] := code = 'YPO', @airport{code, lat, lon};\n",
"?[] <~ ShortestPathAStar(@route[], \n",
"code_lat_lon[code, lat, lon] := *airport{code, lat, lon}\n",
"starting[code, lat, lon] := code = 'LHR', *airport{code, lat, lon};\n",
"goal[code, lat, lon] := code = 'YPO', *airport{code, lat, lon};\n",
"?[] <~ ShortestPathAStar(*route[], \n",
" code_lat_lon[node, lat1, lon1], \n",
" starting[], \n",
" goal[goal, lat2, lon2], \n",
@ -7176,8 +7176,8 @@
}
],
"source": [
"rank[code, score] <~ PageRank(@route[a, b])\n",
"?[code, desc, score] := rank[code, score], @airport{code, desc}\n",
"rank[code, score] <~ PageRank(*route[a, b])\n",
"?[code, desc, score] := rank[code, score], *airport{code, desc}\n",
"\n",
":limit 10;\n",
":order -score"
@ -7304,8 +7304,8 @@
}
],
"source": [
"centrality[code, score] <~ BetweennessCentrality(@route[a, b])\n",
"?[code, desc, score] := centrality[code, score], @airport{code, desc}\n",
"centrality[code, score] <~ BetweennessCentrality(*route[a, b])\n",
"?[code, desc, score] := centrality[code, score], *airport{code, desc}\n",
"\n",
":limit 10;\n",
":order -score"

2
src/cozoscript.pest
Unescape Escape View File

@ -35,7 +35,7 @@ var = @{(XID_START | "_") ~ (XID_CONTINUE | "_")*}
param = @{"$" ~ (XID_CONTINUE | "_")*}
ident = @{XID_START ~ ("_" | XID_CONTINUE)*}
underscore_ident = @{("_" | XID_START) ~ ("_" | XID_CONTINUE)*}
relation_ident = @{"@" ~ compound_ident}
relation_ident = @{"*" ~ compound_ident}
compound_ident = @{ident ~ ("." ~ ident)?}
rule = {rule_head ~ ":=" ~ rule_body ~ ";"?}

2
src/parse/query.rs
Unescape Escape View File

@ -683,7 +683,7 @@ fn parse_algo_rule(
.collect_vec();
rule_args.push(AlgoRuleArg::Stored {
name: Symbol::new(
name.as_str().strip_prefix('@').unwrap(),
name.as_str().strip_prefix('*').unwrap(),
name.extract_span(),
),
bindings,

232
tests/air_routes.rs
Unescape Escape View File

@ -92,8 +92,8 @@ lazy_static! {
?[fr, to, dist] :=
res[idx, fr_i, to_i, typ, dist],
typ == 'route',
@idx2code[fr_i, fr],
@idx2code[to_i, to]
*idx2code[fr_i, fr],
*idx2code[to_i, to]
:replace route { fr: String, to: String => dist: Float }
}
@ -105,8 +105,8 @@ lazy_static! {
?[entity, contained] :=
res[idx, fr_i, to_i, typ],
typ == 'contains',
@idx2code[fr_i, entity],
@idx2code[to_i, contained]
*idx2code[fr_i, entity],
*idx2code[to_i, contained]
:replace contain { entity: String, contained: String }
@ -143,7 +143,7 @@ fn dfs() {
.run_script(
r#"
starting[] <- [['PEK']]
?[] <~ DFS(@route[], @airport[code], starting[], condition: (code == 'LHR'))
?[] <~ DFS(*route[], *airport[code], starting[], condition: (code == 'LHR'))
"#,
&Default::default(),
)
@ -167,7 +167,7 @@ fn bfs() {
.run_script(
r#"
starting[] <- [['PEK']]
?[] <~ BFS(@route[], @airport[code], starting[], condition: (code == 'LHR'))
?[] <~ BFS(*route[], *airport[code], starting[], condition: (code == 'LHR'))
"#,
&Default::default(),
)
@ -190,7 +190,7 @@ fn scc() {
let _ = TEST_DB
.run_script(
r#"
res[] <~ StronglyConnectedComponents(@route[], @airport[code]);
res[] <~ StronglyConnectedComponents(*route[], *airport[code]);
?[grp, code] := res[code, grp], grp != 0;
"#,
&Default::default(),
@ -206,7 +206,7 @@ fn cc() {
let _ = TEST_DB
.run_script(
r#"
res[] <~ ConnectedComponents(@route[], @airport[code]);
res[] <~ ConnectedComponents(*route[], *airport[code]);
?[grp, code] := res[code, grp], grp != 0;
"#,
&Default::default(),
@ -220,10 +220,10 @@ fn astar() {
check_relations();
let astar = Instant::now();
let _ = TEST_DB.run_script(r#"
code_lat_lon[code, lat, lon] := @airport{code, lat, lon}
starting[code, lat, lon] := code = 'HFE', @airport{code, lat, lon};
goal[code, lat, lon] := code = 'LHR', @airport{code, lat, lon};
?[] <~ ShortestPathAStar(@route[], code_lat_lon[node, lat1, lon1], starting[], goal[goal, lat2, lon2], heuristic: haversine_deg_input(lat1, lon1, lat2, lon2) * 3963);
code_lat_lon[code, lat, lon] := *airport{code, lat, lon}
starting[code, lat, lon] := code = 'HFE', *airport{code, lat, lon};
goal[code, lat, lon] := code = 'LHR', *airport{code, lat, lon};
?[] <~ ShortestPathAStar(*route[], code_lat_lon[node, lat1, lon1], starting[], goal[goal, lat2, lon2], heuristic: haversine_deg_input(lat1, lon1, lat2, lon2) * 3963);
"#, &Default::default()).unwrap();
dbg!(astar.elapsed());
}
@ -235,7 +235,7 @@ fn deg_centrality() {
TEST_DB
.run_script(
r#"
deg_centrality[] <~ DegreeCentrality(@route[a, b]);
deg_centrality[] <~ DegreeCentrality(*route[a, b]);
?[total, out, in] := deg_centrality[node, total, out, in];
:order -total;
:limit 10;
@ -256,7 +256,7 @@ fn dijkstra() {
r#"
starting[] <- [['JFK']];
ending[] <- [['KUL']];
res[] <~ ShortestPathDijkstra(@route[], starting[], ending[]);
res[] <~ ShortestPathDijkstra(*route[], starting[], ending[]);
?[path] := res[src, dst, cost, path];
"#,
&Default::default(),
@ -276,7 +276,7 @@ fn yen() {
r#"
starting[] <- [['PEK']];
ending[] <- [['SIN']];
?[] <~ KShortestPathYen(@route[], starting[], ending[], k: 5);
?[] <~ KShortestPathYen(*route[], starting[], ending[], k: 5);
"#,
&Default::default(),
)
@ -292,7 +292,7 @@ fn starts_with() {
let res = TEST_DB
.run_script(
r#"
?[code] := @airport{code}, starts_with(code, 'US');
?[code] := *airport{code}, starts_with(code, 'US');
"#,
&Default::default(),
)
@ -324,7 +324,7 @@ fn range_check() {
let res = TEST_DB
.run_script(
r#"
r[code, dist] := @airport{code}, @route{fr: code, dist};
r[code, dist] := *airport{code}, *route{fr: code, dist};
?[dist] := r['PEK', dist], dist > 7000, dist <= 7722;
"#,
&Default::default(),
@ -343,7 +343,7 @@ fn no_airports() {
let res = TEST_DB
.run_script(
r#"
?[desc] := @country{code, desc}, not @airport{country: code};
?[desc] := *country{code, desc}, not *airport{country: code};
"#,
&Default::default(),
)
@ -370,7 +370,7 @@ fn no_routes_airport() {
let res = TEST_DB
.run_script(
r#"
?[code] := @airport{code}, not @route{fr: code}, not @route{to: code}
?[code] := *airport{code}, not *route{fr: code}, not *route{to: code}
"#,
&Default::default(),
)
@ -398,7 +398,7 @@ fn runway_distribution() {
let res = TEST_DB
.run_script(
r#"
?[runways, count(code)] := @airport{code, runways}
?[runways, count(code)] := *airport{code, runways}
"#,
&Default::default(),
)
@ -427,7 +427,7 @@ fn most_out_routes() {
let res = TEST_DB
.run_script(
r#"
route_count[fr, count(fr)] := @route{fr};
route_count[fr, count(fr)] := *route{fr};
?[code, n] := route_count[code, n], n > 180;
:sort -n;
"#,
@ -459,7 +459,7 @@ fn most_out_routes_again() {
let res = TEST_DB
.run_script(
r#"
route_count[count(fr), fr] := @route{fr};
route_count[count(fr), fr] := *route{fr};
?[code, n] := route_count[n, code], n > 180;
:sort -n;
"#,
@ -491,8 +491,8 @@ fn most_routes() {
let res = TEST_DB
.run_script(
r#"
route_count[a, count(a)] := @route{fr: a}
route_count[a, count(a)] := @route{to: a}
route_count[a, count(a)] := *route{fr: a}
route_count[a, count(a)] := *route{to: a}
?[code, n] := route_count[code, n], n > 400
:sort -n;
"#,
@ -522,7 +522,7 @@ fn airport_with_one_route() {
let res = TEST_DB
.run_script(
r#"
route_count[fr, count(fr)] := @route{fr}
route_count[fr, count(fr)] := *route{fr}
?[count(a)] := route_count[a, n], n == 1;
"#,
&Default::default(),
@ -542,9 +542,9 @@ fn single_runway_with_most_routes() {
.run_script(
r#"
single_or_lgw[code] := code = 'LGW'
single_or_lgw[code] := @airport{code, runways}, runways == 1
out_counts[a, count(a)] := single_or_lgw[a], @route{fr: a}
?[code, city, out_n] := out_counts[code, out_n], @airport{code, city}
single_or_lgw[code] := *airport{code, runways}, runways == 1
out_counts[a, count(a)] := single_or_lgw[a], *route{fr: a}
?[code, city, out_n] := out_counts[code, out_n], *airport{code, city}
:order -out_n;
:limit 10;
@ -574,8 +574,8 @@ fn most_routes_in_canada() {
let res = TEST_DB
.run_script(
r#"
ca_airports[code, count(code)] := @airport{code, country: 'CA'}, @route{fr: code}
?[code, city, n_routes] := ca_airports[code, n_routes], @airport{code, city}
ca_airports[code, count(code)] := *airport{code, country: 'CA'}, *route{fr: code}
?[code, city, n_routes] := ca_airports[code, n_routes], *airport{code, city}
:order -n_routes;
:limit 10;
@ -610,7 +610,7 @@ fn uk_count() {
let res = TEST_DB
.run_script(
r#"
?[region, count(region)] := @airport{country: 'UK', region}
?[region, count(region)] := *airport{country: 'UK', region}
"#,
&Default::default(),
)
@ -631,9 +631,9 @@ fn airports_by_country() {
let res = TEST_DB
.run_script(
r#"
airports_by_country[country, count(code)] := @airport{code, country}
airports_by_country[country, count(code)] := *airport{code, country}
?[country, count] := airports_by_country[country, count];
?[country, count] := @country{code: country}, not airports_by_country[country, _], count = 0
?[country, count] := *country{code: country}, not airports_by_country[country, _], count = 0
:order count
"#,
@ -684,9 +684,9 @@ fn n_airports_by_continent() {
let res = TEST_DB
.run_script(
r#"
airports_by_continent[cont, count(code)] := @airport{code}, @contain[cont, code]
?[cont, max(count)] := @continent{code: cont}, airports_by_continent[cont, count]
?[cont, max(count)] := @continent{code: cont}, count = 0
airports_by_continent[cont, count(code)] := *airport{code}, *contain[cont, code]
?[cont, max(count)] := *continent{code: cont}, airports_by_continent[cont, count]
?[cont, max(count)] := *continent{code: cont}, count = 0
"#,
&Default::default(),
)
@ -711,7 +711,7 @@ fn routes_per_airport() {
.run_script(
r#"
given[] <- [['A' ++ 'U' ++ 'S'],['AMS'],['JFK'],['DUB'],['MEX']]
?[code, count(code)] := given[code], @route{fr: code}
?[code, count(code)] := given[code], *route{fr: code}
"#,
&Default::default(),
)
@ -735,7 +735,7 @@ fn airports_by_route_number() {
let res = TEST_DB
.run_script(
r#"
route_count[fr, count(fr)] := @route{fr}
route_count[fr, count(fr)] := *route{fr}
?[n, collect(code)] := route_count[code, n], n = 106;
"#,
&Default::default(),
@ -754,8 +754,8 @@ fn out_from_aus() {
let res = TEST_DB
.run_script(
r#"
out_by_runways[runways, count(code)] := @route{fr: 'AUS', to: code}, @airport{code, runways}
two_hops[count(a)] := @route{fr: 'AUS', to: a}, @route{fr: a}
out_by_runways[runways, count(code)] := *route{fr: 'AUS', to: code}, *airport{code, runways}
two_hops[count(a)] := *route{fr: 'AUS', to: a}, *route{fr: a}
?[max(total), collect(coll)] := two_hops[total], out_by_runways[n, ct], coll = [n, ct];
"#,
&Default::default(),
@ -778,7 +778,7 @@ fn const_return() {
let res = TEST_DB
.run_script(
r#"
?[name, count(code)] := @airport{code, region: 'US-OK'}, name = 'OK';
?[name, count(code)] := *airport{code, region: 'US-OK'}, name = 'OK';
"#,
&Default::default(),
)
@ -796,11 +796,11 @@ fn multi_res() {
let res = TEST_DB
.run_script(
r#"
total[count(code)] := @airport{code}
high[count(code)] := @airport{code, runways}, runways >= 6
low[count(code)] := @airport{code, runways}, runways <= 2
four[count(code)] := @airport{code, runways}, runways == 4
france[count(code)] := @airport{code, country: 'FR'}
total[count(code)] := *airport{code}
high[count(code)] := *airport{code, runways}, runways >= 6
low[count(code)] := *airport{code, runways}, runways <= 2
four[count(code)] := *airport{code, runways}, runways == 4
france[count(code)] := *airport{code, country: 'FR'}
?[total, high, low, four, france] := total[total], high[high], low[low],
four[four], france[france];
@ -824,8 +824,8 @@ fn multi_unification() {
let res = TEST_DB
.run_script(
r#"
target_airports[collect(code, 5)] := @airport{code}
?[a, count(a)] := target_airports[targets], a in targets, @route{fr: a}
target_airports[collect(code, 5)] := *airport{code}
?[a, count(a)] := target_airports[targets], a in targets, *route{fr: a}
"#,
&Default::default(),
)
@ -847,9 +847,9 @@ fn num_routes_from_eu_to_us() {
let res = TEST_DB
.run_script(
r#"
routes[unique(r)] := @contain['EU', fr],
@route{fr, to},
@airport{code: to, country: 'US'},
routes[unique(r)] := *contain['EU', fr],
*route{fr, to},
*airport{code: to, country: 'US'},
r = [fr, to]
?[n] := routes[rs], n = length(rs);
"#,
@ -869,9 +869,9 @@ fn num_airports_in_us_with_routes_from_eu() {
let res = TEST_DB
.run_script(
r#"
?[count_unique(to)] := @contain['EU', fr],
@route{fr, to},
@airport{code: to, country: 'US'}
?[count_unique(to)] := *contain['EU', fr],
*route{fr, to},
*airport{code: to, country: 'US'}
"#,
&Default::default(),
)
@ -889,7 +889,7 @@ fn num_routes_in_us_airports_from_eu() {
let res = TEST_DB
.run_script(
r#"
?[to, count(to)] := @contain['EU', fr], @route{fr, to}, @airport{code: to, country: 'US'}
?[to, count(to)] := *contain['EU', fr], *route{fr, to}, *airport{code: to, country: 'US'}
:order count(to);
"#,
&Default::default(),
@ -920,10 +920,10 @@ fn routes_from_eu_to_us_starting_with_l() {
let res = TEST_DB
.run_script(
r#"
?[eu_code, us_code] := @contain['EU', eu_code],
?[eu_code, us_code] := *contain['EU', eu_code],
starts_with(eu_code, 'L'),
@route{fr: eu_code, to: us_code},
@airport{code: us_code, country: 'US'}
*route{fr: eu_code, to: us_code},
*airport{code: us_code, country: 'US'}
"#,
&Default::default(),
)
@ -957,8 +957,8 @@ fn len_of_names_count() {
let res = TEST_DB
.run_script(
r#"
?[sum(n)] := @route{fr: 'AUS', to},
@airport{code: to, city},
?[sum(n)] := *route{fr: 'AUS', to},
*airport{code: to, city},
n = length(city)
"#,
&Default::default(),
@ -977,9 +977,9 @@ fn group_count_by_out() {
let res = TEST_DB
.run_script(
r#"
route_count[count(fr), fr] := @route{fr}
route_count[count(fr), fr] := *route{fr}
rc[max(n), a] := route_count[n, a]
rc[max(n), a] := @airport{code: a}, n = 0
rc[max(n), a] := *airport{code: a}, n = 0
?[n, count(a)] := rc[n, a]
:order n;
:limit 10;
@ -1006,8 +1006,8 @@ fn mean_group_count() {
let res = TEST_DB
.run_script(
r#"
route_count[count(fr), fr] := @route{fr};
rc[max(n), a] := route_count[n, a] or (@airport{code: a}, n = 0);
route_count[count(fr), fr] := *route{fr};
rc[max(n), a] := route_count[n, a] or (*airport{code: a}, n = 0);
?[mean(n)] := rc[n, _];
"#,
&Default::default(),
@ -1028,7 +1028,7 @@ fn n_routes_from_london_uk() {
let res = TEST_DB
.run_script(
r#"
?[code, count(code)] := @airport{code, city: 'London', region: 'GB-ENG'}, @route{fr: code}
?[code, count(code)] := *airport{code, city: 'London', region: 'GB-ENG'}, *route{fr: code}
"#,
&Default::default(),
)
@ -1052,9 +1052,9 @@ fn reachable_from_london_uk_in_two_hops() {
let res = TEST_DB
.run_script(
r#"
lon_uk_airports[code] := @airport{code, city: 'London', region: 'GB-ENG'}
one_hop[to] := lon_uk_airports[fr], @route{fr, to}, not lon_uk_airports[to];
?[count_unique(a3)] := one_hop[a2], @route{fr: a2, to: a3}, not lon_uk_airports[a3];
lon_uk_airports[code] := *airport{code, city: 'London', region: 'GB-ENG'}
one_hop[to] := lon_uk_airports[fr], *route{fr, to}, not lon_uk_airports[to];
?[count_unique(a3)] := one_hop[a2], *route{fr: a2, to: a3}, not lon_uk_airports[a3];
"#,
&Default::default(),
)
@ -1072,8 +1072,8 @@ fn routes_within_england() {
let res = TEST_DB
.run_script(
r#"
eng_aps[code] := @airport{code, region: 'GB-ENG'}
?[fr, to] := eng_aps[fr], @route{fr, to}, eng_aps[to],
eng_aps[code] := *airport{code, region: 'GB-ENG'}
?[fr, to] := eng_aps[fr], *route{fr, to}, eng_aps[to],
"#,
&Default::default(),
)
@ -1106,8 +1106,8 @@ fn routes_within_england_time_no_dup() {
let res = TEST_DB
.run_script(
r#"
eng_aps[code] := @airport{code, region: 'GB-ENG'}
?[pair] := eng_aps[fr], @route{fr, to}, eng_aps[to], pair = sorted([fr, to]);
eng_aps[code] := *airport{code, region: 'GB-ENG'}
?[pair] := eng_aps[fr], *route{fr, to}, eng_aps[to], pair = sorted([fr, to]);
"#,
&Default::default(),
)
@ -1137,8 +1137,8 @@ fn hard_route_finding() {
let res = TEST_DB
.run_script(
r#"
reachable[to, choice(p)] := @route{fr: 'AUS', to}, to != 'YYZ', p = ['AUS', to];
reachable[to, choice(p)] := reachable[b, prev], @route{fr: b, to},
reachable[to, choice(p)] := *route{fr: 'AUS', to}, to != 'YYZ', p = ['AUS', to];
reachable[to, choice(p)] := reachable[b, prev], *route{fr: b, to},
to != 'YYZ', p = append(prev, to)
?[p] := reachable['YPO', p]
@ -1166,9 +1166,9 @@ fn na_from_india() {
let res = TEST_DB
.run_script(
r#"
?[ind_a, na_a] := @airport{code: ind_a, country: 'IN'},
@route{fr: ind_a, to: na_a},
@airport{code: na_a, country},
?[ind_a, na_a] := *airport{code: ind_a, country: 'IN'},
*route{fr: ind_a, to: na_a},
*airport{code: na_a, country},
country in ['US', 'CA']
"#,
&Default::default(),
@ -1196,7 +1196,7 @@ fn eu_cities_reachable_from_fll() {
let res = TEST_DB
.run_script(
r#"
?[city] := @route{fr: 'FLL', to}, @contain['EU', to], @airport{code: to, city}
?[city] := *route{fr: 'FLL', to}, *contain['EU', to], *airport{code: to, city}
"#,
&Default::default(),
)
@ -1222,7 +1222,7 @@ fn clt_to_eu_or_sa() {
let res = TEST_DB
.run_script(
r#"
?[to] := @route{fr: 'CLT', to}, c_name in ['EU', 'SA'], @contain[c_name, to]
?[to] := *route{fr: 'CLT', to}, c_name in ['EU', 'SA'], *contain[c_name, to]
"#,
&Default::default(),
)
@ -1249,7 +1249,7 @@ fn london_to_us() {
.run_script(
r#"
?[fr, to] := fr in ['LHR', 'LCY', 'LGW', 'LTN', 'STN'],
@route{fr, to}, @airport{code: to, country: 'US'}
*route{fr, to}, *airport{code: to, country: 'US'}
"#,
&Default::default(),
)
@ -1282,8 +1282,8 @@ fn tx_to_ny() {
let res = TEST_DB
.run_script(
r#"
?[fr, to] := @airport{code: fr, region: 'US-TX'},
@route{fr, to}, @airport{code: to, region: 'US-NY'}
?[fr, to] := *airport{code: fr, region: 'US-TX'},
*route{fr, to}, *airport{code: to, region: 'US-NY'}
"#,
&Default::default(),
)
@ -1311,7 +1311,7 @@ fn denver_to_mexico() {
let res = TEST_DB
.run_script(
r#"
?[city] := @route{fr: 'DEN', to}, @airport{code: to, country: 'MX', city}
?[city] := *route{fr: 'DEN', to}, *airport{code: to, country: 'MX', city}
"#,
&Default::default(),
)
@ -1338,8 +1338,8 @@ fn three_cities() {
let res = TEST_DB
.run_script(
r#"
three[code] := city in ['London', 'Munich', 'Paris'], @airport{code, city}
?[s, d] := three[s], @route{fr: s, to: d}, three[d]
three[code] := city in ['London', 'Munich', 'Paris'], *airport{code, city}
?[s, d] := three[s], *route{fr: s, to: d}, three[d]
"#,
&Default::default(),
)
@ -1369,8 +1369,8 @@ fn long_distance_from_lgw() {
let res = TEST_DB
.run_script(
r#"
?[city, dist] := @route{fr: 'LGW', to, dist},
dist > 4000, @airport{code: to, city}
?[city, dist] := *route{fr: 'LGW', to, dist},
dist > 4000, *airport{code: to, city}
"#,
&Default::default(),
)
@ -1404,7 +1404,7 @@ fn long_routes_one_dir() {
let res = TEST_DB
.run_script(
r#"
?[fr, dist, to] := @route{fr, to, dist}, dist > 8000, fr < to;
?[fr, dist, to] := *route{fr, to, dist}, dist > 8000, fr < to;
"#,
&Default::default(),
)
@ -1436,7 +1436,7 @@ fn longest_routes() {
let res = TEST_DB
.run_script(
r#"
?[fr, dist, to] := @route{fr, to, dist}, dist > 4000, fr < to;
?[fr, dist, to] := *route{fr, to, dist}, dist > 4000, fr < to;
:sort -dist;
:limit 20;
"#,
@ -1467,7 +1467,7 @@ fn longest_routes_from_each_airports() {
let res = TEST_DB
.run_script(
r#"
?[fr, max(dist), choice(to)] := @route{fr, dist, to}
?[fr, max(dist), choice(to)] := *route{fr, dist, to}
:limit 10;
"#,
&Default::default(),
@ -1495,8 +1495,8 @@ fn total_distance_from_three_cities() {
let res = TEST_DB
.run_script(
r#"
three[code] := city in ['London', 'Munich', 'Paris'], @airport{code, city}
?[sum(dist)] := three[a], @route{fr: a, dist}
three[code] := city in ['London', 'Munich', 'Paris'], *airport{code, city}
?[sum(dist)] := three[a], *route{fr: a, dist}
"#,
&Default::default(),
)
@ -1517,8 +1517,8 @@ fn total_distance_within_three_cities() {
let res = TEST_DB
.run_script(
r#"
three[code] := city in ['London', 'Munich', 'Paris'], @airport{code, city}
?[sum(dist)] := three[a], @route{fr: a, dist, to}, three[to]
three[code] := city in ['London', 'Munich', 'Paris'], *airport{code, city}
?[sum(dist)] := three[a], *route{fr: a, dist, to}, three[to]
"#,
&Default::default(),
)
@ -1539,7 +1539,7 @@ fn specific_distance() {
let res = TEST_DB
.run_script(
r#"
?[dist] := @route{fr: 'AUS', to: 'MEX', dist}
?[dist] := *route{fr: 'AUS', to: 'MEX', dist}
"#,
&Default::default(),
)
@ -1557,8 +1557,8 @@ fn n_routes_between() {
let res = TEST_DB
.run_script(
r#"
us_a[a] := @contain['US', a]
?[count(fr)] := @route{fr, to, dist}, dist >= 100, dist <= 200,
us_a[a] := *contain['US', a]
?[count(fr)] := *route{fr, to, dist}, dist >= 100, dist <= 200,
us_a[fr], us_a[to]
"#,
&Default::default(),
@ -1577,8 +1577,8 @@ fn one_stop_distance() {
let res = TEST_DB
.run_script(
r#"
?[code, dist] := @route{fr: 'AUS', to: code, dist: dis1},
@route{fr: code, to: 'LHR', dist: dis2},
?[code, dist] := *route{fr: 'AUS', to: code, dist: dis1},
*route{fr: code, to: 'LHR', dist: dis2},
dist = dis1 + dis2
:order dist;
:limit 10;
@ -1607,7 +1607,7 @@ fn airport_most_routes() {
let res = TEST_DB
.run_script(
r#"
?[fr, count(fr)] := @route{fr}
?[fr, count(fr)] := *route{fr}
:order -count(fr);
:limit 10;
"#,
@ -1635,7 +1635,7 @@ fn north_of_77() {
let res = TEST_DB
.run_script(
r#"
?[city, latitude] := @airport{lat, city}, lat > 77, latitude = round(lat)
?[city, latitude] := *airport{lat, city}, lat > 77, latitude = round(lat)
"#,
&Default::default(),
)
@ -1656,7 +1656,7 @@ fn greenwich_meridian() {
let res = TEST_DB
.run_script(
r#"
?[code] := @airport{lon, code}, lon > -0.1, lon < 0.1
?[code] := *airport{lon, code}, lon > -0.1, lon < 0.1
"#,
&Default::default(),
)
@ -1677,8 +1677,8 @@ fn box_around_heathrow() {
let res = TEST_DB
.run_script(
r#"
h_box[lon, lat] := @airport{code: 'LHR', lon, lat}
?[code] := h_box[lhr_lon, lhr_lat], @airport{code, lon, lat},
h_box[lon, lat] := *airport{code: 'LHR', lon, lat}
?[code] := h_box[lhr_lon, lhr_lat], *airport{code, lon, lat},
abs(lhr_lon - lon) < 1, abs(lhr_lat - lat) < 1
"#,
&Default::default(),
@ -1701,8 +1701,8 @@ fn dfw_by_region() {
let res = TEST_DB
.run_script(
r#"
?[region, collect(to)] := @route{fr: 'DFW', to},
@airport{code: to, country: 'US', region},
?[region, collect(to)] := *route{fr: 'DFW', to},
*airport{code: to, country: 'US', region},
region in ['US-CA', 'US-TX', 'US-FL', 'US-CO', 'US-IL']
"#,
&Default::default(),
@ -1732,8 +1732,8 @@ fn great_circle_distance() {
let res = TEST_DB
.run_script(
r#"
?[deg_diff] := @airport{code: 'SFO', lat: a_lat, lon: a_lon},
@airport{code: 'NRT', lat: b_lat, lon: b_lon},
?[deg_diff] := *airport{code: 'SFO', lat: a_lat, lon: a_lon},
*airport{code: 'NRT', lat: b_lat, lon: b_lon},
deg_diff = round(haversine_deg_input(a_lat, a_lon, b_lat, b_lon));
"#,
&Default::default(),
@ -1756,11 +1756,11 @@ fn aus_to_edi() {
let res = TEST_DB
.run_script(
r#"
us_uk_airports[code] := @airport{code, country: 'UK'}
us_uk_airports[code] := @airport{code, country: 'US'}
routes[to, shortest(path)] := @route{fr: 'AUS', to}, us_uk_airports[to],
us_uk_airports[code] := *airport{code, country: 'UK'}
us_uk_airports[code] := *airport{code, country: 'US'}
routes[to, shortest(path)] := *route{fr: 'AUS', to}, us_uk_airports[to],
path = ['AUS', to];
routes[to, shortest(path)] := routes[a, prev], @route{fr: a, to},
routes[to, shortest(path)] := routes[a, prev], *route{fr: a, to},
us_uk_airports[to],
path = append(prev, to);
?[path] := routes['EDI', path];
@ -1785,9 +1785,9 @@ fn reachable_from_lhr() {
let res = TEST_DB
.run_script(
r#"
routes[to, shortest(path)] := @route{fr: 'LHR', to},
routes[to, shortest(path)] := *route{fr: 'LHR', to},
path = ['LHR', to];
routes[to, shortest(path)] := routes[a, prev], @route{fr: a, to},
routes[to, shortest(path)] := routes[a, prev], *route{fr: a, to},
path = append(prev, to);
?[len, path] := routes[_, path], len = length(path);
@ -1826,10 +1826,10 @@ fn furthest_from_lhr() {
let res = TEST_DB
.run_script(
r#"
routes[to, min_cost(cost_pair)] := @route{fr: 'LHR', to, dist},
routes[to, min_cost(cost_pair)] := *route{fr: 'LHR', to, dist},
path = ['LHR', to],
cost_pair = [path, dist];
routes[to, min_cost(cost_pair)] := routes[a, prev], @route{fr: a, to, dist},
routes[to, min_cost(cost_pair)] := routes[a, prev], *route{fr: a, to, dist},
path = append(first(prev), to),
cost_pair = [path, last(prev) + dist];
?[cost, path] := routes[dst, cost_pair], cost = last(cost_pair), path = first(cost_pair);

Write Preview
Loading…
Cancel
Save