1 files changed, 13 insertions, 3 deletions

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 e45ec1c8..6fbbc779 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
@@ -27,6 +27,7 @@ import java.util.Set
 import org.eclipse.viatra.query.runtime.api.IPatternMatch

 import org.eclipse.viatra.query.runtime.api.IQuerySpecification

 import org.eclipse.viatra.query.runtime.api.ViatraQueryMatcher

+import org.eclipse.viatra.query.runtime.matchers.psystem.PConstraint

 import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PQuery

 import org.eclipse.viatra.transformation.runtime.emf.rules.batch.BatchTransformationRule

 import org.eclipse.xtend.lib.annotations.Data

@@ -83,6 +84,9 @@ class ModelGenerationStatistics {
 

         Collection<? extends IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> invalidWF

 

+        Map<PConstraint, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> mustUnitPropagationPreconditions

+        Map<PConstraint, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> currentUnitPropagationPreconditions

+

         Map<String, ModalPatternQueries> modalRelationQueries

 

         Collection<? extends IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> allPatterns

@@ -120,12 +124,13 @@ class ModelGenerationMethodProvider {
                         workspace, typeInferenceMethod, scopePropagatorStrategy, relationConstraints, hints, writeFiles)

                 val scopePropagator = createScopePropagator(scopePropagatorStrategy, emptySolution, hints, queries, statistics)

                 scopePropagator.propagateAllScopeConstraints

-                val objectRefinementRules = refinementRuleProvider.createObjectRefinementRules(queries, scopePropagator,

-                        nameNewElements, statistics)

+                val objectRefinementRules = refinementRuleProvider.createObjectRefinementRules(logicProblem, emptySolution,

+                        queries, scopePropagator, nameNewElements, statistics)

                 val relationRefinementRules = refinementRuleProvider.createRelationRefinementRules(queries, scopePropagator,

                         statistics)

 

-                val unfinishedMultiplicities = goalConstraintProvider.getUnfinishedMultiplicityQueries(queries)

+                val unfinishedMultiplicities = goalConstraintProvider.getUnfinishedMultiplicityQueries(logicProblem,queries)

+

                 val unfinishedWF = queries.getUnfinishedWFQueries.values

 

                 val modalRelationQueriesBuilder = ImmutableMap.builder

@@ -138,6 +143,9 @@ class ModelGenerationMethodProvider {
                 val modalRelationQueries = modalRelationQueriesBuilder.build

 

                 val invalidWF = queries.getInvalidWFQueries.values

+                

+                val mustUnitPropagationPreconditions = queries.getMustUnitPropagationPreconditionPatterns

+                val currentUnitPropagationPreconditions = queries.getCurrentUnitPropagationPreconditionPatterns

 

                 return new ModelGenerationMethod(

                         statistics,

@@ -146,6 +154,8 @@ class ModelGenerationMethodProvider {
                         unfinishedMultiplicities,

                         unfinishedWF,

                         invalidWF,

+                        mustUnitPropagationPreconditions,

+                        currentUnitPropagationPreconditions,

                         modalRelationQueries,

                         queries.allQueries

                 )