From e3e8c7810679acebb3418dd355ca6732b9b117d2 Mon Sep 17 00:00:00 2001
From: Kristóf Marussy <kris7topher@gmail.com>
Date: Wed, 24 Jul 2019 14:17:45 +0200
Subject: Containment root constraint propagator

---
 .../viatrasolver/logic2viatra/ModelGenerationMethodProvider.xtend    | 5 +++--
 1 file changed, 3 insertions(+), 2 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 3a99d3bf..4b278188 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
@@ -45,6 +45,7 @@ class ModelGenerationStatistics {
 	Collection<? extends BatchTransformationRule<?, ?>> relationRefinementRules
 
 	List<MultiplicityGoalConstraintCalculator> unfinishedMultiplicities
+
 	Collection<? extends IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> unfinishedWF
 
 	Collection<? extends IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> invalidWF
@@ -125,8 +126,8 @@ class ModelGenerationMethodProvider {
 			case PolyhedralRelations: {
 				val types = queries.refineObjectQueries.keySet.map[newType].toSet
 				val solver = new CbcPolyhedronSolver
-				new PolyhedronScopePropagator(emptySolution, types, queries.multiplicityConstraintQueries, solver,
-					scopePropagatorStrategy.requiresUpperBoundIndexing)
+				new PolyhedronScopePropagator(emptySolution, types, queries.multiplicityConstraintQueries,
+					queries.hasElementInContainmentQuery, solver, scopePropagatorStrategy.requiresUpperBoundIndexing)
 			}
 			default:
 				throw new IllegalArgumentException("Unknown scope propagator strategy: " + scopePropagatorStrategy)
-- 
cgit v1.2.3-54-g00ecf