consistently add auxillary information in normalized rules

Author: aannleax

nemo/src/execution/planning/analysis/variable_order.rs

@@ -988,7 +988,6 @@ mod test {
         ImportInstruction::new(predicate, handler)
     }
 
-    // #[ignore]
     #[test]
     #[cfg_attr(miri, ignore)]
     fn build_preferable_variable_orders_with_galen_el_part_ie_5_rules_without_constant() {
@@ -1000,6 +999,7 @@ mod test {
             let (predicate, arity) = predicates[predicate_index].clone();
             program.add_import(csv_import(predicate, arity));
         }
+
         for rule in rules {
             program.add_rule(rule);
         }
@@ -1280,7 +1280,6 @@ mod test {
         (rules, variables, predicates)
     }
 
-    #[ignore]
     #[test]
     #[cfg_attr(miri, ignore)]
     fn build_preferable_variable_orders_with_el_without_constant() {

nemo/src/execution/planning/normalization/program.rs

@@ -53,6 +53,25 @@ impl NormalizedProgram {
 
     /// Add a new rule to the program.
     pub fn add_rule(&mut self, rule: NormalizedRule) {
+        let rule_index = self.rules.len();
+
+        for (predicate, arity) in rule.predicates() {
+            self.add_predicate_arity(predicate, arity);
+        }
+
+        for body in rule.positive() {
+            self.add_body_predicate_rule(body.predicate(), rule_index);
+        }
+
+        for head in rule.head() {
+            self.add_head_predicate_rule(head.predicate(), rule_index);
+            self.add_derived_predicate(head.predicate());
+        }
+
+        for value in rule.datavalues() {
+            self.add_datavalue(value);
+        }
+
         self.rules.push(rule);
     }
 
@@ -207,24 +226,7 @@ impl NormalizedProgram {
         for (rule_index, rule) in program.rules().enumerate() {
             let normalized_rule = NormalizedRule::normalize_rule(rule, rule_index);
 
-            for (predicate, arity) in normalized_rule.predicates() {
-                result.add_predicate_arity(predicate, arity);
-            }
-
-            for body in normalized_rule.positive() {
-                result.add_body_predicate_rule(body.predicate(), rule_index);
-            }
-
-            for head in normalized_rule.head() {
-                result.add_head_predicate_rule(head.predicate(), rule_index);
-                result.add_derived_predicate(head.predicate());
-            }
-
-            for value in normalized_rule.datavalues() {
-                result.add_datavalue(value);
-            }
-
-            result.rules.push(normalized_rule);
+            result.add_rule(normalized_rule);
         }
 
         // Handle imports