diff --git a/CHANGELOG b/CHANGELOG index ea5e7fb70..2209bf083 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,43 @@ +Version 4.11 +============= + +1. Bug corrections, code cleaning and performance improvements. + +Version 4.10 +============= + +1. Implementation of relax and reconstruct for restart + search. Available in minizinc with search annotation + relax_and_reconstruct in combination with restart annotation. + +2. Implementation of round, floor and ceil constraints in both JaCoP + (RoundPeqX, FloorPeqX and CeilPeqX) and for minizinc. + +3. Implementation of channeling constraint, ChannelIntSet and + ChannelBoolSet. ChannelIntSet is defined for array of int variables + x and array of set variables s. They are related such that (x[i] = + j) <-> (i in y[j]). ChannelBoolSet id defined for array of Boolean + variables and a set variable and requires that i in s <-> b[i]. + Available in minizinc as int_set_channel and Link_set_to_booleans. + +4. Implementation of set partitioning constraint, PartitionSet, and + related minizinc interface. + +5. Implementation of cumulative constraints, CumulativeOptional and + CumulativeUnaryOptional, for optional tasks. Available from + minizinc as cumulative and disjunctive with start times defined as + optional variables. + +6. Implementation of AllEqual primitive constraint (can be reified) + and SeqPrecedeChain constraint (not incremental version since it + requires many TimeStamp variables and informing constraint which + variables have changed). Both constraints are available from + minizinc. + +7. Command line options in flatzinc for restart search. + +8. Bug corrections, code cleaning and performance improvements. + Version 4.9 ============= diff --git a/change.bash b/change.bash index c7252aefc..9543e0845 100644 --- a/change.bash +++ b/change.bash @@ -1,7 +1,7 @@ #!/bin/bash echo changing file $1; mv $1 $1.bak; -sed -e "s/@version 4.8/@version 4.9/g" < $1.bak > $1; +sed -e "s/@version 4.9/@version 4.10/g" < $1.bak > $1; rm $1.bak; # command to be executed # find src/ -name "*.java" -exec ./change.bash {} \; diff --git a/doc/jacopguide/guideJaCoP.pdf b/doc/jacopguide/guideJaCoP.pdf new file mode 100644 index 000000000..db6594be0 Binary files /dev/null and b/doc/jacopguide/guideJaCoP.pdf differ diff --git a/pom.xml b/pom.xml index b891a2b0c..d8791aeef 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,12 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 + http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.jacop jacop - 4.9.0 + 4.11.0-SNAPSHOT jar JaCoP @@ -68,6 +69,7 @@ 1.8 1.8 1.8.10 + 2.13.12 resources/checkstyle.xml false @@ -104,7 +106,7 @@ setup to run configuration. --> org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M5 + 3.0.0-M9 **/IntDomainTest.java @@ -135,7 +137,7 @@ setup to run configuration. --> org.apache.maven.plugins maven-surefire-plugin - 2.19.1 + 3.0.0-M9 **/IntDomainTest.java @@ -166,7 +168,7 @@ setup to run configuration. --> org.apache.maven.plugins maven-surefire-plugin - 2.19.1 + 3.0.0-M9 **/IntDomainTest.java @@ -197,7 +199,7 @@ setup to run configuration. --> org.apache.maven.plugins maven-surefire-plugin - 2.19.1 + 3.0.0-M9 **/IntDomainTest.java @@ -306,13 +308,13 @@ setup to run configuration. --> org.apache.maven.plugins maven-surefire-report-plugin - 2.19.1 + 3.0.0-M9 org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.11.0 @@ -334,7 +336,7 @@ setup to run configuration. --> org.apache.maven.plugins maven-project-info-reports-plugin - 2.9 + 3.4.2 @@ -352,7 +354,7 @@ setup to run configuration. --> org.apache.maven.plugins maven-site-plugin - 3.9.1 + 4.0.0-M5 @@ -364,21 +366,21 @@ setup to run configuration. --> org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.11.0 1.8 1.8 -Xlint:all - + false + - org.scala-tools - maven-scala-plugin - 2.15.2 + net.alchim31.maven + scala-maven-plugin + 4.8.1 @@ -479,13 +481,12 @@ setup to run configuration. --> org.apache.maven.plugins maven-javadoc-plugin - 2.10.4 + 3.5.0 - - + false + ${basedir}/src/main/java:${basedir}/target/generated-sources/jjtree:${basedir}/target/generated-sources/javacc @@ -501,13 +502,18 @@ setup to run configuration. --> **/SimpleCharStream.java **/ASTSolveItem.java + none - attach-javadocs - - jar - + attach-javadocs + + false + none + + + jar + @@ -515,9 +521,9 @@ setup to run configuration. --> org.apache.maven.plugins maven-surefire-plugin - 2.19.1 + 3.0.0-M9 - 1 + 1 **/IntDomainTest.java **/ExampleBasedTest.java @@ -539,7 +545,7 @@ setup to run configuration. --> org.apache.maven.plugins maven-site-plugin - 3.9.1 + 4.0.0-M5 @@ -548,7 +554,7 @@ setup to run configuration. --> org.jacoco jacoco-maven-plugin - 0.7.9 + 0.8.8 org/jacop/examples/scala/**/*.class @@ -621,7 +627,7 @@ setup to run configuration. --> com.github.spotbugs spotbugs-maven-plugin - 4.1.4 + 4.7.3.2 Max Medium @@ -635,7 +641,7 @@ setup to run configuration. --> maven-pmd-plugin true - 1.7 + 1.8 **/fz/Parser.java @@ -646,20 +652,21 @@ setup to run configuration. --> **/fz/SimpleCharStream.java - 3.7 + 3.21.0 org.apache.maven.plugins maven-javadoc-plugin - 2.10.4 + 3.5.0 - -Xdoclint:none + false + none org.apache.maven.plugins maven-surefire-report-plugin - 2.19.1 + 3.0.0-M9 true @@ -681,8 +688,7 @@ setup to run configuration. --> org.jacoco - jacoco-maven-plugin - 0.7.9 + jacoco-maven-plugin 0.8.8 @@ -710,12 +716,12 @@ setup to run configuration. --> org.scala-lang scala-library - 2.13.1 + ${scala.version} org.scala-lang scala-compiler - 2.13.1 + ${scala.version}