Updated

git-svn-id: file:///Users/tack/GecodeGitMigration/gecode-svn-mirror/gecode/trunk@14448 e85b7adc-8362-4630-8c63-7469d557c915

Author: Christian Schulte

changelog.in

@@ -72,6 +72,33 @@ Date: 2015-01-20
 [DESCRIPTION]
 Yada! Yada!
 
+[ENTRY]
+Module: driver
+What:   change
+Rank:   major
+[DESCRIPTION]
+All scripts now must call the constructor of their base class
+with an option argument. Note that you will have to change your
+models!
+
+[ENTRY]
+Module: driver
+What:   new
+Rank:   minor
+Thanks: Mark Manser 
+[DESCRIPTION]
+An option -step now can pass an improvement step to scripts of
+type FloatMinimizeScript and FloatMaximizeScript.
+
+[ENTRY]
+Module: minimodel
+What:   new
+Rank:   minor
+Thanks: Mark Manser 
+[DESCRIPTION]
+The classes FloatMinimizeSpace and FloatMaximizeSpace can be
+created with an improvement step for optimization.
+
 [ENTRY]
 Module: flatzinc
 What:   bug

examples/cartesian-heart.cpp

@@ -73,7 +73,7 @@ class CartesianHeart : public Script {
 public:
   /// Actual model
   CartesianHeart(const Options& opt) 
-    : Script(opt), f(*this,2,-20,20), step(0.01) {
+    : Script(opt), f(*this,2,-20,20), step(opt.step()) {
     int q = 2;
     FloatNum p = 0.5;
     // Post equation
@@ -111,8 +111,9 @@ class CartesianHeart : public Script {
  */
 int main(int argc, char* argv[]) {
   Options opt("CartesianHeart");
-  opt.parse(argc,argv);
   opt.solutions(0);
+  opt.step(0.01);
+  opt.parse(argc,argv);
   Script::run<CartesianHeart,BAB,Options>(opt);
   return 0;
 }

examples/descartes-folium.cpp

@@ -69,7 +69,7 @@ using namespace Gecode;
  *
  * \ingroup Example
  */
-class DescartesFolium : public Script {
+class DescartesFolium : public FloatMaximizeScript {
 protected:
   /// The numbers
   FloatVarArray f;
@@ -78,7 +78,7 @@ class DescartesFolium : public Script {
 public:
   /// Actual model
   DescartesFolium(const Options& opt) 
-    : Script(opt), f(*this,3,-20,20), step(0.1) {
+    : FloatMaximizeScript(opt), f(*this,3,-20,20) {
     // Post equation
     FloatVar p = f[0];
     FloatVar x = f[1];
@@ -92,17 +92,16 @@ class DescartesFolium : public Script {
   }
   /// Constructor for cloning \a p
   DescartesFolium(bool share, DescartesFolium& p) 
-    : Script(share,p), step(p.step) {
+    : FloatMaximizeScript(share,p) {
     f.update(*this,share,p.f);
   }
   /// Copy during cloning
   virtual Space* copy(bool share) { 
     return new DescartesFolium(share,*this); 
   }
-  /// Add constraint to current model to get next solution (not too close)
-  virtual void constrain(const Space& _b) {
-    const DescartesFolium& b = static_cast<const DescartesFolium&>(_b);
-    rel(*this, f[0] >= (b.f[0].max()+step));
+  /// Cost function
+  virtual FloatVar cost(void) const {
+    return f[0];
   }
   /// Print solution coordinates
   virtual void print(std::ostream& os) const {
@@ -117,9 +116,10 @@ class DescartesFolium : public Script {
  */
 int main(int argc, char* argv[]) {
   Options opt("DescartesFolium");
-  opt.parse(argc,argv);
   opt.solutions(0);
-  Script::run<DescartesFolium,BAB,Options>(opt);
+  opt.step(0.1);
+  opt.parse(argc,argv);
+  FloatMaximizeScript::run<DescartesFolium,BAB,Options>(opt);
   return 0;
 }
 

examples/golden-spiral.cpp

@@ -78,16 +78,14 @@ using namespace Gecode;
  *
  * \ingroup Example
  */
-class GoldenSpiral : public Script {
+class GoldenSpiral : public FloatMaximizeScript {
 protected:
   /// The numbers
   FloatVarArray f;
-  /// Minimum distance between two solutions
-  FloatNum step;
 public:
   /// Actual model
   GoldenSpiral(const Options& opt) 
-    : Script(opt), f(*this,4,-20,20), step(0.1) {
+    : FloatMaximizeScript(opt), f(*this,4,-20,20) {
     // Post equation
     FloatVar theta = f[0];
     FloatVar r = f[3];
@@ -103,17 +101,16 @@ class GoldenSpiral : public Script {
   }
   /// Constructor for cloning \a p
   GoldenSpiral(bool share, GoldenSpiral& p) 
-    : Script(share,p), step(p.step) {
+    : FloatMaximizeScript(share,p) {
     f.update(*this,share,p.f);
   }
   /// Copy during cloning
   virtual Space* copy(bool share) { 
     return new GoldenSpiral(share,*this); 
   }
-  /// Add constraint to current model to get next solution (not too close)
-  virtual void constrain(const Space& _b) {
-    const GoldenSpiral& b = static_cast<const GoldenSpiral&>(_b);
-    rel(*this, f[0] >= (b.f[0].max()+step));
+  /// Cost function
+  virtual FloatVar cost(void) const {
+    return f[0];
   }
   /// Print solution coordinates
   virtual void print(std::ostream& os) const {
@@ -128,9 +125,10 @@ class GoldenSpiral : public Script {
  */
 int main(int argc, char* argv[]) {
   Options opt("GoldenSpiral");
-  opt.parse(argc,argv);
   opt.solutions(0);
-  Script::run<GoldenSpiral,BAB,Options>(opt);
+  opt.step(0.1);
+  opt.parse(argc,argv);
+  FloatMaximizeScript::run<GoldenSpiral,BAB,Options>(opt);
   return 0;
 }