Merge pull request souffle-lang#245 from mmcgr/master

Add 5 new tests of aggregate functions.
b-scholz · Dec 6, 2016 · 7da1038 · 7da1038
2 parents 563af86 + 55ddfe1
commit 7da1038
Show file tree

Hide file tree

Showing 28 changed files with 152 additions and 0 deletions.
diff --git a/tests/evaluation.at b/tests/evaluation.at
@@ -143,3 +143,8 @@ POSITIVE_TEST([circuit_records],[evaluation])
 POSITIVE_TEST([circuit_sat],[evaluation])
 POSITIVE_TEST([factoring],[evaluation])
 POSITIVE_TEST([perfect_numbers],[evaluation])
+POSITIVE_TEST([shortest_path],[evaluation])
+POSITIVE_TEST([shortest_edges],[evaluation])
+POSITIVE_TEST([degree],[evaluation])
+POSITIVE_TEST([highest_degree],[evaluation])
+POSITIVE_TEST([disconnected],[evaluation])
diff --git a/tests/evaluation/degree/InDegree.csv b/tests/evaluation/degree/InDegree.csv
@@ -0,0 +1,4 @@
+b	1
+e	3
+c	1
+d	1
diff --git a/tests/evaluation/degree/OutDegree.csv b/tests/evaluation/degree/OutDegree.csv
@@ -0,0 +1,3 @@
+a	2
+b	2
+c	2
diff --git a/tests/evaluation/degree/degree.dl b/tests/evaluation/degree/degree.dl
@@ -0,0 +1,12 @@
+// Find the shorted outward edge for every Node
+.type Node
+
+.decl Edge(n:Node, m:Node, w:number) input
+
+.decl OutDegree(n:Node, l:number) output
+
+OutDegree(x, l) :- Edge(x, _, _), l = sum 1 : Edge(x, _, _).
+
+.decl InDegree(n:Node, l:number) output
+
+InDegree(x, l) :- Edge(_, x, _), l = sum 1 : Edge(_, x, _).
diff --git a/tests/evaluation/degree/degree.err b/tests/evaluation/degree/degree.err
diff --git a/tests/evaluation/degree/degree.out b/tests/evaluation/degree/degree.out
diff --git a/tests/evaluation/degree/facts/Edge.facts b/tests/evaluation/degree/facts/Edge.facts
@@ -0,0 +1,6 @@
+a	b	1
+a	e	5
+b	c	2
+b	e	4
+c	d	3
+c	e	40
diff --git a/tests/evaluation/disconnected/DisConnected.csv b/tests/evaluation/disconnected/DisConnected.csv
@@ -0,0 +1,27 @@
+a	g
+a	h
+a	f
+b	g
+b	h
+b	f
+c	b
+c	g
+c	h
+c	f
+f	b
+f	e
+f	c
+f	d
+g	b
+g	e
+g	c
+g	d
+h	b
+h	e
+h	c
+h	d
+b	a
+c	a
+f	a
+g	a
+h	a
diff --git a/tests/evaluation/disconnected/disconnected.dl b/tests/evaluation/disconnected/disconnected.dl
@@ -0,0 +1,16 @@
+// Find all disconnected node pairs
+.type Node
+
+.decl Edge(n:Node, m:Node, w:number) input
+
+// Find the connected nodes
+.decl Connected(n:Node, m:Node)
+Connected(n, n) :- Edge(n, _, _).
+Connected(n, n) :- Edge(_, n, _).
+Connected(n, m) :- Edge(n, m, _).
+Connected(n, m) :- Edge(n, z, _), Connected(z, m).
+
+// Find nodes without a connection
+.decl DisConnected(n:Node, m:Node) output
+DisConnected(n, m) :- Edge(n, _, _), Edge(_, m, _), !Connected(n, m).
+DisConnected(n, m) :- Edge(n, _, _), Edge(m, _, _), !Connected(n, m).
diff --git a/tests/evaluation/disconnected/disconnected.err b/tests/evaluation/disconnected/disconnected.err
diff --git a/tests/evaluation/disconnected/disconnected.out b/tests/evaluation/disconnected/disconnected.out
diff --git a/tests/evaluation/disconnected/facts/Edge.facts b/tests/evaluation/disconnected/facts/Edge.facts
@@ -0,0 +1,9 @@
+a	b	1
+a	e	5
+b	c	2
+b	e	4
+c	d	3
+c	e	40
+f	g	1
+g	h	1
+h	f	1
diff --git a/tests/evaluation/highest_degree/HighestInDegree.csv b/tests/evaluation/highest_degree/HighestInDegree.csv
@@ -0,0 +1 @@
+3
diff --git a/tests/evaluation/highest_degree/HighestOutDegree.csv b/tests/evaluation/highest_degree/HighestOutDegree.csv
@@ -0,0 +1 @@
+2
diff --git a/tests/evaluation/highest_degree/facts/Edge.facts b/tests/evaluation/highest_degree/facts/Edge.facts
@@ -0,0 +1,6 @@
+a	b	1
+a	e	5
+b	c	2
+b	e	4
+c	d	3
+c	e	40
diff --git a/tests/evaluation/highest_degree/highest_degree.dl b/tests/evaluation/highest_degree/highest_degree.dl
@@ -0,0 +1,17 @@
+// Find the highest in and out degree nodes in the graph
+.type Node
+
+.decl Edge(n:Node, m:Node, w:number) input
+
+.decl OutDegree(n:Node, l:number)
+OutDegree(x, l) :- Edge(x, _, _), l = sum 1 : Edge(x, _, _).
+
+.decl InDegree(n:Node, l:number)
+InDegree(x, l) :- Edge(_, x, _), l = sum 1 : Edge(_, x, _).
+
+.decl HighestOutDegree(d:number) output
+HighestOutDegree(d) :- OutDegree(_, _), d = max D : OutDegree(_, D).
+
+.decl HighestInDegree(d:number) output
+HighestInDegree(d) :- InDegree(_, _), d = max D : InDegree(_, D).
+
diff --git a/tests/evaluation/highest_degree/highest_degree.err b/tests/evaluation/highest_degree/highest_degree.err
diff --git a/tests/evaluation/highest_degree/highest_degree.out b/tests/evaluation/highest_degree/highest_degree.out
diff --git a/tests/evaluation/shortest_edges/ShortestEdgeFromN.csv b/tests/evaluation/shortest_edges/ShortestEdgeFromN.csv
@@ -0,0 +1,3 @@
+a	1
+b	2
+c	3
diff --git a/tests/evaluation/shortest_edges/facts/Edge.facts b/tests/evaluation/shortest_edges/facts/Edge.facts
@@ -0,0 +1,6 @@
+a	b	1
+a	e	5
+b	c	2
+b	e	4
+c	d	3
+c	e	40
diff --git a/tests/evaluation/shortest_edges/shortest_edges.dl b/tests/evaluation/shortest_edges/shortest_edges.dl
@@ -0,0 +1,8 @@
+// Find the shortest outward edge for every Node
+.type Node
+
+.decl Edge(n:Node, m:Node, w:number) input
+
+.decl ShortestEdgeFromN(n:Node, l:number) output
+
+ShortestEdgeFromN(x, l) :- Edge(x, _, _), l = min Z : Edge(x, _, Z).
diff --git a/tests/evaluation/shortest_edges/shortest_edges.err b/tests/evaluation/shortest_edges/shortest_edges.err
diff --git a/tests/evaluation/shortest_edges/shortest_edges.out b/tests/evaluation/shortest_edges/shortest_edges.out
diff --git a/tests/evaluation/shortest_path/ShortestPath.csv b/tests/evaluation/shortest_path/ShortestPath.csv
@@ -0,0 +1,9 @@
+a	b	1
+a	e	5
+b	c	2
+b	e	4
+c	d	3
+c	e	40
+a	c	3
+b	d	5
+a	d	6
diff --git a/tests/evaluation/shortest_path/facts/Edge.facts b/tests/evaluation/shortest_path/facts/Edge.facts
@@ -0,0 +1,6 @@
+a	b	1
+a	e	5
+b	c	2
+b	e	4
+c	d	3
+c	e	40
diff --git a/tests/evaluation/shortest_path/shortest_path.dl b/tests/evaluation/shortest_path/shortest_path.dl
@@ -0,0 +1,13 @@
+// Find the shortest paths between all nodes, the slow way
+.type Node
+
+.decl Edge(n:Node, m:Node, w:number) input
+
+// Find all paths
+.decl Length   (n:Node, m:Node, l:number)
+Length(x,y,t)  :- t=l, Edge(x,y,l).
+Length(x,y,t+l)  :- Edge(x,z,l), Length(z,y,t).
+
+// Filter out the longest path
+.decl ShortestPath(n:Node, m:Node, l:number) output
+ShortestPath(x, y, a) :- Length(x, y, _), a = min Z : Length(x, y, Z).
diff --git a/tests/evaluation/shortest_path/shortest_path.err b/tests/evaluation/shortest_path/shortest_path.err
diff --git a/tests/evaluation/shortest_path/shortest_path.out b/tests/evaluation/shortest_path/shortest_path.out