More clean ups

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

Author: Christian Schulte

Makefile.dep

@@ -244,7 +244,7 @@ endif
 #
 
 SEARCHSRC0 = \
-	stop options cutoff \
+	stop options cutoff engine \
 	parallel/engine \
 	dfs parallel/dfs \
 	bab parallel/bab \
@@ -256,7 +256,7 @@ SEARCHHDR0 = \
 	parallel/path.hh parallel/engine.hh \
 	parallel/dfs.hh parallel/bab.hh \
 	meta/rbs.hh meta/nogoods.hh \
-	dfs.hpp bab.hpp rbs.hpp engine-base.hpp
+	dfs.hpp bab.hpp rbs.hpp engine.hpp engine-base.hpp
 
 SEARCHSRC	= $(SEARCHSRC0:%=gecode/search/%.cpp)
 SEARCHHDR	= gecode/search.hh $(SEARCHHDR0:%=gecode/search/%)

Makefile.in

@@ -598,48 +598,56 @@ namespace Gecode { namespace Search {
   /**
    * \brief %Search engine implementation interface
    */
-  class Engine {
+  class GECODE_SEARCH_EXPORT Engine {
   public:
     /// Return next solution (NULL, if none exists or search has been stopped)
     virtual Space* next(void) = 0;
     /// Return statistics
     virtual Statistics statistics(void) const = 0;
     /// Check whether engine has been stopped
     virtual bool stopped(void) const = 0;
-    /// Reset engine to restart at space \a s
-    virtual void reset(Space* s) = 0;
-    /// Return no-goods
-    virtual NoGoods& nogoods(void) = 0;
+    /// Reset engine to restart at space \a s (does nothing)
+    virtual void reset(Space* s);
+    /// Return no-goods (the no-goods are empty)
+    virtual NoGoods& nogoods(void);
     /// Destructor
-    virtual ~Engine(void) {}
+    virtual ~Engine(void);
+    /// \name Memory management
+    //@{
+    /// Allocate memory from heap
+    static void* operator new(size_t s);
+    /// Free memory allocated from heap
+    static void  operator delete(void* p);
+    //@}
   };
 
 }}
 
+#include <gecode/search/engine.hpp>
+
 namespace Gecode {
 
   template<template<class> class E, class T>
   class RBS;
 
 }
 
-namespace Gecode {
+namespace Gecode { namespace Search {
 
-  /**
-   *  \brief Base-class for search engines
-   */
+  /// Base-class for search engines
   class EngineBase {
     template<template<class>class,class> friend class ::Gecode::RBS;
   protected:
     /// The actual search engine
     Search::Engine* e;
-    /// Destructor
-    ~EngineBase(void);
     /// Constructor
     EngineBase(Search::Engine* e = NULL);
+  public:
+    /// Destructor
+    ~EngineBase(void);
   };
 
-}
+}}
 
 #include <gecode/search/engine-base.hpp>
 
@@ -654,7 +662,7 @@ namespace Gecode {
    * \ingroup TaskModelSearch
    */
   template<class T>
-  class DFS : public EngineBase {
+  class DFS : public Search::EngineBase {
   public:
     /// Initialize search engine for space \a s with options \a o
     DFS(T* s, const Search::Options& o=Search::Options::def);
@@ -690,7 +698,7 @@ namespace Gecode {
    * \ingroup TaskModelSearch
    */
   template<class T>
-  class BAB : public EngineBase {
+  class BAB : public Search::EngineBase {
   public:
     /// Initialize engine for space \a s and options \a o
     BAB(T* s, const Search::Options& o=Search::Options::def);
@@ -744,7 +752,7 @@ namespace Gecode {
    * \ingroup TaskModelSearch
    */
   template<template<class> class E, class T>
-  class RBS : public EngineBase {
+  class RBS : public Search::EngineBase {
   public:
     /// Initialize engine for space \a s and options \a o
     RBS(T* s, const Search::Options& o);

gecode/search.hh

@@ -39,7 +39,7 @@
  *
  */
 
-namespace Gecode {
+namespace Gecode { namespace Search {
 
   forceinline
   EngineBase::EngineBase(Search::Engine* e0) 
@@ -49,6 +49,6 @@ namespace Gecode {
     delete e; 
   }
 
-}
+}}
 
 // STATISTICS: search-other

gecode/search/engine-base.hpp

@@ -0,0 +1,53 @@
+/* -*- mode: C++; c-basic-offset: 2; indent-tabs-mode: nil -*- */
+/*
+ *  Main authors:
+ *     Christian Schulte <[email protected]>
+ *
+ *  Copyright:
+ *     Christian Schulte, 2015
+ *
+ *  Last modified:
+ *     $Date$ by $Author$
+ *     $Revision$
+ *
+ *  This file is part of Gecode, the generic constraint
+ *  development environment:
+ *     http://www.gecode.org
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining
+ *  a copy of this software and associated documentation files (the
+ *  "Software"), to deal in the Software without restriction, including
+ *  without limitation the rights to use, copy, modify, merge, publish,
+ *  distribute, sublicense, and/or sell copies of the Software, and to
+ *  permit persons to whom the Software is furnished to do so, subject to
+ *  the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be
+ *  included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+#include <gecode/search.hh>
+
+namespace Gecode { namespace Search {
+
+  void
+  Engine::reset(Space* s) {
+    (void) s;
+  }
+  NoGoods&
+  Engine::nogoods(void) {
+    return NoGoods::eng;
+  }
+
+}}
+
+// STATISTICS: search-other

gecode/search/engine.cpp

@@ -0,0 +1,53 @@
+/* -*- mode: C++; c-basic-offset: 2; indent-tabs-mode: nil -*- */
+/*
+ *  Main authors:
+ *     Christian Schulte <[email protected]>
+ *
+ *  Copyright:
+ *     Christian Schulte, 2015
+ *
+ *  Last modified:
+ *     $Date$ by $Author$
+ *     $Revision$
+ *
+ *  This file is part of Gecode, the generic constraint
+ *  development environment:
+ *     http://www.gecode.org
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining
+ *  a copy of this software and associated documentation files (the
+ *  "Software"), to deal in the Software without restriction, including
+ *  without limitation the rights to use, copy, modify, merge, publish,
+ *  distribute, sublicense, and/or sell copies of the Software, and to
+ *  permit persons to whom the Software is furnished to do so, subject to
+ *  the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be
+ *  included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+namespace Gecode { namespace Search {
+
+  forceinline
+  Engine::~Engine(void) {}
+  forceinline void*
+  Engine::operator new(size_t s) {
+    return heap.ralloc(s);
+  }
+  forceinline void
+  Engine::operator delete(void* p) {
+    heap.rfree(p);
+  }
+
+}}
+
+// STATISTICS: search-other

gecode/search/engine.hpp

@@ -140,15 +140,6 @@ namespace Gecode { namespace Search { namespace Meta {
     return e->stopped(); 
   }
 
-  void
-  RBS::reset(Space*) { 
-  }
-  
-  NoGoods&
-  RBS::nogoods(void) {
-    return NoGoods::eng;
-  }
-  
   RBS::~RBS(void) {
     // Deleting e also deletes stop
     delete e;

gecode/search/meta/rbs.cpp

@@ -76,6 +76,39 @@ namespace Gecode { namespace Search { namespace Meta {
     ~RestartStop(void);
   };
 
+  /// Engine for restart-based search
+  class GECODE_SEARCH_EXPORT RBS : public Engine {
+  protected:
+    /// The actual engine
+    Engine* e;
+    /// The master space to restart from
+    Space* master;
+    /// The last solution space (possibly NULL)
+    Space* last;
+    /// The cutoff object
+    Cutoff* co;
+    /// The stop control object
+    RestartStop* stop;
+    /// How many solutions since the last restart
+    unsigned long int sslr;
+    /// Whether the slave can be shared with the master
+    bool shared;
+    /// Whether search for the next solution will be complete
+    bool complete;
+    /// Whether a restart must be performed when next is called
+    bool restart;
+  public:
+    /// Constructor
+    RBS(Space* s, RestartStop* stop0, Engine* e0, const Options& o);
+    /// Return next solution (NULL, if none exists or search has been stopped)
+    virtual Space* next(void);
+    /// Return statistics
+    virtual Search::Statistics statistics(void) const;
+    /// Check whether engine has been stopped
+    virtual bool stopped(void) const;
+    /// Destructor
+    virtual ~RBS(void);
+  };
 
   /*
    * Stopping for meta search engines
@@ -120,43 +153,6 @@ namespace Gecode { namespace Search { namespace Meta {
   }
 
 
-  /// Engine for restart-based search
-  class GECODE_SEARCH_EXPORT RBS : public Engine {
-  protected:
-    /// The actual engine
-    Engine* e;
-    /// The master space to restart from
-    Space* master;
-    /// The last solution space (possibly NULL)
-    Space* last;
-    /// The cutoff object
-    Cutoff* co;
-    /// The stop control object
-    RestartStop* stop;
-    /// How many solutions since the last restart
-    unsigned long int sslr;
-    /// Whether the slave can be shared with the master
-    bool shared;
-    /// Whether search for the next solution will be complete
-    bool complete;
-    /// Whether a restart must be performed when next is called
-    bool restart;
-  public:
-    /// Constructor
-    RBS(Space* s, RestartStop* stop0, Engine* e0, const Options& o);
-    /// Return next solution (NULL, if none exists or search has been stopped)
-    virtual Space* next(void);
-    /// Return statistics
-    virtual Search::Statistics statistics(void) const;
-    /// Check whether engine has been stopped
-    virtual bool stopped(void) const;
-    /// Reset engine to restart at space \a s
-    virtual void reset(Space* s);
-    /// Return no-goods
-    virtual NoGoods& nogoods(void);
-    /// Destructor
-    virtual ~RBS(void);
-  };
 
   forceinline
   RBS::RBS(Space* s, RestartStop* stop0,