From 64138e8d91bc8d7bb54d9b042f872b43550dec16 Mon Sep 17 00:00:00 2001
From: Kristóf Marussy <kris7topher@gmail.com>
Date: Wed, 24 Jul 2019 10:59:02 +0200
Subject: Cardinality propagator WIP

---
 .../cardinality/PolyhedronSolver.xtend             | 32 ++++++++++++++--------
 1 file changed, 20 insertions(+), 12 deletions(-)

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

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/PolyhedronSolver.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/PolyhedronSolver.xtend
index 08bf25b9..9c6cb82e 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/PolyhedronSolver.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/PolyhedronSolver.xtend
@@ -52,18 +52,14 @@ class Polyhedron {
 	val List<LinearBoundedExpression> expressionsToSaturate
 
 	override toString() '''
-		Dimensions:
-			«FOR dimension : dimensions»
-				«dimension»
-			«ENDFOR»
-		Constraints:
-			«FOR constraint : constraints»
-				«constraint»
-			«ENDFOR»
-«««		Saturate:
-«««			«FOR expression : expressionsToSaturate»
-«««				«IF expression instanceof Dimension»dimension«ELSEIF expression instanceof LinearConstraint»constraint«ELSE»unknown«ENDIF» «expression»
-«««			«ENDFOR»
+	Dimensions:
+		«FOR dimension : dimensions»
+			«dimension»
+		«ENDFOR»
+	Constraints:
+		«FOR constraint : constraints»
+			«constraint»
+		«ENDFOR»
 	'''
 
 }
@@ -72,6 +68,18 @@ class Polyhedron {
 abstract class LinearBoundedExpression {
 	var Integer lowerBound
 	var Integer upperBound
+
+	def void tightenLowerBound(Integer tighterBound) {
+		if (lowerBound === null || (tighterBound !== null && lowerBound < tighterBound)) {
+			lowerBound = tighterBound
+		}
+	}
+
+	def void tightenUpperBound(Integer tighterBound) {
+		if (upperBound === null || (tighterBound !== null && upperBound > tighterBound)) {
+			upperBound = tighterBound
+		}
+	}
 }
 
 @Accessors
-- 
cgit v1.2.3-70-g09d2