[oMetah-devel] ometah ./ometah.pws metaheuristic/itsEstimation...

[Johann]

CVSROOT:        /cvsroot/ometah
Module name:    ometah
Branch:         
Changes by:     Johann <address@hidden> 05/03/26 21:07:37

Modified files:
        .              : ometah.pws 
        metaheuristic  : itsEstimationOfDistribution.hpp 
                         itsMetaheuristic.hpp 
        problem        : itsProblem.cpp 

Log message:
        * first corrections to solve linking problem

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/ometah.pws.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/metaheuristic/itsEstimationOfDistribution.hpp.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/metaheuristic/itsMetaheuristic.hpp.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/problem/itsProblem.cpp.diff?tr1=1.8&tr2=1.9&r1=text&r2=text

Patches:
Index: ometah/metaheuristic/itsEstimationOfDistribution.hpp
diff -u ometah/metaheuristic/itsEstimationOfDistribution.hpp:1.6 
ometah/metaheuristic/itsEstimationOfDistribution.hpp:1.7
--- ometah/metaheuristic/itsEstimationOfDistribution.hpp:1.6    Fri Mar 11 
19:09:51 2005
+++ ometah/metaheuristic/itsEstimationOfDistribution.hpp        Sat Mar 26 
21:07:37 2005
@@ -1,5 +1,5 @@
 /***************************************************************************
- *  $Id: itsEstimationOfDistribution.hpp,v 1.6 2005/03/11 19:09:51 nojhan Exp $
+ *  $Id: itsEstimationOfDistribution.hpp,v 1.7 2005/03/26 21:07:37 nojhan Exp $
  *  Author : Johann Dréo <address@hidden>
  ****************************************************************************/
 
@@ -70,6 +70,7 @@
    */
   itsEstimationOfDistribution();
 
+  virtual ~itsEstimationOfDistribution();
 
   //! Return the distribution
   string getDistribution();
Index: ometah/metaheuristic/itsMetaheuristic.hpp
diff -u ometah/metaheuristic/itsMetaheuristic.hpp:1.9 
ometah/metaheuristic/itsMetaheuristic.hpp:1.10
--- ometah/metaheuristic/itsMetaheuristic.hpp:1.9       Sat Mar 26 20:33:02 2005
+++ ometah/metaheuristic/itsMetaheuristic.hpp   Sat Mar 26 21:07:37 2005
@@ -40,12 +40,6 @@
 class itsMetaheuristic
 {
 protected:
-  //! Virtual destructor
-  /*!
-    Necessary because of the abstract factory
-  */
-  virtual ~itsMetaheuristic();
-
   //! The intensification phase
   virtual void intensification();
       
@@ -153,6 +147,12 @@
 
 
 public:
+  //! Virtual destructor
+  /*!
+    Necessary because of the abstract factory
+  */
+  virtual ~itsMetaheuristic();
+
   //! Constructor
   itsMetaheuristic();
 
Index: ometah/ometah.pws
diff -u ometah/ometah.pws:1.2 ometah/ometah.pws:1.3
--- ometah/ometah.pws:1.2       Fri Mar 11 10:27:02 2005
+++ ometah/ometah.pws   Sat Mar 26 21:07:37 2005
@@ -6,11 +6,11 @@
 clean before build=false
 
 [filenumbers]
-0=106
-1=89
-2=226
-3=48
-4=63
+0=63
+1=73
+2=69
+3=153
+4=20
 
 [filemarkers]
 0=
@@ -24,6 +24,13 @@
 filter.file.ignore.hidden=0
 filter.dir.ignore.hidden=0
 
+[filelist]
+0=/home/nojhan/travail/openMetaheuristic/source/ometah/metaheuristic/itsEstimationOfDistribution.cpp
+1=/home/nojhan/travail/openMetaheuristic/source/ometah/metaheuristic/itsEstimationOfDistribution.hpp
+2=/home/nojhan/travail/openMetaheuristic/source/ometah/metaheuristic/itsMetaheuristic.cpp
+3=/home/nojhan/travail/openMetaheuristic/source/ometah/metaheuristic/itsMetaheuristic.hpp
+4=/home/nojhan/travail/openMetaheuristic/source/ometah/SConstruct
+
 [Project Tree]
 0=0
 1=0:0
Index: ometah/problem/itsProblem.cpp
diff -u ometah/problem/itsProblem.cpp:1.8 ometah/problem/itsProblem.cpp:1.9
--- ometah/problem/itsProblem.cpp:1.8   Sat Mar 26 20:33:02 2005
+++ ometah/problem/itsProblem.cpp       Sat Mar 26 21:07:37 2005
@@ -1,5 +1,5 @@
-in/***************************************************************************
- *  $Id: itsProblem.cpp,v 1.8 2005/03/26 20:33:02 nojhan Exp $
+/***************************************************************************
+ *  $Id: itsProblem.cpp,v 1.9 2005/03/26 21:07:37 nojhan Exp $
  *  Copyright 2005 Université Paris 12 Val-de-Marne
  *  Author : Johann Dréo <address@hidden>
  ****************************************************************************/