2 files changed, 217 insertions, 4 deletions

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/interval/Interval.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/interval/Interval.xtend
index cf22315b..93749767 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/interval/Interval.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/interval/Interval.xtend
@@ -13,7 +13,47 @@ abstract class Interval {
         private new() {
         }
 
-        abstract def boolean isZero()
+        abstract def boolean mustEqual(Interval other)
+
+        abstract def boolean mayEqual(Interval other)
+
+        def mustNotEqual(Interval other) {
+                !mayEqual(other)
+        }
+
+        def mayNotEqual(Interval other) {
+                !mustEqual(other)
+        }
+        
+        abstract def boolean mustBeLessThan(Interval other)
+        
+        abstract def boolean mayBeLessThan(Interval other)
+        
+        def mustBeLessThanOrEqual(Interval other) {
+                !mayBeGreaterThan(other)
+        }
+        
+        def mayBeLessThanOrEqual(Interval other) {
+                !mustBeGreaterThan(other)
+        }
+        
+        def mustBeGreaterThan(Interval other) {
+                other.mustBeLessThan(this)
+        }
+        
+        def mayBeGreaterThan(Interval other) {
+                other.mayBeLessThan(this)
+        }
+        
+        def mustBeGreaterThanOrEqual(Interval other) {
+                other.mustBeLessThanOrEqual(this)
+        }
+        
+        def mayBeGreaterThanOrEqual(Interval other) {
+                other.mayBeLessThanOrEqual(this)
+        }
+        
+        abstract def Interval join(Interval other)
 
         def operator_plus() {
                 this
@@ -30,9 +70,25 @@ abstract class Interval {
         abstract def Interval operator_divide(Interval other)
 
         public static val EMPTY = new Interval {
-                override isZero() {
+                override mustEqual(Interval other) {
+                        true
+                }
+
+                override mayEqual(Interval other) {
                         false
                 }
+                
+                override mustBeLessThan(Interval other) {
+                        true
+                }
+                
+                override mayBeLessThan(Interval other) {
+                        false
+                }
+                
+                override join(Interval other) {
+                        other
+                }
 
                 override operator_minus() {
                         EMPTY
@@ -98,8 +154,45 @@ abstract class Interval {
                         this.upper = upper
                 }
 
-                override isZero() {
-                        upper == BigDecimal.ZERO && lower == BigDecimal.ZERO
+                override mustEqual(Interval other) {
+                        switch (other) {
+                                case EMPTY: true
+                                NonEmpty: lower == upper && lower == other.lower && lower == other.upper
+                                default: throw new IllegalArgumentException("")
+                        }
+                }
+
+                override mayEqual(Interval other) {
+                        if (other instanceof NonEmpty) {
+                                (lower === null || other.upper === null || lower <= other.upper) &&
+                                        (other.lower === null || upper === null || other.lower <= upper)
+                        } else {
+                                false
+                        }
+                }
+                
+                override mustBeLessThan(Interval other) {
+                        switch (other) {
+                                case EMPTY: true
+                                NonEmpty: upper !== null && other.lower !== null && upper < other.lower
+                                default: throw new IllegalArgumentException("")
+                        }
+                }
+                
+                override mayBeLessThan(Interval other) {
+                        if (other instanceof NonEmpty) {
+                                lower === null || other.upper === null || lower < other.upper
+                        } else {
+                                false
+                        }
+                }
+                
+                override join(Interval other) {
+                        switch (other) {
+                                case EMPTY: this
+                                NonEmpty: new NonEmpty(lower.tryMin(other.lower), upper.tryMin(other.upper))
+                                default: throw new IllegalArgumentException("")
+                        }
                 }
 
                 override operator_minus() {
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.tests/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/tests/interval/RelationTest.xtend b/Tests/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.tests/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/tests/interval/RelationTest.xtend
new file mode 100644
index 00000000..23fc69ea
--- /dev/null
+++ b/Tests/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.tests/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/tests/interval/RelationTest.xtend
@@ -0,0 +1,120 @@
+package hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.tests.interval
+
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.interval.Interval
+import java.util.Collection
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.Parameterized
+import org.junit.runners.Parameterized.Parameter
+import org.junit.runners.Parameterized.Parameters
+
+import static hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.interval.Interval.*
+
+@RunWith(Parameterized)
+class RelationTest {
+        @Parameters(name = "{index}: {0} <> {1}")
+        static def Collection<Object[]> data() {
+                #[
+                        #[EMPTY, EMPTY, true, false, true, false],
+                        #[EMPTY, between(1, 2), true, false, true, false],
+                        #[between(1, 2), EMPTY, true, false, true, false],
+                        #[upTo(1), upTo(0), false, true, false, true],
+                        #[upTo(1), upTo(1), false, true, false, true],
+                        #[upTo(1), upTo(2), false, true, false, true],
+                        #[upTo(1), above(0), false, true, false, true],
+                        #[upTo(1), above(1), false, true, false, true],
+                        #[upTo(1), above(2), false, false, true, true],
+                        #[upTo(1), between(-1, -1), false, true, false, true],
+                        #[upTo(1), between(-1, 0), false, true, false, true],
+                        #[upTo(1), between(-1, 1), false, true, false, true],
+                        #[upTo(1), between(-1, 2), false, true, false, true],
+                        #[upTo(1), between(1, 1), false, true, false, true],
+                        #[upTo(1), between(1, 2), false, true, false, true],
+                        #[upTo(1), between(2, 2), false, false, true, true],
+                        #[upTo(1), between(2, 3), false, false, true, true],
+                        #[above(1), upTo(0), false, false, false, false],
+                        #[above(1), upTo(1), false, true, false, false],
+                        #[above(1), upTo(2), false, true, false, true],
+                        #[above(1), above(0), false, true, false, true],
+                        #[above(1), above(1), false, true, false, true],
+                        #[above(1), above(2), false, true, false, true],
+                        #[above(1), between(-1, -1), false, false, false, false],
+                        #[above(1), between(-1, 0), false, false, false, false],
+                        #[above(1), between(-1, 1), false, true, false, false],
+                        #[above(1), between(-1, 2), false, true, false, true],
+                        #[above(1), between(1, 1), false, true, false, false],
+                        #[above(1), between(1, 2), false, true, false, true],
+                        #[above(1), between(2, 2), false, true, false, true],
+                        #[above(1), between(2, 3), false, true, false, true],
+                        #[between(1, 1), upTo(0), false, false, false, false],
+                        #[between(1, 1), upTo(1), false, true, false, false],
+                        #[between(1, 1), upTo(2), false, true, false, true],
+                        #[between(1, 1), above(0), false, true, false, true],
+                        #[between(1, 1), above(1), false, true, false, true],
+                        #[between(1, 1), above(2), false, false, true, true],
+                        #[between(1, 1), between(-1, -1), false, false, false, false],
+                        #[between(1, 1), between(-1, 0), false, false, false, false],
+                        #[between(1, 1), between(-1, 1), false, true, false, false],
+                        #[between(1, 1), between(-1, 2), false, true, false, true],
+                        #[between(1, 1), between(1, 1), true, true, false, false],
+                        #[between(1, 1), between(1, 2), false, true, false, true],
+                        #[between(1, 1), between(2, 2), false, false, true, true],
+                        #[between(1, 1), between(2, 3), false, false, true, true],
+                        #[between(-1, 1), upTo(-2), false, false, false, false],
+                        #[between(-1, 1), upTo(-1), false, true, false, false],
+                        #[between(-1, 1), upTo(0), false, true, false, true],
+                        #[between(-1, 1), upTo(1), false, true, false, true],
+                        #[between(-1, 1), upTo(2), false, true, false, true],
+                        #[between(-1, 1), above(-2), false, true, false, true],
+                        #[between(-1, 1), above(-1), false, true, false, true],
+                        #[between(-1, 1), above(0), false, true, false, true],
+                        #[between(-1, 1), above(1), false, true, false, true],
+                        #[between(-1, 1), above(2), false, false, true, true],
+                        #[between(-1, 1), between(-3, -2), false, false, false, false],
+                        #[between(-1, 1), between(-2, -2), false, false, false, false],
+                        #[between(-1, 1), between(-2, -1), false, true, false, false],
+                        #[between(-1, 1), between(-2, 0), false, true, false, true],
+                        #[between(-1, 1), between(-2, 1), false, true, false, true],
+                        #[between(-1, 1), between(-2, 2), false, true, false, true],
+                        #[between(-1, 1), between(-1, -1), false, true, false, false],
+                        #[between(-1, 1), between(-1, 0), false, true, false, true],
+                        #[between(-1, 1), between(-1, 1), false, true, false, true],
+                        #[between(-1, 1), between(-1, 2), false, true, false, true],
+                        #[between(-1, 1), between(0, 0), false, true, false, true],
+                        #[between(-1, 1), between(0, 1), false, true, false, true],
+                        #[between(-1, 1), between(0, 2), false, true, false, true],
+                        #[between(-1, 1), between(1, 1), false, true, false, true],
+                        #[between(-1, 1), between(1, 2), false, true, false, true],
+                        #[between(-1, 1), between(2, 2), false, false, true, true],
+                        #[between(-1, 1), between(2, 3), false, false, true, true]
+                ]
+        }
+        
+        @Parameter(0) public var Interval a
+        @Parameter(1) public var Interval b
+        @Parameter(2) public var boolean mustEqual
+        @Parameter(3) public var boolean mayEqual
+        @Parameter(4) public var boolean mustBeLessThan
+        @Parameter(5) public var boolean mayBeLessThan
+        
+        @Test
+        def void mustEqualTest() {
+                Assert.assertEquals(mustEqual, a.mustEqual(b))
+        }
+        
+        @Test
+        def void mayEqualTest() {
+                Assert.assertEquals(mayEqual, a.mayEqual(b))
+        }
+        
+        @Test
+        def void mustBeLessThanTest() {
+                Assert.assertEquals(mustBeLessThan, a.mustBeLessThan(b))
+        }
+        
+        @Test
+        def void mayBeLessThanTest() {
+                Assert.assertEquals(mayBeLessThan, a.mayBeLessThan(b))
+        }
+}