From b11070b41888a1ceaaaefad49a7860455b2115fb Mon Sep 17 00:00:00 2001
From: Kristóf Marussy <kris7topher@gmail.com>
Date: Mon, 29 Jul 2019 16:02:59 +0200
Subject: Allow infiite upper scope bound in PolyhedronScopePropagator

---
 .../cardinality/PolyhedronScopePropagator.xtend    | 28 ++++++++++++----------
 1 file changed, 16 insertions(+), 12 deletions(-)

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

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/PolyhedronScopePropagator.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/PolyhedronScopePropagator.xtend
index a3977653..e9c155f5 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/PolyhedronScopePropagator.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/PolyhedronScopePropagator.xtend
@@ -104,41 +104,45 @@ class PolyhedronScopePropagator extends ScopePropagator {
 	}
 
 	private def populateScopesFromPolyhedron() {
-		checkFiniteBounds(topLevelBounds)
+		checkBounds(topLevelBounds)
 		if (partialInterpretation.minNewElements > topLevelBounds.lowerBound) {
 			throw new IllegalArgumentException('''Lower bound of «topLevelBounds» smaller than top-level scope: «partialInterpretation.minNewElements»''')
 		} else if (partialInterpretation.minNewElements != topLevelBounds.lowerBound) {
 			partialInterpretation.minNewElements = topLevelBounds.lowerBound
 		}
-		if (partialInterpretation.maxNewElements >= 0 &&
-			partialInterpretation.maxNewElements < topLevelBounds.upperBound) {
+		val topLevelUpperBound = topLevelBounds.upperBound ?: -1
+		if (partialInterpretation.maxNewElements >= 0 && topLevelUpperBound >= 0 &&
+			partialInterpretation.maxNewElements < topLevelUpperBound) {
 			throw new IllegalArgumentException('''Upper bound of «topLevelBounds» larger than top-level scope: «partialInterpretation.maxNewElements»''')
-		} else if (partialInterpretation.maxNewElements != topLevelBounds.upperBound) {
-			partialInterpretation.maxNewElements = topLevelBounds.upperBound
+		} else if (partialInterpretation.maxNewElements != topLevelUpperBound) {
+			partialInterpretation.maxNewElements = topLevelUpperBound
 		}
 		for (pair : scopeBounds.entrySet) {
 			val scope = pair.key
 			val bounds = pair.value
-			checkFiniteBounds(bounds)
+			checkBounds(bounds)
 			if (scope.minNewElements > bounds.lowerBound) {
 				throw new IllegalArgumentException('''Lower bound of «bounds» smaller than «scope.targetTypeInterpretation» scope: «scope.minNewElements»''')
 			} else if (scope.minNewElements != bounds.lowerBound) {
 				scope.minNewElements = bounds.lowerBound
 			}
-			if (scope.maxNewElements >= 0 && scope.maxNewElements < bounds.upperBound) {
+			val upperBound = bounds.upperBound ?: -1
+			if (scope.maxNewElements >= 0 && upperBound >= 0 && scope.maxNewElements < upperBound) {
 				throw new IllegalArgumentException('''Upper bound of «bounds» larger than «scope.targetTypeInterpretation» scope: «scope.maxNewElements»''')
-			} else if (scope.maxNewElements != bounds.upperBound) {
-				scope.maxNewElements = bounds.upperBound
+			} else if (scope.maxNewElements != upperBound) {
+				scope.maxNewElements = upperBound
 			}
 		}
 	}
 
-	private def checkFiniteBounds(LinearBoundedExpression bounds) {
+	private def checkBounds(LinearBoundedExpression bounds) {
 		if (bounds.lowerBound === null) {
 			throw new IllegalArgumentException("Infinite lower bound: " + bounds)
+		} else if (bounds.lowerBound < 0) {
+			throw new IllegalArgumentException("Negative lower bound: " + bounds)
 		}
-		if (bounds.upperBound === null) {
-			throw new IllegalArgumentException("Infinite upper bound: " + bounds)
+		if (bounds.upperBound !== null && bounds.upperBound < 0) {
+			throw new IllegalArgumentException("Negative upper bound: " + bounds)
 		}
 	}
 
-- 
cgit v1.2.3-54-g00ecf