1 files changed, 19 insertions, 6 deletions
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/PatternGenerator.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/PatternGenerator.xtend
index 80bc3844..edf92343 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/PatternGenerator.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/PatternGenerator.xtend
@@ -25,12 +25,13 @@ import java.util.HashMap
 import java.util.Map
 import org.eclipse.emf.ecore.EAttribute
 import org.eclipse.emf.ecore.EReference
+import org.eclipse.viatra.query.runtime.matchers.psystem.PConstraint
 import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PQuery
 import org.eclipse.xtend.lib.annotations.Accessors
+import org.eclipse.xtend.lib.annotations.Data
+import org.eclipse.xtend2.lib.StringConcatenationClient
 import static extension hu.bme.mit.inf.dslreasoner.util.CollectionsUtil.*
-import org.eclipse.xtend.lib.annotations.Data
-import org.eclipse.viatra.query.runtime.matchers.psystem.PConstraint
 @Data class PatternGeneratorResult {
        CharSequence patternText
@@ -38,6 +39,14 @@ import org.eclipse.viatra.query.runtime.matchers.psystem.PConstraint
        HashMap<PConstraint,String> constraint2CurrentPreconditionName
 }
+interface UnitPropagationPatternGenerator {
+        def Map<Relation, String> getMustPatterns()
+        
+        def Map<Relation, String> getMustNotPatterns()
+        
+        def StringConcatenationClient getAdditionalPatterns(PatternGenerator generator, Map<String, PQuery> fqn2PQuery)
+}
 class PatternGenerator {
        @Accessors(PUBLIC_GETTER) val TypeIndexer typeIndexer // = new TypeIndexer(this)
        @Accessors(PUBLIC_GETTER) val RelationDeclarationIndexer relationDeclarationIndexer = new RelationDeclarationIndexer(
@@ -157,7 +166,8 @@ class PatternGenerator {
                Map<String, PQuery> fqn2PQuery,
                TypeAnalysisResult typeAnalysisResult,
                RelationConstraints constraints,
-                Collection<LinearTypeConstraintHint> hints
+                Collection<LinearTypeConstraintHint> hints,
+                Collection<UnitPropagationPatternGenerator> unitPropagationPatternGenerators
        ) {
                val first = 
                 '''
@@ -313,7 +323,7 @@ class PatternGenerator {
                        //////////
                        // 1.2 Relation Declaration Indexers
                        //////////
-                        «relationDeclarationIndexer.generateRelationIndexers(problem,problem.relations.filter(RelationDeclaration),fqn2PQuery)»
+                        «relationDeclarationIndexer.generateRelationIndexers(problem,problem.relations.filter(RelationDeclaration),unitPropagationPatternGenerators,fqn2PQuery)»
                        
                        //////////
                        // 1.3 Relation Definition Indexers
@@ -359,13 +369,16 @@ class PatternGenerator {
                        //////////
                        // 4.3 Relation refinement
                        //////////
-                        «relationRefinementGenerator.generateRefineReference(problem)»
+                        «relationRefinementGenerator.generateRefineReference(problem, unitPropagationPatternGenerators)»
                        
                        //////////
                        // 5 Hints
                        //////////
                        «FOR hint : hints»
-                                «hint.getAdditionalPatterns(this)»
+                                «hint.getAdditionalPatterns(this, fqn2PQuery)»
+                        «ENDFOR»
+                        «FOR generator : unitPropagationPatternGenerators»
+                                «generator.getAdditionalPatterns(this, fqn2PQuery)»
                        «ENDFOR»
                        
                        //////////