diff --git a/cp-demo/RedBlackTree.scala b/cp-demo/RedBlackTree.scala index 5248d4ba609f68675a3d427b1d5d59184157a5af..c79411d4a63f2d349e45e4d16fb6eb4b7a70077a 100644 --- a/cp-demo/RedBlackTree.scala +++ b/cp-demo/RedBlackTree.scala @@ -125,12 +125,12 @@ object RedBlackTree { val defaultBound = 3 val bound = if (args.isEmpty) defaultBound else args(0).toInt - // enumerateAllUpTo(bound) + enumerateAllUpTo(bound) val solutionSet = scala.collection.mutable.Set[Tree]() - println("Fixing size of trees to " + (bound + 1)) + println("Fixing size of trees to " + (bound)) Timer.go - for (tree <- findAll((t : Tree) => isRedBlackTree(t) && boundValues(t, bound) && size(t) == bound + 1)) { + for (tree <- findAll((t : Tree) => isRedBlackTree(t) && boundValues(t, bound - 1) && size(t) == bound)) { solutionSet += tree } Timer.stop diff --git a/cp-runner b/cp-runner index 365392426fe8451ecda86335b5c4f23cbc636b72..aabc3c235a8293e5837f808faea9b53db6772c86 100755 --- a/cp-runner +++ b/cp-runner @@ -1,5 +1,4 @@ #!/bin/bash LD_LIBRARY_PATH=lib-bin \ -JAVA_OPTS="-Xmx512M -Xms512M -Xss256M" \ scala -classpath bin/purescala/purescala-definitions_2.8.1-1.0.jar:lib/z3.jar:bin/cp/constraint-programming-plugin_2.8.1-1.0.jar:out ${@}