Merge branch 'develop' of https://github.com/Gecode/gecode into develop

Author: chschulte

changelog.in

@@ -73,14 +73,21 @@ initializer lists. In addition, the release has lots of bug fixes
 and performance improvements. It is highly recommended to switch
 as soon as possible!
 
+[ENTRY]
+Module: search
+What:   change
+Rank:   minor
+[DESCRIPTION]
+Support for the CPProfiler is now enabled by default.
+
 [ENTRY]
 Module: int
 What:   change
 Rank:   minor
 Thanks: Sara Frimodig
 [DESCRIPTION]
-The default propagation for unary has been too weak (possibly
-hurting Gecode in the MiniZinc competitions of 2017 and 2018),
+The default propagation for unary has been too weak (likely to
+hurt Gecode in the MiniZinc competitions of 2017 and 2018),
 now the default is back to maximal propagation.
 
 [ENTRY]

configure

@@ -1486,7 +1486,7 @@ Optional Features:
   --enable-gist           build Gecode Interactive Search Tool [default=yes]
   --enable-cbs            build with support for counting-based search
                           [default=no]
-  --enable-cpprofiler     build with support for CPProfiler [default=no]
+  --enable-cpprofiler     build with support for CPProfiler [default=yes]
   --enable-driver         build script commandline driver library
                           [default=yes]
   --enable-flatzinc       build FlatZinc interpreter [default=yes]

gecode.m4

@@ -1434,7 +1434,7 @@ AC_DEFUN([AC_GECODE_CPPROFILER],
   [
   AC_ARG_ENABLE([cpprofiler],
     AC_HELP_STRING([--enable-cpprofiler],
-      [build with support for CPProfiler @<:@default=no@:>@]))
+      [build with support for CPProfiler @<:@default=yes@:>@]))
   AC_MSG_CHECKING(whether to build with support for CPProfiler)
   if test "${enable_cpprofiler:-no}" = "yes"; then
     AC_MSG_RESULT(yes)

gecode/int/distinct/cbs.cpp

@@ -906,3 +906,6 @@ namespace Gecode { namespace Int { namespace Distinct {
 }}}
 
 #endif
+
+// STATISTICS: int-prop
+

gecode/int/distinct/cbs.hpp

@@ -227,3 +227,6 @@ namespace Gecode { namespace Int { namespace Distinct {
 }}}
 
 #endif
+
+// STATISTICS: int-prop
+

gecode/int/extensional.hh

@@ -470,7 +470,7 @@ namespace Gecode { namespace Int { namespace Extensional {
     /// Constructor for cloning \a p
     Compact(Space& home, Compact& p);
     /// Constructor for posting
-    Compact(Home home, ViewArray<View>& x, const TupleSet& ts);
+    Compact(Home home, const TupleSet& ts);
     /// Setup the actual table
     template<class Table>
     void setup(Space& home, Table& table, ViewArray<View>& x);

gecode/int/extensional/compact.hpp

@@ -339,8 +339,7 @@ namespace Gecode { namespace Int { namespace Extensional {
 
   template<class View, bool pos>
   forceinline
-  Compact<View,pos>::Compact(Home home, ViewArray<View>& x,
-                             const TupleSet& ts0)
+  Compact<View,pos>::Compact(Home home, const TupleSet& ts0)
     : Propagator(home), n_words(ts0.words()), ts(ts0), c(home) {
     home.notice(*this, AP_DISPOSE);
   }
@@ -514,7 +513,7 @@ namespace Gecode { namespace Int { namespace Extensional {
   forceinline
   PosCompact<View,Table>::PosCompact(Home home, ViewArray<View>& x,
                                      const TupleSet& ts)
-    : Compact<View,true>(home,x,ts), status(MULTIPLE), table(home,ts.words()) {
+    : Compact<View,true>(home,ts), status(MULTIPLE), table(home,ts.words()) {
     setup(home,table,x);
   }
 
@@ -790,7 +789,7 @@ namespace Gecode { namespace Int { namespace Extensional {
   forceinline
   NegCompact<View,Table>::NegCompact(Home home, ViewArray<View>& x,
                                      const TupleSet& ts)
-    : Compact<View,false>(home,x,ts), table(home,ts.words()) {
+    : Compact<View,false>(home,ts), table(home,ts.words()) {
     setup(home,table,x);
   }
 
@@ -1068,7 +1067,7 @@ namespace Gecode { namespace Int { namespace Extensional {
   forceinline
   ReCompact<View,Table,CtrlView,rm>::ReCompact(Home home, ViewArray<View>& x,
                                                const TupleSet& ts, CtrlView b0)
-    : Compact<View,false>(home,x,ts), table(home,ts.words()), b(b0), y(x) {
+    : Compact<View,false>(home,ts), table(home,ts.words()), b(b0), y(x) {
     b.subscribe(home,*this,PC_BOOL_VAL);
     setup(home,table,x);
   }