From 91b772506f00ce2e317027dd384b82dc7a1295fd Mon Sep 17 00:00:00 2001
From: Oszkar Semerath <semerath@mit.bme.hu>
Date: Mon, 11 May 2020 02:22:15 +0200
Subject: separated must and current UP rules to support non-prop neg finds

---
 .../logic2viatra/ModelGenerationMethodProvider.xtend             | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/ModelGenerationMethodProvider.xtend')

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/ModelGenerationMethodProvider.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/ModelGenerationMethodProvider.xtend
index 975ace2f..be11ed78 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/ModelGenerationMethodProvider.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/ModelGenerationMethodProvider.xtend
@@ -38,7 +38,8 @@ class ModelGenerationStatistics {
 	 
 	 Collection<? extends IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> invalidWF
 	 
-	  Map<PConstraint, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> unitPropagationPreconditions
+	 Map<PConstraint, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> mustUnitPropagationPreconditions
+	 Map<PConstraint, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> currentUnitPropagationPreconditions
 	 
 	 Collection<? extends IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> allPatterns
 }
@@ -81,7 +82,8 @@ class ModelGenerationMethodProvider {
 		
 		val invalidWF = queries.getInvalidWFQueries.values
 		
-		val unitPropagationPreconditions = queries.getUnitPropagationPreconditionPatterns
+		val mustUnitPropagationPreconditions = queries.getMustUnitPropagationPreconditionPatterns
+		val currentUnitPropagationPreconditions = queries.getCurrentUnitPropagationPreconditionPatterns
 		
 		return new ModelGenerationMethod(
 			statistics,
@@ -90,7 +92,8 @@ class ModelGenerationMethodProvider {
 			unfinishedMultiplicities,
 			unfinishedWF,
 			invalidWF,
-			unitPropagationPreconditions,
+			mustUnitPropagationPreconditions,
+			currentUnitPropagationPreconditions,
 			queries.allQueries
 		)
 	}
-- 
cgit v1.2.3-54-g00ecf