From 2b4ad89e72fdf9612854b27bc8dd818c8f062d35 Mon Sep 17 00:00:00 2001 From: Jannis Harder Date: Mon, 13 Jun 2011 22:19:31 +0200 Subject: Restructured fdsolver api and made first test succeed git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@423 72836036-5685-4462-b002-a69064685172 --- test/jrummikub/ai/fdsolver/SolverTest.java | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) (limited to 'test') diff --git a/test/jrummikub/ai/fdsolver/SolverTest.java b/test/jrummikub/ai/fdsolver/SolverTest.java index 3798423..d03dfe4 100644 --- a/test/jrummikub/ai/fdsolver/SolverTest.java +++ b/test/jrummikub/ai/fdsolver/SolverTest.java @@ -1,8 +1,8 @@ package jrummikub.ai.fdsolver; import static org.junit.Assert.assertEquals; - -import java.util.Arrays; +import jrummikub.ai.fdsolver.constraint.LessThan; +import jrummikub.ai.fdsolver.constraint.LessThanConst; import org.junit.Test; @@ -11,18 +11,20 @@ public class SolverTest { public void test() { Solver solver = new Solver(); - Var x = new Var(solver, Arrays.asList(1, 2, 3)); - Var y = Var.range(solver, 1,13); + Var x = solver.makeVar(1, 2, 3); + Var y = solver.makeRangeVar(1, 13); - Constraints.lessThan(solver, y, x); - - while(solver.solve()) { - solver.push(); - Constraints.lessThan(solver, x, x.getValue()); - } - solver.pop(); + solver.addConstraint(new LessThan(false, y, x)); - assertEquals(2, (int)x.getValue()); - assertEquals(1, (int)y.getValue()); + int lastx = 0, lasty = 0; + while (solver.solve()) { + lastx = x.getValue(); + lasty = y.getValue(); + System.out.println("x = " + lastx + ", y = " + lasty); + solver.addConstraint(new LessThanConst(false, x, x.getValue())); + } + + assertEquals(2, lastx); + assertEquals(1, lasty); } } -- cgit v1.2.3