Merge pull request #158 from fkonvick/release/6.3.0

Cleanups and fixes.

changelog.in

@@ -239,6 +239,7 @@ Thanks: Mattias Grönkvist
 Distinct propagation (as used by distinct, channel, and circuit) would
 sometimes read from uninitialized memory.
 
+[ENTRY]
 Module: flatzinc
 What:   bug
 Rank:   minor

doxygen/doxygen.conf.in

@@ -657,8 +657,10 @@ HTML_FOOTER            = @top_srcdir@/misc/doxygen/footer.html
 # will generate a default style sheet. Note that doxygen will try to copy
 # the style sheet file to the HTML output directory, so don't put your own
 # stylesheet in the HTML output directory as well, or it will be erased!
+# Note: this is now superseded by HTML_EXTRA_STYLESHEET, an extra
+# stylesheeet applied on top of the standard doxygen stylesheet.
 
-HTML_STYLESHEET        = @top_srcdir@/misc/doxygen/stylesheet.css
+HTML_EXTRA_STYLESHEET  = @top_srcdir@/misc/doxygen/stylesheet.css
 
 # If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
 # files or namespaces will be aligned in HTML using tables. If set to

gecode/int.hh

@@ -873,14 +873,14 @@ namespace Gecode {
      * \brief Implication for reification
      *
      * For a constraint \f$c\f$ and a Boolean control variable \f$b\f$
-     * defines that \f$b=1\Leftarrow c\f$ is propagated.
+     * defines that \f$b=1\Rightarrow c\f$ is propagated.
      */
     RM_IMP,
     /**
      * \brief Inverse implication for reification
      *
      * For a constraint \f$c\f$ and a Boolean control variable \f$b\f$
-     * defines that \f$b=1\Rightarrow c\f$ is propagated.
+     * defines that \f$c\Rightarrow b=1\f$ is propagated.
      */
     RM_PMI
   };

gecode/int/ldsb.hh

@@ -186,9 +186,9 @@ namespace Gecode { namespace Int { namespace LDSB {
     Support::BitSetOffset<Space> indices;
   public:
     /// Constructor for creation
-    VariableSymmetryImp<View>(Space& home, int* vs, unsigned int n);
+    VariableSymmetryImp(Space& home, int* vs, unsigned int n);
     /// Copy constructor
-    VariableSymmetryImp<View>(Space& home, const VariableSymmetryImp<View>& other);
+    VariableSymmetryImp(Space& home, const VariableSymmetryImp<View>& other);
     /// Disposal
     virtual size_t dispose(Space& home);
     /// Left-branch update
@@ -206,9 +206,9 @@ namespace Gecode { namespace Int { namespace LDSB {
     /// Symmetric values
     Support::BitSetOffset<Space> values;
     /// Constructor for creation
-    ValueSymmetryImp<View>(Space& home, int* vs, unsigned int n);
+    ValueSymmetryImp(Space& home, int* vs, unsigned int n);
     /// Copy constructor
-    ValueSymmetryImp<View>(Space& home, const ValueSymmetryImp<View>& other);
+    ValueSymmetryImp(Space& home, const ValueSymmetryImp<View>& other);
     /// Disposal
     virtual size_t dispose(Space& home);
     /// Left-branch update
@@ -248,9 +248,9 @@ namespace Gecode { namespace Int { namespace LDSB {
     int getVal(unsigned int sequence, unsigned int position) const;
   public:
     /// Constructor for creation
-    VariableSequenceSymmetryImp<View>(Space& home, int *_indices, unsigned int n, unsigned int seqsize);
+    VariableSequenceSymmetryImp(Space& home, int *_indices, unsigned int n, unsigned int seqsize);
     /// Copy constructor
-    VariableSequenceSymmetryImp<View>(Space& home, const VariableSequenceSymmetryImp<View>& s);
+    VariableSequenceSymmetryImp(Space& home, const VariableSequenceSymmetryImp<View>& s);
     /// Disposal
     virtual size_t dispose(Space& home);
     /// Search left-branch update
@@ -279,12 +279,12 @@ namespace Gecode { namespace Int { namespace LDSB {
     /// position.  (Both are zero-based.)
     int getVal(unsigned int sequence, unsigned int position) const;
   private:
-    ValueSequenceSymmetryImp<View>(const ValueSequenceSymmetryImp<View>&);
+    ValueSequenceSymmetryImp(const ValueSequenceSymmetryImp<View>&);
   public:
     /// Constructor for creation
-    ValueSequenceSymmetryImp<View>(Space& home, int* _values, unsigned int n, unsigned int seqsize);
+    ValueSequenceSymmetryImp(Space& home, int* _values, unsigned int n, unsigned int seqsize);
     /// Copy constructor
-    ValueSequenceSymmetryImp<View>(Space& home, const ValueSequenceSymmetryImp<View>& vss);
+    ValueSequenceSymmetryImp(Space& home, const ValueSequenceSymmetryImp<View>& vss);
     /// Disposal
     virtual size_t dispose(Space& home);
     /// Left-branch update

misc/doxygen/header.html

@@ -1,7 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=utf-8">
 <title>$title</title>
-<link href="$relpath$stylesheet.css" rel="stylesheet" type="text/css">
+<link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="stylesheet.css" rel="stylesheet" type="text/css">
 <!--[if IE]><style type="text/css">
   @media screen {
     html, body {
@@ -22,7 +23,7 @@
 <body>
 
 <div id="logo">
-<img src='$relpath$gecode-logo-100.png' alt="Gecode logo" /></div>
+<img src='gecode-logo-100.png' alt="Gecode logo" /></div>
 
 <div id="navigation">
   <div id="navigation2">

misc/doxygen/stylesheet.css

@@ -6,13 +6,6 @@ margin:0;
 padding:0;
 }
 
-#content {
-position:absolute; top:30px; left:60px;
-width:60%;
-padding:0 0 50px 0;
-color:#000000;
-}
-
 #contentfront {
 position:absolute; top:250px; left:60px;
 width:50%;

misc/genrc.perl

@@ -172,7 +172,7 @@
     close SRCFILE;
     $description = "Gecode example: $example";
   } else {
-    die "Illegal file";
+    die "Illegal file $file";
   }
 }
 

tools/flatzinc/mzn-gecode.bat.in

@@ -34,4 +34,4 @@ rem
 
 setlocal
 set FLATZINC_CMD=fzn-gecode
-minizinc -I "%GECODEDIR%\mznlib" %*
+minizinc -I "%GECODEDIR%\share\minizinc\gecode" %*