Merge branch 'main' into feature/406-non-experimental-aggregates

knowsys · Nov 9, 2023 · 4e46c1d · 4e46c1d
2 parents e72588e + 0f8bf5f
commit 4e46c1d
Show file tree

Hide file tree

Showing 225 changed files with 112 additions and 126 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -5,6 +5,10 @@ on:
     branches:
       - main
 
+concurrency:
+  group: ci-${{ github.ref }}
+  cancel-in-progress: true
+
 env:
   RUST_BACKTRACE: 1
 

diff --git a/nemo-python/tests/test_blackbox.py b/nemo-python/tests/test_blackbox.py
@@ -3,7 +3,7 @@
 import csv
 import os
 import math
-from os.path import dirname, exists, abspath, isfile
+from os.path import dirname, exists, abspath, isfile, isdir
 
 from nmo_python import load_file, NemoEngine, NemoOutputManager
 
@@ -18,82 +18,80 @@ def stringify(value):
     return str(value)
 
 
-def generate_test(file):
+def run_blackbox_test(self, file):
+    os.chdir(self.path)
+
+    program = load_file(file)
     program_name = file.removesuffix(".rls")
-    test_name = "test_" + program_name
+    engine = NemoEngine(program)
+    engine.reason()
+
+    for relation in program.output_predicates():
+        expected_results_file_name = os.path.join(program_name, f"{relation}.csv")
 
-    def run_test(self):
-        os.chdir(self.path)
+        if not exists(expected_results_file_name):
+            continue
 
-        program = load_file(file)
-        engine = NemoEngine(program)
-        engine.reason()
+        with tempfile.TemporaryDirectory() as tmp_dir:
+            output_manager = NemoOutputManager(tmp_dir)
+            engine.write_result(f"{relation}", output_manager)
 
-        for relation in program.output_predicates():
-            expected_results_file_name = os.path.join(
-                program_name, f"{relation}.csv"
-            )
+            with open(os.path.join(tmp_dir, f"{relation}.csv")) as results_file:
+                results = list(csv.reader(results_file))
 
-            if not exists(expected_results_file_name):
-                continue
+            with open(expected_results_file_name) as expected_results_file:
+                expected = list(csv.reader(expected_results_file))
 
-            with tempfile.TemporaryDirectory() as tmp_dir:
-                output_manager = NemoOutputManager(tmp_dir)
-                engine.write_result(f"{relation}", output_manager)
+            for result in results:
+                self.assertTrue(
+                    result in expected,
+                    f"unexpected {result} in {relation}",
+                )
 
-                with open(
-                    os.path.join(tmp_dir, f"{relation}.csv")
-                ) as results_file:
-                    results = list(csv.reader(results_file))
+                expected.remove(result)
+
+            self.assertTrue(
+                len(expected) == 0,
+                f"missing results in {relation}: {expected}",
+            )
 
-                    with open(
-                        expected_results_file_name
-                    ) as expected_results_file:
-                        expected = list(csv.reader(expected_results_file))
 
-                        for result in results:
-                            self.assertTrue(
-                                result in expected,
-                                f"unexpected {result} in {relation}",
-                            )
+def generate_test(file):
+    program_name = file.removesuffix(".rls")
+    test_name = "test_" + program_name
 
-                            expected.remove(result)
+    return test_name, classmethod(lambda self: run_blackbox_test(self, file))
 
-                        self.assertTrue(
-                            len(expected) == 0,
-                            f"missing results in {relation}: {expected}",
-                        )
 
-    return test_name, classmethod(run_test)
+def visit_path(test_path, loader, tests, subgroup_path=[]):
+    os.chdir(test_path)
+    dir_entries = os.listdir(test_path)
+    subgroup_path.append(os.path.basename(test_path))
 
+    for subdir in filter(isdir, dir_entries):
+        visit_path(os.path.join(test_path, subdir), loader, tests, subgroup_path)
+        os.chdir(test_path)
 
-def end_to_end_test_case(test_path):
-    class_name = os.path.basename(test_path)
-    test_case = type(class_name, (unittest.TestCase,), {"path": test_path})
+    rules_files = list(filter(lambda f: isfile(f) and f.endswith(".rls"), dir_entries))
 
-    for file in os.listdir(test_path):
-        if not isfile(os.path.join(test_path, file)):
-            continue
+    if rules_files.count == 0:
+        return
 
-        if not file.endswith(".rls"):
-            continue
+    class_name = "_".join(subgroup_path)
+    test_case = type(class_name, (unittest.TestCase,), {"path": test_path})
 
+    for file in rules_files:
         name, method = generate_test(file)
         setattr(test_case, name, method)
 
-    return test_case
+    tests.addTests(loader.loadTestsFromTestCase(test_case))
+    subgroup_path.pop()
 
 
 def load_tests(loader, tests, pattern):
-    test_cases_dir = os.path.join(
-        dirname(__file__), "..", "..", "resources", "testcases"
-    )
-
-    for directory in os.listdir(test_cases_dir):
-        path = abspath(os.path.join(test_cases_dir, directory))
-        test_case = end_to_end_test_case(path)
-        tests.addTests(loader.loadTestsFromTestCase(test_case))
+    test_cases_dir = os.path.join(dirname(__file__), "..", "..", "resources", "testcases")
 
+    visit_path(abspath(test_cases_dir), loader, tests)
     return tests
 
 

