Update to version 4.2.1

Author: vitaut

Makefile.in

@@ -9,8 +9,8 @@
 #     Guido Tack, 2005
 #
 #  Last modified:
-#     $Date: 2013-07-09 12:19:11 +0200 (Tue, 09 Jul 2013) $ by $Author: schulte $
-#     $Revision: 13831 $
+#     $Date: 2013-08-22 20:49:24 +0200 (Thu, 22 Aug 2013) $ by $Author: schulte $
+#     $Revision: 13986 $
 #
 #  This file is part of Gecode, the generic constraint
 #  development environment:
@@ -319,7 +319,6 @@ INTHDR0 = \
 	arithmetic/abs.hpp arithmetic/max.hpp arithmetic/mult.hpp \
 	arithmetic/divmod.hpp \
 	arithmetic/pow-ops.hpp arithmetic/pow.hpp arithmetic/nroot.hpp \
-	arithmetic/math.hpp \
 	bool/or.hpp bool/eq.hpp bool/lq.hpp bool/eqv.hpp bool/base.hpp \
 	bool/clause.hpp bool/ite.hpp \
 	precede.hh precede/single.hpp \

changelog.in

@@ -6,8 +6,8 @@
 #     Christian Schulte, 2005
 #
 #  Last modified:
-#     $Date: 2013-07-19 13:58:42 +0200 (Fri, 19 Jul 2013) $ by $Author: schulte $
-#     $Revision: 13907 $
+#     $Date: 2013-11-05 09:51:31 +0100 (Tue, 05 Nov 2013) $ by $Author: schulte $
+#     $Revision: 14055 $
 #
 #  This file is part of Gecode, the generic constraint
 #  development environment:
@@ -66,6 +66,145 @@
 #    optional section in the html page.
 #
 
+[RELEASE]
+Version: 4.2.1
+Date: 2013-11-05
+[DESCRIPTION]
+This release fixes several major bugs and adds some minor
+improvements.
+
+[ENTRY]
+Module: other
+What:   change
+Rank:   minor
+[DESCRIPTION]
+Compiles with MSVC 2013.
+
+[ENTRY]
+Module: search
+What:   bug
+Rank:   major
+Thanks:	Roberto Casta�eda Lozano
+[DESCRIPTION]
+Fix for restart-based search when the master does not have a branching.
+
+[ENTRY]
+Module: search
+What:   bug
+Rank:   major
+Thanks:	Roberto Casta�eda Lozano
+[DESCRIPTION]
+Restart-based search did not work when the cutoff limit did not
+strictly increase.
+
+[ENTRY]
+Module: search
+What:   new
+Rank:   minor
+Thanks:	Roberto Casta�eda Lozano
+[DESCRIPTION]
+Added support for a repeat cutoff generator.
+
+[ENTRY]
+Module: int
+What:   performance
+Rank:   minor
+Thanks: Anne Meyer
+[DESCRIPTION]
+Fix performance of domain consistent element for the case that the result
+variable is assigned.
+
+[ENTRY]
+Module: int
+What:   bug
+Rank:   major
+Thanks: Bauke Conijn
+[DESCRIPTION]
+Fixed incorrect propagation in sortedness with permutation variables.
+
+[ENTRY]
+Module: int
+What:   bug
+Rank:   major
+Thanks: Duane Leslie
+[DESCRIPTION]
+Fixed cumulative constraint for 0-usage tasks.
+
+[ENTRY]
+Module: int
+What:   bug
+Rank:   major
+Thanks: Duane Leslie
+[DESCRIPTION]
+Fixed special case check for cumulative that would wrongly classify
+some instances as disjunctive.
+
+[ENTRY]
+Module: int
+What:   bug
+Rank:   major
+Thanks: Kish Shen
+[DESCRIPTION]
+The nroot constraint now propagates correctly for negative
+numbers when the exponent is odd.
+
+[ENTRY]
+Module: other
+What:   bug
+Rank:   minor
+[DESCRIPTION]
+Fix CMake to also build FlatZinc and Driver correctly.
+
+[ENTRY]
+Module: flatzinc
+What:   bug
+Rank:   minor
+[DESCRIPTION]
+Fixed bug in auxiliary variable branching.
+
+[ENTRY]
+Module: minimodel
+What:   new
+Rank:   minor
+Thanks: Philippe Kezirian
+[DESCRIPTION]
+The sum of IntArgs can now be computed similarly to the sum of
+IntVarArgs.
+
+[ENTRY]
+Module: kernel
+What:   new
+Rank:   minor
+Thanks: Kish Shen
+[DESCRIPTION]
+Activity information can now be initialized with a branch merit function.
+
+[ENTRY]
+Module: int
+What:   new
+Rank:   minor
+Thanks: Kish Shen
+[DESCRIPTION]
+Activity information can now be initialized with a branch merit function.
+
+[ENTRY]
+Module: set
+What:   new
+Rank:   minor
+Thanks: Kish Shen
+[DESCRIPTION]
+Activity information can now be initialized with a branch merit function.
+
+[ENTRY]
+Module: float
+What:   new
+Rank:   minor
+Thanks: Kish Shen
+[DESCRIPTION]
+Activity information can now be initialized with a branch merit function.
+
+
+
 [RELEASE]
 Version: 4.2.0
 Date: 2013-07-19

