Keep variable annotations in SemanticRule record when converting to SemgusProblem

Author: phantamanta44

src/main/java/org/semgus/java/problem/ProblemGenerator.java

@@ -197,7 +197,8 @@ private void consumeHornClause(HornClauseEvent event) {
                 event.constructor().arguments(),
                 event.head(),
                 event.bodyRelations(),
-                event.constraint()));
+                event.constraint(),
+                event.variables()));
     }
 
     /**
@@ -246,9 +247,7 @@ public SemgusProblem end() {
                 productions.put(production.operator(), new SemgusProduction(
                         production.operator(),
                         termCtor.childTermTypes.stream().map(nonTerminals::get).collect(Collectors.toList()),
-                        termCtor.semanticRules.stream()
-                                .map(r -> new SemanticRule(r.childTermVars(), r.head(), r.bodyRelations(), r.constraint()))
-                                .collect(Collectors.toList())));
+                        new ArrayList<>(termCtor.semanticRules)));
             }
         }
 

src/main/java/org/semgus/java/problem/SemanticRule.java

@@ -1,10 +1,12 @@
 package org.semgus.java.problem;
 
+import org.semgus.java.object.AnnotatedVar;
 import org.semgus.java.object.RelationApp;
 import org.semgus.java.object.SmtTerm;
 import org.semgus.java.object.TypedVar;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * A semantic rule associated with a production in a SemGuS problem's grammar specification. This takes the form of a
@@ -14,8 +16,9 @@
  * @param head          The conclusion of the semantic rule.
  * @param bodyRelations The premise relations of the semantic rule.
  * @param constraint    The semantic constraint of the semantic rule's premise, given as an SMT formula.
+ * @param variables     The collection of all variables referenced in the semantic rule.
  */
 public record SemanticRule(List<TypedVar> childTermVars, RelationApp head, List<RelationApp> bodyRelations,
-                           SmtTerm constraint) {
+                           SmtTerm constraint, Map<String, AnnotatedVar> variables) {
     // NO-OP
 }