From 94a7e721fba3c3bf6bcda75cde474e21c5afdf39 Mon Sep 17 00:00:00 2001 From: Kristóf Marussy Date: Thu, 9 May 2019 09:28:40 -0400 Subject: Fix interval join --- .../logic2viatra/tests/interval/RelationTest.xtend | 150 +++++++++++---------- 1 file changed, 78 insertions(+), 72 deletions(-) (limited to 'Tests') 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 index 23fc69ea..5527fbaa 100644 --- 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 @@ -16,78 +16,78 @@ class RelationTest { @Parameters(name = "{index}: {0} <> {1}") static def Collection 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] + #[EMPTY, EMPTY, true, false, true, false, EMPTY], + #[EMPTY, between(1, 2), true, false, true, false, between(1, 2)], + #[between(1, 2), EMPTY, true, false, true, false, between(1, 2)], + #[upTo(1), upTo(0), false, true, false, true, upTo(1)], + #[upTo(1), upTo(1), false, true, false, true, upTo(1)], + #[upTo(1), upTo(2), false, true, false, true, upTo(2)], + #[upTo(1), above(0), false, true, false, true, UNBOUNDED], + #[upTo(1), above(1), false, true, false, true, UNBOUNDED], + #[upTo(1), above(2), false, false, true, true, UNBOUNDED], + #[upTo(1), between(-1, -1), false, true, false, true, upTo(1)], + #[upTo(1), between(-1, 0), false, true, false, true, upTo(1)], + #[upTo(1), between(-1, 1), false, true, false, true, upTo(1)], + #[upTo(1), between(-1, 2), false, true, false, true, upTo(2)], + #[upTo(1), between(1, 1), false, true, false, true, upTo(1)], + #[upTo(1), between(1, 2), false, true, false, true, upTo(2)], + #[upTo(1), between(2, 2), false, false, true, true, upTo(2)], + #[upTo(1), between(2, 3), false, false, true, true, upTo(3)], + #[above(1), upTo(0), false, false, false, false, UNBOUNDED], + #[above(1), upTo(1), false, true, false, false, UNBOUNDED], + #[above(1), upTo(2), false, true, false, true, UNBOUNDED], + #[above(1), above(0), false, true, false, true, above(0)], + #[above(1), above(1), false, true, false, true, above(1)], + #[above(1), above(2), false, true, false, true, above(1)], + #[above(1), between(-1, -1), false, false, false, false, above(-1)], + #[above(1), between(-1, 0), false, false, false, false, above(-1)], + #[above(1), between(-1, 1), false, true, false, false, above(-1)], + #[above(1), between(-1, 2), false, true, false, true, above(-1)], + #[above(1), between(1, 1), false, true, false, false, above(1)], + #[above(1), between(1, 2), false, true, false, true, above(1)], + #[above(1), between(2, 2), false, true, false, true, above(1)], + #[above(1), between(2, 3), false, true, false, true, above(1)], + #[between(1, 1), upTo(0), false, false, false, false, upTo(1)], + #[between(1, 1), upTo(1), false, true, false, false, upTo(1)], + #[between(1, 1), upTo(2), false, true, false, true, upTo(2)], + #[between(1, 1), above(0), false, true, false, true, above(0)], + #[between(1, 1), above(1), false, true, false, true, above(1)], + #[between(1, 1), above(2), false, false, true, true, above(1)], + #[between(1, 1), between(-1, -1), false, false, false, false, between(-1, 1)], + #[between(1, 1), between(-1, 0), false, false, false, false, between(-1, 1)], + #[between(1, 1), between(-1, 1), false, true, false, false, between(-1, 1)], + #[between(1, 1), between(-1, 2), false, true, false, true, between(-1, 2)], + #[between(1, 1), between(1, 1), true, true, false, false, between(1, 1)], + #[between(1, 1), between(1, 2), false, true, false, true, between(1, 2)], + #[between(1, 1), between(2, 2), false, false, true, true, between(1, 2)], + #[between(1, 1), between(2, 3), false, false, true, true, between(1, 3)], + #[between(-1, 1), upTo(-2), false, false, false, false, upTo(1)], + #[between(-1, 1), upTo(-1), false, true, false, false, upTo(1)], + #[between(-1, 1), upTo(0), false, true, false, true, upTo(1)], + #[between(-1, 1), upTo(1), false, true, false, true, upTo(1)], + #[between(-1, 1), upTo(2), false, true, false, true, upTo(2)], + #[between(-1, 1), above(-2), false, true, false, true, above(-2)], + #[between(-1, 1), above(-1), false, true, false, true, above(-1)], + #[between(-1, 1), above(0), false, true, false, true, above(-1)], + #[between(-1, 1), above(1), false, true, false, true, above(-1)], + #[between(-1, 1), above(2), false, false, true, true, above(-1)], + #[between(-1, 1), between(-3, -2), false, false, false, false, between(-3, 1)], + #[between(-1, 1), between(-2, -2), false, false, false, false, between(-2, 1)], + #[between(-1, 1), between(-2, -1), false, true, false, false, between(-2, 1)], + #[between(-1, 1), between(-2, 0), false, true, false, true, between(-2, 1)], + #[between(-1, 1), between(-2, 1), false, true, false, true, between(-2, 1)], + #[between(-1, 1), between(-2, 2), false, true, false, true, between(-2, 2)], + #[between(-1, 1), between(-1, -1), false, true, false, false, between(-1, 1)], + #[between(-1, 1), between(-1, 0), false, true, false, true, between(-1, 1)], + #[between(-1, 1), between(-1, 1), false, true, false, true, between(-1, 1)], + #[between(-1, 1), between(-1, 2), false, true, false, true, between(-1, 2)], + #[between(-1, 1), between(0, 0), false, true, false, true, between(-1, 1)], + #[between(-1, 1), between(0, 1), false, true, false, true, between(-1, 1)], + #[between(-1, 1), between(0, 2), false, true, false, true, between(-1, 2)], + #[between(-1, 1), between(1, 1), false, true, false, true, between(-1, 1)], + #[between(-1, 1), between(1, 2), false, true, false, true, between(-1, 2)], + #[between(-1, 1), between(2, 2), false, false, true, true, between(-1, 2)], + #[between(-1, 1), between(2, 3), false, false, true, true, between(-1, 3)] ] } @@ -97,6 +97,7 @@ class RelationTest { @Parameter(3) public var boolean mayEqual @Parameter(4) public var boolean mustBeLessThan @Parameter(5) public var boolean mayBeLessThan + @Parameter(6) public var Interval join @Test def void mustEqualTest() { @@ -117,4 +118,9 @@ class RelationTest { def void mayBeLessThanTest() { Assert.assertEquals(mayBeLessThan, a.mayBeLessThan(b)) } + + @Test + def void joinTest() { + Assert.assertEquals(join, a.join(b)) + } } -- cgit v1.2.3-54-g00ecf