configure

@@ -1,7 +1,7 @@
 #! /bin/sh
-# From configure.ac Id: configure.ac.in 13787 2013-07-03 14:57:45Z schulte .
+# From configure.ac Id: configure.ac.in 13938 2013-07-23 12:30:31Z schulte .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for GECODE 4.2.0.
+# Generated by GNU Autoconf 2.68 for GECODE 4.2.1.
 #
 # Report bugs to <users@gecode.org>.
 #
@@ -561,8 +561,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='GECODE'
 PACKAGE_TARNAME='gecode'
-PACKAGE_VERSION='4.2.0'
-PACKAGE_STRING='GECODE 4.2.0'
+PACKAGE_VERSION='4.2.1'
+PACKAGE_STRING='GECODE 4.2.1'
 PACKAGE_BUGREPORT='users@gecode.org'
 PACKAGE_URL=''
 
@@ -781,6 +781,7 @@ enable_leak_debug
 enable_audit
 enable_profile
 enable_gcov
+enable_thread
 enable_gcc_visibility
 enable_doc_dot
 enable_doc_search
@@ -1358,7 +1359,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures GECODE 4.2.0 to adapt to many kinds of systems.
+\`configure' configures GECODE 4.2.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1419,7 +1420,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of GECODE 4.2.0:";;
+     short | recursive ) echo "Configuration of GECODE 4.2.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1440,6 +1441,7 @@ Optional Features:
   --enable-audit          build with auditing code [default=no]
   --enable-profile        build with profiling information [default=no]
   --enable-gcov           build with gcov support [default=no]
+  --enable-thread         build with multi-threading support [default=yes]
   --enable-gcc-visibility use gcc visibility attributes [default=yes]
   --enable-doc-dot        enable graphs in documentation [default=yes]
   --enable-doc-search     enable documentation search engine [default=no]
@@ -1562,7 +1564,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-GECODE configure 4.2.0
+GECODE configure 4.2.1
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2235,7 +2237,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by GECODE $as_me 4.2.0, which was
+It was created by GECODE $as_me 4.2.1, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2590,7 +2592,7 @@ ac_config_headers="$ac_config_headers gecode/support/config.hpp"
 
 
 
-ac_gecode_soversion=35
+ac_gecode_soversion=36
 GECODE_SOVERSION=${ac_gecode_soversion}
 
 ac_gecode_flatzincversion=1.6
@@ -6408,7 +6410,17 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 
 
-  ac_fn_cxx_check_header_mongrel "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default"
+  # Check whether --enable-thread was given.
+if test "${enable_thread+set}" = set; then :
+  enableval=$enable_thread;
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build with multi-threading support" >&5
+$as_echo_n "checking whether to build with multi-threading support... " >&6; }
+  if test "${enable_thread:-yes}" = "yes"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    ac_fn_cxx_check_header_mongrel "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default"
 if test "x$ac_cv_header_unistd_h" = xyes; then :
 
 $as_echo "#define GECODE_HAS_UNISTD_H 1" >>confdefs.h
@@ -6417,23 +6429,23 @@ $as_echo "#define GECODE_HAS_UNISTD_H 1" >>confdefs.h
 fi
 
 
-  ac_fn_cxx_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
+    ac_fn_cxx_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
 if test "x$ac_cv_header_pthread_h" = xyes; then :
 
 $as_echo "#define GECODE_THREADS_PTHREADS 1" >>confdefs.h
 
-   CFLAGS="-pthread${CFLAGS:+ }${CFLAGS}"
+     CFLAGS="-pthread${CFLAGS:+ }${CFLAGS}"
     CXXFLAGS="-pthread${CXXFLAGS:+ }${CXXFLAGS}"
-   DLLFLAGS="-pthread${DLLFLAGS:+ }${DLLFLAGS}"
-   ac_fn_cxx_check_header_mongrel "$LINENO" "libkern/OSAtomic.h" "ac_cv_header_libkern_OSAtomic_h" "$ac_includes_default"
+     DLLFLAGS="-pthread${DLLFLAGS:+ }${DLLFLAGS}"
+     ac_fn_cxx_check_header_mongrel "$LINENO" "libkern/OSAtomic.h" "ac_cv_header_libkern_OSAtomic_h" "$ac_includes_default"
 if test "x$ac_cv_header_libkern_OSAtomic_h" = xyes; then :
 
 $as_echo "#define GECODE_THREADS_OSX 1" >>confdefs.h
 
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for spin locks" >&5
 $as_echo_n "checking for spin locks... " >&6; }
-     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <pthread.h>
 int
@@ -6474,6 +6486,10 @@ fi
 fi
 
 
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+  fi
 
 
 
@@ -13284,7 +13300,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by GECODE $as_me 4.2.0, which was
+This file was extended by GECODE $as_me 4.2.1, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -13346,7 +13362,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-GECODE config.status 4.2.0
+GECODE config.status 4.2.1
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -10,9 +10,9 @@ dnl Copyright:
 dnl   Guido Tack, 2004, 2005
 dnl
 dnl Last modified:
-dnl   $Date: 2013-07-15 02:49:56 +0200 (Mon, 15 Jul 2013) $
-dnl   by $Author: tack $
-dnl   $Revision: 13879 $
+dnl   $Date: 2013-07-23 14:30:31 +0200 (Tue, 23 Jul 2013) $
+dnl   by $Author: schulte $
+dnl   $Revision: 13938 $
 dnl
 dnl This file is part of Gecode, the generic constraint
 dnl development environment:
@@ -39,13 +39,13 @@ dnl WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 dnl
 dnl
 
-AC_REVISION([$Id: configure.ac 13879 2013-07-15 00:49:56Z tack $])
+AC_REVISION([$Id: configure.ac 13938 2013-07-23 12:30:31Z schulte $])
 AC_PREREQ(2.53)
-AC_INIT(GECODE, 4.2.0, users@gecode.org)
+AC_INIT(GECODE, 4.2.1, users@gecode.org)
 AC_CONFIG_HEADERS([gecode/support/config.hpp])
 AC_CONFIG_SRCDIR(gecode/kernel.hh)
 
-ac_gecode_soversion=35
+ac_gecode_soversion=36
 AC_SUBST(GECODE_SOVERSION, ${ac_gecode_soversion})
 ac_gecode_flatzincversion=1.6
 AC_SUBST(GECODE_FLATZINC_VERSION, ${ac_gecode_flatzincversion})

configure.ac.in

@@ -6,9 +6,9 @@ dnl Copyright:
 dnl   Guido Tack, 2004, 2005
 dnl
 dnl Last modified:
-dnl   $Date: 2013-07-15 02:49:56 +0200 (Mon, 15 Jul 2013) $
-dnl   by $Author: tack $
-dnl   $Revision: 13879 $
+dnl   $Date: 2013-07-23 14:30:31 +0200 (Tue, 23 Jul 2013) $
+dnl   by $Author: schulte $
+dnl   $Revision: 13938 $
 dnl
 dnl This file is part of Gecode, the generic constraint
 dnl development environment:
@@ -35,13 +35,13 @@ dnl WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 dnl
 dnl
 
-AC_REVISION([$Id: configure.ac.in 13879 2013-07-15 00:49:56Z tack $])
+AC_REVISION([$Id: configure.ac.in 13938 2013-07-23 12:30:31Z schulte $])
 AC_PREREQ(2.53)
-AC_INIT(GECODE, 4.2.0, users@gecode.org)
+AC_INIT(GECODE, 4.2.1, users@gecode.org)
 AC_CONFIG_HEADERS([gecode/support/config.hpp])
 AC_CONFIG_SRCDIR(gecode/kernel.hh)
 
-ac_gecode_soversion=35
+ac_gecode_soversion=36
 AC_SUBST(GECODE_SOVERSION, ${ac_gecode_soversion})
 ac_gecode_flatzincversion=1.6
 AC_SUBST(GECODE_FLATZINC_VERSION, ${ac_gecode_flatzincversion})