diff --git a/nemo-wasm/src/lib.rs b/nemo-wasm/src/lib.rs
@@ -164,8 +164,8 @@ struct SyncAccessHandleWriter(web_sys::FileSystemSyncAccessHandle);
 #[cfg(web_sys_unstable_apis)]
 impl std::io::Write for SyncAccessHandleWriter {
     fn write(&mut self, buf: &[u8]) -> Result<usize, std::io::Error> {
-        let mut buf: Vec<_> = buf.into();
-        let bytes_written = self.0.write_with_u8_array(&mut buf).map_err(|js_value| {
+        let buf: Vec<_> = buf.into();
+        let bytes_written = self.0.write_with_u8_array(&buf).map_err(|js_value| {
             std_io_error_from_js_value(
                 js_value,
                 "Error while writing to FileSystemSyncAccessHandle",

diff --git a/nemo/src/execution/planning/plan_head_datalog.rs b/nemo/src/execution/planning/plan_head_datalog.rs
@@ -59,7 +59,7 @@ impl HeadStrategy for DatalogStrategy {
         current_plan: &mut SubtableExecutionPlan,
         body: ExecutionNodeRef,
         _rule_info: &RuleInfo,
-        variable_order: VariableOrder,
+        variable_order: &VariableOrder,
         step: usize,
     ) {
         for (predicate, head_instructions) in self.predicate_to_atoms.iter() {
@@ -72,7 +72,7 @@ impl HeadStrategy for DatalogStrategy {
             let mut project_append_nodes =
                 Vec::<ExecutionNodeRef>::with_capacity(head_instructions.len());
             for head_instruction in head_instructions {
-                let head_binding = atom_binding(&head_instruction.reduced_atom, &variable_order);
+                let head_binding = atom_binding(&head_instruction.reduced_atom, variable_order);
                 let head_reordering =
                     ProjectReordering::from_vector(head_binding.clone(), self.num_body_variables);
 

diff --git a/nemo/src/execution/planning/plan_head_restricted.rs b/nemo/src/execution/planning/plan_head_restricted.rs
@@ -111,7 +111,7 @@ impl HeadStrategy for RestrictedChaseStrategy {
         current_plan: &mut SubtableExecutionPlan,
         node_matches: ExecutionNodeRef,
         rule_info: &RuleInfo,
-        body_join_order: VariableOrder,
+        body_join_order: &VariableOrder,
         step: usize,
     ) {
         // High-level description of the strategy:

diff --git a/nemo/src/execution/planning/strategy_head.rs b/nemo/src/execution/planning/strategy_head.rs
@@ -20,7 +20,7 @@ pub trait HeadStrategy: Debug {
         current_plan: &mut SubtableExecutionPlan,
         body: ExecutionNodeRef,
         rule_info: &RuleInfo,
-        variable_order: VariableOrder,
+        variable_order: &VariableOrder,
         step_number: usize,
     );
 }
diff --git a/nemo/src/execution/rule_execution.rs b/nemo/src/execution/rule_execution.rs
@@ -59,14 +59,14 @@ impl RuleExecution {
             )
         );
         // TODO: Just because its the first doesn't mean its the best
-        let best_variable_order = &mut self.promising_variable_orders[0].clone();
+        let mut best_variable_order = self.promising_variable_orders[0].clone();
 
         let mut subtable_execution_plan = SubtableExecutionPlan::default();
         let body_tree = self.body_strategy.add_plan_body(
             table_manager,
             &mut subtable_execution_plan,
             rule_info,
-            best_variable_order, // Variable order possibly gets updated
+            &mut best_variable_order, // Variable order possibly gets updated
             step_number,
         );
 
@@ -75,7 +75,7 @@ impl RuleExecution {
             &mut subtable_execution_plan,
             body_tree,
             rule_info,
-            best_variable_order.clone(),
+            &best_variable_order,
             step_number,
         );
 

diff --git a/...es/testcases/aggregate_basic/anyCount.rls → resources/testcases/aggregate/anyCount.rls b/...es/testcases/aggregate_basic/anyCount.rls → resources/testcases/aggregate/anyCount.rls
diff --git a/...testcases/aggregate_basic/anyCount/r0.csv → ...urces/testcases/aggregate/anyCount/r0.csv b/...testcases/aggregate_basic/anyCount/r0.csv → ...urces/testcases/aggregate/anyCount/r0.csv
diff --git a/...es/testcases/aggregate_basic/distinct.rls → resources/testcases/aggregate/distinct.rls b/...es/testcases/aggregate_basic/distinct.rls → resources/testcases/aggregate/distinct.rls
diff --git a/...testcases/aggregate_basic/distinct/r0.csv → ...urces/testcases/aggregate/distinct/r0.csv b/...testcases/aggregate_basic/distinct/r0.csv → ...urces/testcases/aggregate/distinct/r0.csv
diff --git a/...testcases/aggregate_basic/distinct/r1.csv → ...urces/testcases/aggregate/distinct/r1.csv b/...testcases/aggregate_basic/distinct/r1.csv → ...urces/testcases/aggregate/distinct/r1.csv
diff --git a/...testcases/aggregate_basic/distinct/r2.csv → ...urces/testcases/aggregate/distinct/r2.csv b/...testcases/aggregate_basic/distinct/r2.csv → ...urces/testcases/aggregate/distinct/r2.csv
diff --git a/...testcases/aggregate_basic/distinct/r3.csv → ...urces/testcases/aggregate/distinct/r3.csv b/...testcases/aggregate_basic/distinct/r3.csv → ...urces/testcases/aggregate/distinct/r3.csv
diff --git a/...stcases/aggregate_basic/firstVariable.rls → ...ces/testcases/aggregate/firstVariable.rls b/...stcases/aggregate_basic/firstVariable.rls → ...ces/testcases/aggregate/firstVariable.rls
diff --git a/...ases/aggregate_basic/firstVariable/r0.csv → .../testcases/aggregate/firstVariable/r0.csv b/...ases/aggregate_basic/firstVariable/r0.csv → .../testcases/aggregate/firstVariable/r0.csv
diff --git a/...ases/aggregate_basic/firstVariable/r1.csv → .../testcases/aggregate/firstVariable/r1.csv b/...ases/aggregate_basic/firstVariable/r1.csv → .../testcases/aggregate/firstVariable/r1.csv
diff --git a/...ases/aggregate_basic/firstVariable/r2.csv → .../testcases/aggregate/firstVariable/r2.csv b/...ases/aggregate_basic/firstVariable/r2.csv → .../testcases/aggregate/firstVariable/r2.csv
diff --git a/...ases/aggregate_basic/firstVariable/r3.csv → .../testcases/aggregate/firstVariable/r3.csv b/...ases/aggregate_basic/firstVariable/r3.csv → .../testcases/aggregate/firstVariable/r3.csv
diff --git a/...ces/testcases/aggregate_basic/groupBy.rls → resources/testcases/aggregate/groupBy.rls b/...ces/testcases/aggregate_basic/groupBy.rls → resources/testcases/aggregate/groupBy.rls
diff --git a/.../testcases/aggregate_basic/groupBy/r0.csv → resources/testcases/aggregate/groupBy/r0.csv b/.../testcases/aggregate_basic/groupBy/r0.csv → resources/testcases/aggregate/groupBy/r0.csv
diff --git a/.../testcases/aggregate_basic/groupBy/r1.csv → resources/testcases/aggregate/groupBy/r1.csv b/.../testcases/aggregate_basic/groupBy/r1.csv → resources/testcases/aggregate/groupBy/r1.csv
diff --git a/.../testcases/aggregate_basic/groupBy/r2.csv → resources/testcases/aggregate/groupBy/r2.csv b/.../testcases/aggregate_basic/groupBy/r2.csv → resources/testcases/aggregate/groupBy/r2.csv
diff --git a/.../testcases/aggregate_basic/groupBy/r3.csv → resources/testcases/aggregate/groupBy/r3.csv b/.../testcases/aggregate_basic/groupBy/r3.csv → resources/testcases/aggregate/groupBy/r3.csv
diff --git a/...ses/aggregate_basic/groupByIdempotent.rls → ...testcases/aggregate/groupByIdempotent.rls b/...ses/aggregate_basic/groupByIdempotent.rls → ...testcases/aggregate/groupByIdempotent.rls
diff --git a/.../aggregate_basic/groupByIdempotent/r0.csv → ...tcases/aggregate/groupByIdempotent/r0.csv b/.../aggregate_basic/groupByIdempotent/r0.csv → ...tcases/aggregate/groupByIdempotent/r0.csv
diff --git a/.../aggregate_basic/groupByIdempotent/r1.csv → ...tcases/aggregate/groupByIdempotent/r1.csv b/.../aggregate_basic/groupByIdempotent/r1.csv → ...tcases/aggregate/groupByIdempotent/r1.csv
diff --git a/...estcases/aggregate_basic/lastVariable.rls → ...rces/testcases/aggregate/lastVariable.rls b/...estcases/aggregate_basic/lastVariable.rls → ...rces/testcases/aggregate/lastVariable.rls
diff --git a/...cases/aggregate_basic/lastVariable/r0.csv → ...s/testcases/aggregate/lastVariable/r0.csv b/...cases/aggregate_basic/lastVariable/r0.csv → ...s/testcases/aggregate/lastVariable/r0.csv
diff --git a/...cases/aggregate_basic/lastVariable/r1.csv → ...s/testcases/aggregate/lastVariable/r1.csv b/...cases/aggregate_basic/lastVariable/r1.csv → ...s/testcases/aggregate/lastVariable/r1.csv
diff --git a/...stcases/aggregate_basic/sources/dataA.csv → ...ces/testcases/aggregate/sources/dataA.csv b/...stcases/aggregate_basic/sources/dataA.csv → ...ces/testcases/aggregate/sources/dataA.csv
diff --git a/...stcases/aggregate_basic/sources/dataB.csv → ...ces/testcases/aggregate/sources/dataB.csv b/...stcases/aggregate_basic/sources/dataB.csv → ...ces/testcases/aggregate/sources/dataB.csv
diff --git a/...tcases/aggregate_basic/stratification.rls → ...es/testcases/aggregate/stratification.rls b/...tcases/aggregate_basic/stratification.rls → ...es/testcases/aggregate/stratification.rls
diff --git a/...ses/aggregate_basic/stratification/r1.csv → ...testcases/aggregate/stratification/r1.csv b/...ses/aggregate_basic/stratification/r1.csv → ...testcases/aggregate/stratification/r1.csv
diff --git a/...ses/aggregate_basic/stratification/r2.csv → ...testcases/aggregate/stratification/r2.csv b/...ses/aggregate_basic/stratification/r2.csv → ...testcases/aggregate/stratification/r2.csv
diff --git a/...ses/aggregate_basic/stratification/r3.csv → ...testcases/aggregate/stratification/r3.csv b/...ses/aggregate_basic/stratification/r3.csv → ...testcases/aggregate/stratification/r3.csv
diff --git a/resources/testcases/comparison/run.rls → ...urces/testcases/arithmetic/comparison.rls b/resources/testcases/comparison/run.rls → ...urces/testcases/arithmetic/comparison.rls
diff --git a/...rces/testcases/comparison/run/complex.csv → ...stcases/arithmetic/comparison/complex.csv b/...rces/testcases/comparison/run/complex.csv → ...stcases/arithmetic/comparison/complex.csv
diff --git a/...es/comparison/run/x_greater_than_five.csv → ...hmetic/comparison/x_greater_than_five.csv b/...es/comparison/run/x_greater_than_five.csv → ...hmetic/comparison/x_greater_than_five.csv
diff --git a/...ases/comparison/run/x_less_than_three.csv → ...ithmetic/comparison/x_less_than_three.csv b/...ases/comparison/run/x_less_than_three.csv → ...ithmetic/comparison/x_less_than_three.csv
diff --git a/...cases/comparison/run/x_unequals_three.csv → ...rithmetic/comparison/x_unequals_three.csv b/...cases/comparison/run/x_unequals_three.csv → ...rithmetic/comparison/x_unequals_three.csv
diff --git a/...estcases/comparison/run/y_equals_nine.csv → ...s/arithmetic/comparison/y_equals_nine.csv b/...estcases/comparison/run/y_equals_nine.csv → ...s/arithmetic/comparison/y_equals_nine.csv
diff --git a/...omparison/run/y_greater_than_eq_seven.csv → ...ic/comparison/y_greater_than_eq_seven.csv b/...omparison/run/y_greater_than_eq_seven.csv → ...ic/comparison/y_greater_than_eq_seven.csv
diff --git a/...es/comparison/run/y_less_than_eq_five.csv → ...hmetic/comparison/y_less_than_eq_five.csv b/...es/comparison/run/y_less_than_eq_five.csv → ...hmetic/comparison/y_less_than_eq_five.csv
diff --git a/...tcases/comparison/run/y_unequals_five.csv → ...arithmetic/comparison/y_unequals_five.csv b/...tcases/comparison/run/y_unequals_five.csv → ...arithmetic/comparison/y_unequals_five.csv
diff --git a/...ces/testcases/comparison/sources/data.csv → ...ces/testcases/arithmetic/sources/data.csv b/...ces/testcases/comparison/sources/data.csv → ...ces/testcases/arithmetic/sources/data.csv
diff --git a/resources/testcases/basic/README.md b/resources/testcases/basic/README.md
@@ -0,0 +1,8 @@
+= testcases/basic
+
+Tests / documents all basic functionalities of the rule syntax:
+- join
+- negation
+- projection
+- union
+- assignment
diff --git a/resources/testcases/assignment/run.rls → resources/testcases/basic/assignment.rls b/resources/testcases/assignment/run.rls → resources/testcases/basic/assignment.rls
diff --git a/resources/testcases/assignment/run/r.csv → resources/testcases/basic/assignment/r.csv b/resources/testcases/assignment/run/r.csv → resources/testcases/basic/assignment/r.csv
diff --git a/resources/testcases/basic_join/run.rls → resources/testcases/basic/join.rls b/resources/testcases/basic_join/run.rls → resources/testcases/basic/join.rls
@@ -4,4 +4,4 @@
 
 J1(?X, ?Y, ?Z) :- sourceA(?X, ?Z, ?Y), sourceB(?X, ?Y, ?T) .
 J2(?X, ?Y, ?Z) :- sourceA(?Z, ?Y, ?X), sourceC(?X, ?Y, ?T) .
-J3(?X, ?Y, ?W) :- sourceA(?T, ?Y, ?X), sourceB(?T, ?Y, ?X), sourceC(?X, ?Y, ?W) .
+J3(?X, ?Y, ?W) :- sourceA(?T, ?Y, ?X), sourceB(?T, ?Y, ?X), sourceC(?X, ?Y, ?W) .
diff --git a/resources/testcases/basic_join/run/J1.csv → resources/testcases/basic/join/J1.csv b/resources/testcases/basic_join/run/J1.csv → resources/testcases/basic/join/J1.csv
diff --git a/resources/testcases/basic_join/output/J2.csv → resources/testcases/basic/join/J2.csv b/resources/testcases/basic_join/output/J2.csv → resources/testcases/basic/join/J2.csv
diff --git a/resources/testcases/basic_join/output/J3.csv → resources/testcases/basic/join/J3.csv b/resources/testcases/basic_join/output/J3.csv → resources/testcases/basic/join/J3.csv
diff --git a/resources/testcases/basic_negation/run.rls → resources/testcases/basic/negation.rls b/resources/testcases/basic_negation/run.rls → resources/testcases/basic/negation.rls
diff --git a/...estcases/basic_negation/run/filteredX.csv → ...es/testcases/basic/negation/filteredX.csv b/...estcases/basic_negation/run/filteredX.csv → ...es/testcases/basic/negation/filteredX.csv
diff --git a/...estcases/basic_negation/run/filteredY.csv → ...es/testcases/basic/negation/filteredY.csv b/...estcases/basic_negation/run/filteredY.csv → ...es/testcases/basic/negation/filteredY.csv
diff --git a/...estcases/basic_negation/run/filteredZ.csv → ...es/testcases/basic/negation/filteredZ.csv b/...estcases/basic_negation/run/filteredZ.csv → ...es/testcases/basic/negation/filteredZ.csv
diff --git a/...testcases/basic_negation/run/multiple.csv → ...ces/testcases/basic/negation/multiple.csv b/...testcases/basic_negation/run/multiple.csv → ...ces/testcases/basic/negation/multiple.csv
diff --git a/...stcases/basic_negation/run/projectedX.csv → ...s/testcases/basic/negation/projectedX.csv b/...stcases/basic_negation/run/projectedX.csv → ...s/testcases/basic/negation/projectedX.csv
diff --git a/...tcases/basic_negation/run/projectedXY.csv → .../testcases/basic/negation/projectedXY.csv b/...tcases/basic_negation/run/projectedXY.csv → .../testcases/basic/negation/projectedXY.csv
diff --git a/...tcases/basic_negation/run/projectedXZ.csv → .../testcases/basic/negation/projectedXZ.csv b/...tcases/basic_negation/run/projectedXZ.csv → .../testcases/basic/negation/projectedXZ.csv
diff --git a/...stcases/basic_negation/run/projectedY.csv → ...s/testcases/basic/negation/projectedY.csv b/...stcases/basic_negation/run/projectedY.csv → ...s/testcases/basic/negation/projectedY.csv
diff --git a/...tcases/basic_negation/run/projectedYZ.csv → .../testcases/basic/negation/projectedYZ.csv b/...tcases/basic_negation/run/projectedYZ.csv → .../testcases/basic/negation/projectedYZ.csv
diff --git a/...stcases/basic_negation/run/projectedZ.csv → ...s/testcases/basic/negation/projectedZ.csv b/...stcases/basic_negation/run/projectedZ.csv → ...s/testcases/basic/negation/projectedZ.csv
diff --git a/...estcases/basic_negation/run/reordered.csv → ...es/testcases/basic/negation/reordered.csv b/...estcases/basic_negation/run/reordered.csv → ...es/testcases/basic/negation/reordered.csv
diff --git a/...es/basic_negation/run/singlePositionX.csv → ...tcases/basic/negation/singlePositionX.csv b/...es/basic_negation/run/singlePositionX.csv → ...tcases/basic/negation/singlePositionX.csv
diff --git a/...es/basic_negation/run/singlePositionY.csv → ...tcases/basic/negation/singlePositionY.csv b/...es/basic_negation/run/singlePositionY.csv → ...tcases/basic/negation/singlePositionY.csv
diff --git a/...es/basic_negation/run/singlePositionZ.csv → ...tcases/basic/negation/singlePositionZ.csv b/...es/basic_negation/run/singlePositionZ.csv → ...tcases/basic/negation/singlePositionZ.csv
diff --git a/resources/testcases/basic_projection/run.rls → resources/testcases/basic/projection.rls b/resources/testcases/basic_projection/run.rls → resources/testcases/basic/projection.rls
diff --git a/...rces/testcases/basic_projection/run/A.csv → resources/testcases/basic/projection/A.csv b/...rces/testcases/basic_projection/run/A.csv → resources/testcases/basic/projection/A.csv
diff --git a/...rces/testcases/basic_projection/run/B.csv → resources/testcases/basic/projection/B.csv b/...rces/testcases/basic_projection/run/B.csv → resources/testcases/basic/projection/B.csv
diff --git a/...rces/testcases/basic_projection/run/C.csv → resources/testcases/basic/projection/C.csv b/...rces/testcases/basic_projection/run/C.csv → resources/testcases/basic/projection/C.csv
diff --git a/...rces/testcases/basic_projection/run/D.csv → resources/testcases/basic/projection/D.csv b/...rces/testcases/basic_projection/run/D.csv → resources/testcases/basic/projection/D.csv
diff --git a/...rces/testcases/basic_projection/run/E.csv → resources/testcases/basic/projection/E.csv b/...rces/testcases/basic_projection/run/E.csv → resources/testcases/basic/projection/E.csv
diff --git a/...s/testcases/basic_negation/sources/S1.csv → resources/testcases/basic/sources/S1.csv b/...s/testcases/basic_negation/sources/S1.csv → resources/testcases/basic/sources/S1.csv
diff --git a/...s/testcases/basic_negation/sources/S2.csv → resources/testcases/basic/sources/S2.csv b/...s/testcases/basic_negation/sources/S2.csv → resources/testcases/basic/sources/S2.csv
diff --git a/...s/testcases/basic_negation/sources/S3.csv → resources/testcases/basic/sources/S3.csv b/...s/testcases/basic_negation/sources/S3.csv → resources/testcases/basic/sources/S3.csv
diff --git a/...stcases/basic_projection/sources/data.csv → resources/testcases/basic/sources/data.csv b/...stcases/basic_projection/sources/data.csv → resources/testcases/basic/sources/data.csv
diff --git a/...es/testcases/basic_join/sources/dataA.csv → resources/testcases/basic/sources/dataA.csv b/...es/testcases/basic_join/sources/dataA.csv → resources/testcases/basic/sources/dataA.csv
diff --git a/...es/testcases/basic_join/sources/dataB.csv → resources/testcases/basic/sources/dataB.csv b/...es/testcases/basic_join/sources/dataB.csv → resources/testcases/basic/sources/dataB.csv
diff --git a/...es/testcases/basic_join/sources/dataC.csv → resources/testcases/basic/sources/dataC.csv b/...es/testcases/basic_join/sources/dataC.csv → resources/testcases/basic/sources/dataC.csv
diff --git a/...testcases/basic_negation/sources/main.csv → resources/testcases/basic/sources/main.csv b/...testcases/basic_negation/sources/main.csv → resources/testcases/basic/sources/main.csv
diff --git a/resources/testcases/basic_union/run.rls → resources/testcases/basic/union.rls b/resources/testcases/basic_union/run.rls → resources/testcases/basic/union.rls
diff --git a/resources/testcases/basic_union/run/AB.csv → resources/testcases/basic/union/AB.csv b/resources/testcases/basic_union/run/AB.csv → resources/testcases/basic/union/AB.csv
@@ -3,5 +3,6 @@ A,C,F
 A,E,F
 A,G,Q
 B,B,D
+B,D,A
 C,D,D
 Q,Q,A
diff --git a/resources/testcases/basic_union/run/ABC.csv → resources/testcases/basic/union/ABC.csv b/resources/testcases/basic_union/run/ABC.csv → resources/testcases/basic/union/ABC.csv
@@ -3,6 +3,11 @@ A,C,F
 A,E,F
 A,G,Q
 B,B,D
+B,D,A
 C,D,D
+D,B,Q
+D,B,Z
+D,B,F
+F,E,D
 Q,Q,A
 Z,Z,Z
diff --git a/resources/testcases/basic_join/output.rls b/resources/testcases/basic_join/output.rls
diff --git a/resources/testcases/basic_join/run/J2.csv b/resources/testcases/basic_join/run/J2.csv
diff --git a/resources/testcases/basic_join/run/J3.csv b/resources/testcases/basic_join/run/J3.csv
diff --git a/resources/testcases/basic_union/sources/dataB.csv b/resources/testcases/basic_union/sources/dataB.csv
diff --git a/resources/testcases/basic_union/sources/dataC.csv b/resources/testcases/basic_union/sources/dataC.csv
diff --git a/...urces/testcases/rdf/ntriples-example2.rls → ...es/data-formats/rdf/ntriples-example2.rls b/...urces/testcases/rdf/ntriples-example2.rls → ...es/data-formats/rdf/ntriples-example2.rls
diff --git a/.../testcases/rdf/ntriples-example2/goal.csv → ...ta-formats/rdf/ntriples-example2/goal.csv b/.../testcases/rdf/ntriples-example2/goal.csv → ...ta-formats/rdf/ntriples-example2/goal.csv
diff --git a/...urces/testcases/rdf/ntriples-example3.rls → ...es/data-formats/rdf/ntriples-example3.rls b/...urces/testcases/rdf/ntriples-example3.rls → ...es/data-formats/rdf/ntriples-example3.rls
diff --git a/...testcases/rdf/ntriples-example3/atoms.csv → ...a-formats/rdf/ntriples-example3/atoms.csv b/...testcases/rdf/ntriples-example3/atoms.csv → ...a-formats/rdf/ntriples-example3/atoms.csv
diff --git a/...estcases/rdf/ntriples-example3/labels.csv → ...-formats/rdf/ntriples-example3/labels.csv b/...estcases/rdf/ntriples-example3/labels.csv → ...-formats/rdf/ntriples-example3/labels.csv
diff --git a/resources/testcases/rdf/rdfxml-example7.rls → ...ases/data-formats/rdf/rdfxml-example7.rls b/resources/testcases/rdf/rdfxml-example7.rls → ...ases/data-formats/rdf/rdfxml-example7.rls
diff --git a/...es/testcases/rdf/rdfxml-example7/goal.csv → ...data-formats/rdf/rdfxml-example7/goal.csv b/...es/testcases/rdf/rdfxml-example7/goal.csv → ...data-formats/rdf/rdfxml-example7/goal.csv
diff --git a/resources/testcases/rdf/sources/example2.nt → ...ases/data-formats/rdf/sources/example2.nt b/resources/testcases/rdf/sources/example2.nt → ...ases/data-formats/rdf/sources/example2.nt
diff --git a/resources/testcases/rdf/sources/example2.ttl → ...ses/data-formats/rdf/sources/example2.ttl b/resources/testcases/rdf/sources/example2.ttl → ...ses/data-formats/rdf/sources/example2.ttl
diff --git a/resources/testcases/rdf/sources/example3.nt → ...ases/data-formats/rdf/sources/example3.nt b/resources/testcases/rdf/sources/example3.nt → ...ases/data-formats/rdf/sources/example3.nt
diff --git a/resources/testcases/rdf/sources/example7.rdf → ...ses/data-formats/rdf/sources/example7.rdf b/resources/testcases/rdf/sources/example7.rdf → ...ses/data-formats/rdf/sources/example7.rdf
diff --git a/resources/testcases/rdf/turtle-example2.rls → ...ases/data-formats/rdf/turtle-example2.rls b/resources/testcases/rdf/turtle-example2.rls → ...ases/data-formats/rdf/turtle-example2.rls
diff --git a/...es/testcases/rdf/turtle-example2/goal.csv → ...data-formats/rdf/turtle-example2/goal.csv b/...es/testcases/rdf/turtle-example2/goal.csv → ...data-formats/rdf/turtle-example2/goal.csv
diff --git a/resources/testcases/load_empty/run.rls b/resources/testcases/load_empty/run.rls
diff --git a/resources/testcases/regression/datalog_constants/regression.yaml b/resources/testcases/regression/datalog_constants/regression.yaml
@@ -0,0 +1,4 @@
+issue: 392
+title: Panic when filtering for non-existing constant
+tracker: https://github.com/knowsys/nemo/issues/392
+type: bugfix
diff --git a/...urces/testcases/datalog_constants/run.rls → ...ases/regression/datalog_constants/run.rls b/...urces/testcases/datalog_constants/run.rls → ...ases/regression/datalog_constants/run.rls
diff --git a/...atalog_constants/run/ConstantBodyHead.csv → ...atalog_constants/run/ConstantBodyHead.csv b/...atalog_constants/run/ConstantBodyHead.csv → ...atalog_constants/run/ConstantBodyHead.csv
diff --git a/...s/datalog_constants/run/ConstantBodyX.csv → ...n/datalog_constants/run/ConstantBodyX.csv b/...s/datalog_constants/run/ConstantBodyX.csv → ...n/datalog_constants/run/ConstantBodyX.csv
diff --git a/.../datalog_constants/run/ConstantBodyXY.csv → .../datalog_constants/run/ConstantBodyXY.csv b/.../datalog_constants/run/ConstantBodyXY.csv → .../datalog_constants/run/ConstantBodyXY.csv
diff --git a/.../datalog_constants/run/ConstantBodyXZ.csv → .../datalog_constants/run/ConstantBodyXZ.csv b/.../datalog_constants/run/ConstantBodyXZ.csv → .../datalog_constants/run/ConstantBodyXZ.csv
diff --git a/...s/datalog_constants/run/ConstantBodyY.csv → ...n/datalog_constants/run/ConstantBodyY.csv b/...s/datalog_constants/run/ConstantBodyY.csv → ...n/datalog_constants/run/ConstantBodyY.csv
diff --git a/.../datalog_constants/run/ConstantBodyYZ.csv → .../datalog_constants/run/ConstantBodyYZ.csv b/.../datalog_constants/run/ConstantBodyYZ.csv → .../datalog_constants/run/ConstantBodyYZ.csv
diff --git a/...s/datalog_constants/run/ConstantBodyZ.csv → ...n/datalog_constants/run/ConstantBodyZ.csv b/...s/datalog_constants/run/ConstantBodyZ.csv → ...n/datalog_constants/run/ConstantBodyZ.csv
diff --git a/...talog_constants/run/ConstantHeadAfter.csv → ...talog_constants/run/ConstantHeadAfter.csv b/...talog_constants/run/ConstantHeadAfter.csv → ...talog_constants/run/ConstantHeadAfter.csv
diff --git a/...alog_constants/run/ConstantHeadBefore.csv → ...alog_constants/run/ConstantHeadBefore.csv b/...alog_constants/run/ConstantHeadBefore.csv → ...alog_constants/run/ConstantHeadBefore.csv
diff --git a/..._constants/run/ConstantHeadEverywhere.csv → ..._constants/run/ConstantHeadEverywhere.csv b/..._constants/run/ConstantHeadEverywhere.csv → ..._constants/run/ConstantHeadEverywhere.csv
diff --git a/...testcases/datalog_constants/run/Exist.csv → ...egression/datalog_constants/run/Exist.csv b/...testcases/datalog_constants/run/Exist.csv → ...egression/datalog_constants/run/Exist.csv
diff --git a/...tcases/datalog_constants/run/NotExist.csv → ...ession/datalog_constants/run/NotExist.csv b/...tcases/datalog_constants/run/NotExist.csv → ...ession/datalog_constants/run/NotExist.csv
diff --git a/...atalog_constants/run/OnlyNewConstants.csv → ...atalog_constants/run/OnlyNewConstants.csv b/...atalog_constants/run/OnlyNewConstants.csv → ...atalog_constants/run/OnlyNewConstants.csv
diff --git a/...g_constants/run/OnlyNewConstantsEmpty.csv → ...g_constants/run/OnlyNewConstantsEmpty.csv b/...g_constants/run/OnlyNewConstantsEmpty.csv → ...g_constants/run/OnlyNewConstantsEmpty.csv
diff --git a/...stcases/datalog_constants/run/Unknown.csv → ...ression/datalog_constants/run/Unknown.csv b/...stcases/datalog_constants/run/Unknown.csv → ...ression/datalog_constants/run/Unknown.csv
diff --git a/...cases/datalog_constants/sources/dataA.csv → ...ssion/datalog_constants/sources/dataA.csv b/...cases/datalog_constants/sources/dataA.csv → ...ssion/datalog_constants/sources/dataA.csv
diff --git a/...cases/datalog_constants/sources/dataB.csv → ...ssion/datalog_constants/sources/dataB.csv b/...cases/datalog_constants/sources/dataB.csv → ...ssion/datalog_constants/sources/dataB.csv
diff --git a/...s/testcases/datatype_declarations/run.rls → ...regression/datatypes/declarations/run.rls b/...s/testcases/datatype_declarations/run.rls → ...regression/datatypes/declarations/run.rls
@@ -2,8 +2,8 @@
 @declare c(integer) .
 @declare numeric(integer, float64) .
 
-@source c[1]: load-csv("sources/c.csv") .
-@source numeric[2]: load-csv("sources/numeric.csv") .
+@source c[1]: load-csv("../sources/c.csv") .
+@source numeric[2]: load-csv("../sources/numeric.csv") .
 
 a(Hello, ?X) :- c(?X) .
 b(?Y, ?X) :- a(?X, ?Y) .

diff --git a/...testcases/datatype_declarations/run/a.csv → ...gression/datatypes/declarations/run/a.csv b/...testcases/datatype_declarations/run/a.csv → ...gression/datatypes/declarations/run/a.csv
diff --git a/...testcases/datatype_declarations/run/b.csv → ...gression/datatypes/declarations/run/b.csv b/...testcases/datatype_declarations/run/b.csv → ...gression/datatypes/declarations/run/b.csv
diff --git a/...testcases/datatype_declarations/run/r.csv → ...gression/datatypes/declarations/run/r.csv b/...testcases/datatype_declarations/run/r.csv → ...gression/datatypes/declarations/run/r.csv
diff --git a/...atype_inference_consistency/no-source.rls → ...ression/datatypes/inference/no-source.rls b/...atype_inference_consistency/no-source.rls → ...ression/datatypes/inference/no-source.rls
diff --git a/...ype_inference_consistency/no-source/p.csv → ...ssion/datatypes/inference/no-source/p.csv b/...ype_inference_consistency/no-source/p.csv → ...ssion/datatypes/inference/no-source/p.csv
diff --git a/...ype_inference_consistency/with-source.rls → ...ssion/datatypes/inference/with-source.rls b/...ype_inference_consistency/with-source.rls → ...ssion/datatypes/inference/with-source.rls
@@ -1,6 +1,6 @@
 @declare a(integer) .
 
-@source a[1]: load-csv("sources/a.csv") .
+@source a[1]: load-csv("../sources/a.csv") .
 
 c(?X, ?Y) :- b(?X, ?Y) .
 b(?X, ?X) :- a(?X) .
diff --git a/...e_inference_consistency/with-source/b.csv → ...ion/datatypes/inference/with-source/b.csv b/...e_inference_consistency/with-source/b.csv → ...ion/datatypes/inference/with-source/b.csv
diff --git a/...e_inference_consistency/with-source/c.csv → ...ion/datatypes/inference/with-source/c.csv b/...e_inference_consistency/with-source/c.csv → ...ion/datatypes/inference/with-source/c.csv
diff --git a/.../testcases/datatype_normalization/run.rls → ...egression/datatypes/normalization/run.rls b/.../testcases/datatype_normalization/run.rls → ...egression/datatypes/normalization/run.rls
@@ -4,7 +4,7 @@
 @declare b(any) .
 @declare c(any) .
 
-@source b[any]: load-csv("sources/b.csv") .
+@source b[any]: load-csv("../sources/b.csv") .
 
 a(Some Constant With Spaces).
 a(<AnotherConstant>).

diff --git a/...estcases/datatype_normalization/run/c.csv → ...ression/datatypes/normalization/run/c.csv b/...estcases/datatype_normalization/run/c.csv → ...ression/datatypes/normalization/run/c.csv
diff --git a/...atype_inference_consistency/sources/a.csv → ...tcases/regression/datatypes/sources/a.csv b/...atype_inference_consistency/sources/a.csv → ...tcases/regression/datatypes/sources/a.csv
diff --git a/...ases/datatype_normalization/sources/b.csv → ...tcases/regression/datatypes/sources/b.csv b/...ases/datatype_normalization/sources/b.csv → ...tcases/regression/datatypes/sources/b.csv
diff --git a/...cases/datatype_declarations/sources/c.csv → ...tcases/regression/datatypes/sources/c.csv b/...cases/datatype_declarations/sources/c.csv → ...tcases/regression/datatypes/sources/c.csv
diff --git a/...datatype_declarations/sources/numeric.csv → .../regression/datatypes/sources/numeric.csv b/...datatype_declarations/sources/numeric.csv → .../regression/datatypes/sources/numeric.csv
diff --git a/...stcases/join_by_eq_constraint/integer.rls → ...ression/join_by_eq_constraint/integer.rls b/...stcases/join_by_eq_constraint/integer.rls → ...ression/join_by_eq_constraint/integer.rls
diff --git a/...in_by_eq_constraint/integer/intInBody.csv → ...in_by_eq_constraint/integer/intInBody.csv b/...in_by_eq_constraint/integer/intInBody.csv → ...in_by_eq_constraint/integer/intInBody.csv
diff --git a/resources/testcases/regression/join_by_eq_constraint/regression.yaml b/resources/testcases/regression/join_by_eq_constraint/regression.yaml
@@ -0,0 +1,4 @@
+issue: 355
+title: Support equality of two integer variables
+tracker: https://github.com/knowsys/nemo/issues/355
+type: bugfix
diff --git a/...estcases/join_by_eq_constraint/string.rls → ...gression/join_by_eq_constraint/string.rls b/...estcases/join_by_eq_constraint/string.rls → ...gression/join_by_eq_constraint/string.rls
diff --git a/...by_eq_constraint/string/literalInBody.csv → ...by_eq_constraint/string/literalInBody.csv b/...by_eq_constraint/string/literalInBody.csv → ...by_eq_constraint/string/literalInBody.csv
diff --git a/resources/testcases/regression/load/empty/regression.yaml b/resources/testcases/regression/load/empty/regression.yaml
@@ -0,0 +1,4 @@
+issue: 341
+title: invariant violation when reading empty file
+tracker: https://github.com/knowsys/nemo/issues/308
+type: bugfix
diff --git a/resources/testcases/regression/load/empty/run.rls b/resources/testcases/regression/load/empty/run.rls
@@ -0,0 +1,3 @@
+@source source[3]: load-csv("../sources/empty.csv").
+
+out(?X, ?Y, ?Z) :- source(?X, ?Y, ?Z) .
diff --git a/resources/testcases/load_empty/run/out.csv → ...stcases/regression/load/empty/run/out.csv b/resources/testcases/load_empty/run/out.csv → ...stcases/regression/load/empty/run/out.csv
diff --git a/resources/testcases/load_multiple/run.rls → ...estcases/regression/load/multiple/run.rls b/resources/testcases/load_multiple/run.rls → ...estcases/regression/load/multiple/run.rls
@@ -1,6 +1,6 @@
-@source source[3]: load-csv("sources/dataA.csv").
-@source source[3]: load-csv("sources/dataB.csv").
-@source source[3]: load-csv("sources/dataC.csv").
+@source source[3]: load-csv("../sources/dataA.csv").
+@source source[3]: load-csv("../sources/dataB.csv").
+@source source[3]: load-csv("../sources/dataC.csv").
 
 source("A", "B", "C") .
 source("B", "C", "D") .

diff --git a/.../testcases/load_multiple/run/combined.csv → ...regression/load/multiple/run/combined.csv b/.../testcases/load_multiple/run/combined.csv → ...regression/load/multiple/run/combined.csv
diff --git a/.../testcases/load_multiple/run/constant.csv → ...regression/load/multiple/run/constant.csv b/.../testcases/load_multiple/run/constant.csv → ...regression/load/multiple/run/constant.csv
diff --git a/...testcases/load_multiple/sources/dataA.csv → ...stcases/regression/load/sources/dataA.csv b/...testcases/load_multiple/sources/dataA.csv → ...stcases/regression/load/sources/dataA.csv
diff --git a/...testcases/load_multiple/sources/dataB.csv → ...stcases/regression/load/sources/dataB.csv b/...testcases/load_multiple/sources/dataB.csv → ...stcases/regression/load/sources/dataB.csv
diff --git a/...testcases/load_multiple/sources/dataC.csv → ...stcases/regression/load/sources/dataC.csv b/...testcases/load_multiple/sources/dataC.csv → ...stcases/regression/load/sources/dataC.csv
diff --git a/...es/testcases/load_empty/sources/empty.csv → ...stcases/regression/load/sources/empty.csv b/...es/testcases/load_empty/sources/empty.csv → ...stcases/regression/load/sources/empty.csv
diff --git a/...rces/testcases/repeated_variables/run.rls → ...ses/regression/repeated_variables/run.rls b/...rces/testcases/repeated_variables/run.rls → ...ses/regression/repeated_variables/run.rls
diff --git a/...ases/repeated_variables/run/RepeatAll.csv → ...sion/repeated_variables/run/RepeatAll.csv b/...ases/repeated_variables/run/RepeatAll.csv → ...sion/repeated_variables/run/RepeatAll.csv
diff --git a/...eated_variables/run/RepeatAlternative.csv → ...eated_variables/run/RepeatAlternative.csv b/...eated_variables/run/RepeatAlternative.csv → ...eated_variables/run/RepeatAlternative.csv
diff --git a/...ses/repeated_variables/run/RepeatBody.csv → ...ion/repeated_variables/run/RepeatBody.csv b/...ses/repeated_variables/run/RepeatBody.csv → ...ion/repeated_variables/run/RepeatBody.csv
diff --git a/...ses/repeated_variables/run/RepeatHead.csv → ...ion/repeated_variables/run/RepeatHead.csv b/...ses/repeated_variables/run/RepeatHead.csv → ...ion/repeated_variables/run/RepeatHead.csv
diff --git a/...s/testcases/basic_union/sources/dataA.csv → ...sion/repeated_variables/sources/dataA.csv b/...s/testcases/basic_union/sources/dataA.csv → ...sion/repeated_variables/sources/dataA.csv
diff --git a/...ases/repeated_variables/sources/dataB.csv → ...sion/repeated_variables/sources/dataB.csv b/...ases/repeated_variables/sources/dataB.csv → ...sion/repeated_variables/sources/dataB.csv
@@ -3,4 +3,5 @@ B,D,A
 A,C,F
 A,G,Q
 A,Q,Q
-C,D,D
+C,D,D
+C,D,A
diff --git a/...ases/repeated_variables/sources/dataC.csv → ...sion/repeated_variables/sources/dataC.csv b/...ases/repeated_variables/sources/dataC.csv → ...sion/repeated_variables/sources/dataC.csv
diff --git a/resources/testcases/restricted_block/run.rls → ...ses/regression/restricted_chase/block.rls b/resources/testcases/restricted_block/run.rls → ...ses/regression/restricted_chase/block.rls
diff --git a/...testcases/restricted_block/run/result.csv → ...ression/restricted_chase/block/result.csv b/...testcases/restricted_block/run/result.csv → ...ression/restricted_chase/block/result.csv
diff --git a/...testcases/restricted_datalog_head/run.rls → ...ression/restricted_chase/datalog_head.rls b/...testcases/restricted_datalog_head/run.rls → ...ression/restricted_chase/datalog_head.rls
diff --git a/...s/restricted_datalog_head/run/datalog.csv → ...restricted_chase/datalog_head/datalog.csv b/...s/restricted_datalog_head/run/datalog.csv → ...restricted_chase/datalog_head/datalog.csv
diff --git a/...es/restricted_datalog_head/run/result.csv → .../restricted_chase/datalog_head/result.csv b/...es/restricted_datalog_head/run/result.csv → .../restricted_chase/datalog_head/result.csv
diff --git a/...rces/testcases/restricted_doctors/run.rls → ...s/regression/restricted_chase/doctors.rls b/...rces/testcases/restricted_doctors/run.rls → ...s/regression/restricted_chase/doctors.rls
diff --git a/...s/restricted_doctors/run/prescription.csv → ...restricted_chase/doctors/prescription.csv b/...s/restricted_doctors/run/prescription.csv → ...restricted_chase/doctors/prescription.csv
diff --git a/...estcases/restricted_head_constant/run.rls → ...ession/restricted_chase/head_constant.rls b/...estcases/restricted_head_constant/run.rls → ...ession/restricted_chase/head_constant.rls
diff --git a/...s/restricted_head_constant/run/result.csv → ...restricted_chase/head_constant/result.csv b/...s/restricted_head_constant/run/result.csv → ...restricted_chase/head_constant/result.csv
diff --git a/...es/testcases/restricted_multihead/run.rls → ...regression/restricted_chase/multihead.rls b/...es/testcases/restricted_multihead/run.rls → ...regression/restricted_chase/multihead.rls
diff --git a/...stcases/restricted_multihead/run/null.csv → ...ssion/restricted_chase/multihead/null.csv b/...stcases/restricted_multihead/run/null.csv → ...ssion/restricted_chase/multihead/null.csv
diff --git a/...cases/restricted_multihead/run/result.csv → ...ion/restricted_chase/multihead/result.csv b/...cases/restricted_multihead/run/result.csv → ...ion/restricted_chase/multihead/result.csv
diff --git a/...s/testcases/restricted_multinulls/run.rls → ...egression/restricted_chase/multinulls.rls b/...s/testcases/restricted_multinulls/run.rls → ...egression/restricted_chase/multinulls.rls
diff --git a/...tcases/restricted_multinulls/run/test.csv → ...sion/restricted_chase/multinulls/test.csv b/...tcases/restricted_multinulls/run/test.csv → ...sion/restricted_chase/multinulls/test.csv
diff --git a/.../testcases/restricted_multipieces/run.rls → ...gression/restricted_chase/multipieces.rls b/.../testcases/restricted_multipieces/run.rls → ...gression/restricted_chase/multipieces.rls
diff --git a/...cases/restricted_multipieces/run/test.csv → ...ion/restricted_chase/multipieces/test.csv b/...cases/restricted_multipieces/run/test.csv → ...ion/restricted_chase/multipieces/test.csv
diff --git a/...s/testcases/restricted_only_nulls/run.rls → ...egression/restricted_chase/only_nulls.rls b/...s/testcases/restricted_only_nulls/run.rls → ...egression/restricted_chase/only_nulls.rls
diff --git a/...ases/restricted_only_nulls/run/result.csv → ...on/restricted_chase/only_nulls/result.csv b/...ases/restricted_only_nulls/run/result.csv → ...on/restricted_chase/only_nulls/result.csv
diff --git a/...es/testcases/restricted_recursive/run.rls → ...ession/restricted_chase/recursive/run.rls b/...es/testcases/restricted_recursive/run.rls → ...ession/restricted_chase/recursive/run.rls
diff --git a/...ases/restricted_recursive/run/resultA.csv → ...estricted_chase/recursive/run/resultA.csv b/...ases/restricted_recursive/run/resultA.csv → ...estricted_chase/recursive/run/resultA.csv
diff --git a/...ases/restricted_recursive/run/resultB.csv → ...estricted_chase/recursive/run/resultB.csv b/...ases/restricted_recursive/run/resultB.csv → ...estricted_chase/recursive/run/resultB.csv
diff --git a/resources/testcases/regression/restricted_chase/recursive/sources/dataA.csv b/resources/testcases/regression/restricted_chase/recursive/sources/dataA.csv
@@ -0,0 +1 @@
+<A>,<B>
diff --git a/resources/testcases/regression/restricted_chase/recursive/sources/dataB.csv b/resources/testcases/regression/restricted_chase/recursive/sources/dataB.csv
@@ -0,0 +1 @@
+<B>,<C>
diff --git a/...urces/testcases/restricted_simple/run.rls → ...es/regression/restricted_chase/simple.rls b/...urces/testcases/restricted_simple/run.rls → ...es/regression/restricted_chase/simple.rls
diff --git a/resources/testcases/regression/restricted_chase/simple/result.csv b/resources/testcases/regression/restricted_chase/simple/result.csv
@@ -0,0 +1,3 @@
+<A>,<__Null#9223372036854775809>
+<B>,<__Null#9223372036854775810>
+<C>,<__Null#9223372036854775811>
diff --git a/...stcases/restricted_block/sources/data.csv → ...ression/restricted_chase/sources/data.csv b/...stcases/restricted_block/sources/data.csv → ...ression/restricted_chase/sources/data.csv
diff --git a/...s/restricted_only_nulls/sources/empty.csv → ...ession/restricted_chase/sources/empty.csv b/...s/restricted_only_nulls/sources/empty.csv → ...ession/restricted_chase/sources/empty.csv
diff --git a/...ces/testcases/stratified_negation/run.rls → ...ression/stratification/binary_negated.rls b/...ces/testcases/stratified_negation/run.rls → ...ression/stratification/binary_negated.rls
diff --git a/...tcases/stratified_negation/run/result.csv → .../stratification/binary_negated/result.csv b/...tcases/stratified_negation/run/result.csv → .../stratification/binary_negated/result.csv
diff --git a/resources/testcases/regression/stratification/regression.yaml b/resources/testcases/regression/stratification/regression.yaml
@@ -0,0 +1,4 @@
+pr: 220
+title: Stratified Negation
+tracker: https://github.com/knowsys/nemo/pull/220
+type: feature
diff --git a/...ases/stratified_negation/sources/data.csv → ...egression/stratification/sources/data.csv b/...ases/stratified_negation/sources/data.csv → ...egression/stratification/sources/data.csv
diff --git a/...ses/stratified_negation/sources/equal.csv → ...gression/stratification/sources/equal.csv b/...ses/stratified_negation/sources/equal.csv → ...gression/stratification/sources/equal.csv
diff --git a/...s/testcases/stratified_negation_2/run.rls → ...gression/stratification/unary_negated.rls b/...s/testcases/stratified_negation_2/run.rls → ...gression/stratification/unary_negated.rls
diff --git a/...testcases/stratified_negation_2/run/q.csv → ...ession/stratification/unary_negated/q.csv b/...testcases/stratified_negation_2/run/q.csv → ...ession/stratification/unary_negated/q.csv
diff --git a/...estcases/stratified_negation_2/run/q1.csv → ...ssion/stratification/unary_negated/q1.csv b/...estcases/stratified_negation_2/run/q1.csv → ...ssion/stratification/unary_negated/q1.csv
diff --git a/...estcases/stratified_negation_2/run/q2.csv → ...ssion/stratification/unary_negated/q2.csv b/...estcases/stratified_negation_2/run/q2.csv → ...ssion/stratification/unary_negated/q2.csv
diff --git a/...testcases/stratified_negation_2/run/r.csv → ...ession/stratification/unary_negated/r.csv b/...testcases/stratified_negation_2/run/r.csv → ...ession/stratification/unary_negated/r.csv
diff --git a/...ses/symmetric_transitive_closure/city.csv → ...ion/symmetric_transitive_closure/city.csv b/...ses/symmetric_transitive_closure/city.csv → ...ion/symmetric_transitive_closure/city.csv
diff --git a/...ses/symmetric_transitive_closure/conn.csv → ...ion/symmetric_transitive_closure/conn.csv b/...ses/symmetric_transitive_closure/conn.csv → ...ion/symmetric_transitive_closure/conn.csv
diff --git a/...ases/symmetric_transitive_closure/run.rls → ...sion/symmetric_transitive_closure/run.rls b/...ases/symmetric_transitive_closure/run.rls → ...sion/symmetric_transitive_closure/run.rls
diff --git a/...tric_transitive_closure/run/connected.csv → ...tric_transitive_closure/run/connected.csv b/...tric_transitive_closure/run/connected.csv → ...tric_transitive_closure/run/connected.csv
diff --git a/...es/testcases/variable_comparisons/run.rls → ...s/regression/variable_comparisons/run.rls b/...es/testcases/variable_comparisons/run.rls → ...s/regression/variable_comparisons/run.rls
diff --git a/...ases/variable_comparisons/run/combine.csv → ...sion/variable_comparisons/run/combine.csv b/...ases/variable_comparisons/run/combine.csv → ...sion/variable_comparisons/run/combine.csv
diff --git a/...cases/variable_comparisons/run/contra.csv → ...ssion/variable_comparisons/run/contra.csv b/...cases/variable_comparisons/run/contra.csv → ...ssion/variable_comparisons/run/contra.csv
diff --git a/...tcases/variable_comparisons/run/equal.csv → ...ession/variable_comparisons/run/equal.csv b/...tcases/variable_comparisons/run/equal.csv → ...ession/variable_comparisons/run/equal.csv
diff --git a/...stcases/variable_comparisons/run/g_eq.csv → ...ression/variable_comparisons/run/g_eq.csv b/...stcases/variable_comparisons/run/g_eq.csv → ...ression/variable_comparisons/run/g_eq.csv
diff --git a/...stcases/variable_comparisons/run/g_un.csv → ...ression/variable_comparisons/run/g_un.csv b/...stcases/variable_comparisons/run/g_un.csv → ...ression/variable_comparisons/run/g_un.csv
diff --git a/...stcases/variable_comparisons/run/l_eq.csv → ...ression/variable_comparisons/run/l_eq.csv b/...stcases/variable_comparisons/run/l_eq.csv → ...ression/variable_comparisons/run/l_eq.csv
diff --git a/...stcases/variable_comparisons/run/l_un.csv → ...ression/variable_comparisons/run/l_un.csv b/...stcases/variable_comparisons/run/l_un.csv → ...ression/variable_comparisons/run/l_un.csv
diff --git a/...tcases/variable_comparisons/run/multi.csv → ...ession/variable_comparisons/run/multi.csv b/...tcases/variable_comparisons/run/multi.csv → ...ession/variable_comparisons/run/multi.csv
diff --git a/...stcases/variable_comparisons/run/r_xy.csv → ...ression/variable_comparisons/run/r_xy.csv b/...stcases/variable_comparisons/run/r_xy.csv → ...ression/variable_comparisons/run/r_xy.csv
diff --git a/...stcases/variable_comparisons/run/r_yx.csv → ...ression/variable_comparisons/run/r_yx.csv b/...stcases/variable_comparisons/run/r_yx.csv → ...ression/variable_comparisons/run/r_yx.csv
diff --git a/...stcases/variable_comparisons/run/uneq.csv → ...ression/variable_comparisons/run/uneq.csv b/...stcases/variable_comparisons/run/uneq.csv → ...ression/variable_comparisons/run/uneq.csv
diff --git a/resources/testcases/repeated_variables/sources/dataA.csv b/resources/testcases/repeated_variables/sources/dataA.csv
diff --git a/resources/testcases/restricted_datalog_head/sources/data.csv b/resources/testcases/restricted_datalog_head/sources/data.csv
diff --git a/resources/testcases/restricted_head_constant/sources/data.csv b/resources/testcases/restricted_head_constant/sources/data.csv
diff --git a/resources/testcases/restricted_multihead/sources/data.csv b/resources/testcases/restricted_multihead/sources/data.csv
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,5 +3,6 @@ A,C,F @@
     A,E,F
     A,G,Q
     B,B,D
+    B,D,A
     C,D,D
     Q,Q,A
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		@source source[3]: load-csv("../sources/empty.csv").

		out(?X, ?Y, ?Z) :- source(?X, ?Y, ?Z) .