[oMetah-devel] ometah/metaheuristic itsEstimationOfDistributio...

[Johann]

CVSROOT:        /cvsroot/ometah
Module name:    ometah
Branch:         
Changes by:     Johann <address@hidden> 05/03/11 10:26:08

Modified files:
        metaheuristic  : itsEstimationOfDistribution.cpp 
                         itsEstimationOfDistribution.hpp 
                         itsMetaheuristic.hpp 

Log message:
        * syntax corrections

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/metaheuristic/itsEstimationOfDistribution.cpp.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/metaheuristic/itsEstimationOfDistribution.hpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/metaheuristic/itsMetaheuristic.hpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: ometah/metaheuristic/itsEstimationOfDistribution.cpp
diff -u ometah/metaheuristic/itsEstimationOfDistribution.cpp:1.3 
ometah/metaheuristic/itsEstimationOfDistribution.cpp:1.4
--- ometah/metaheuristic/itsEstimationOfDistribution.cpp:1.3    Sun Mar  6 
14:33:33 2005
+++ ometah/metaheuristic/itsEstimationOfDistribution.cpp        Fri Mar 11 
10:26:08 2005
@@ -1,7 +1,7 @@
 /***************************************************************************
  *  itsMetaheuristic.hpp 
  *   
- *  $Id: itsEstimationOfDistribution.cpp,v 1.3 2005/03/06 14:33:33 nojhan Exp $
+ *  $Id: itsEstimationOfDistribution.cpp,v 1.4 2005/03/11 10:26:08 nojhan Exp $
  *  Author : Johann Dréo <address@hidden>
  ****************************************************************************/
 
@@ -100,7 +100,8 @@
 }
 
 
-itsMetaheuristic* itsEstimationOfDistribution::create()
+
+itsMetaheuristic* itsEstimationOfDistributionFactory::create()
 {
-    return new itsEstimationOfDistribution();
+    return new itsEstimationOfDistribution;
 }
Index: ometah/metaheuristic/itsEstimationOfDistribution.hpp
diff -u ometah/metaheuristic/itsEstimationOfDistribution.hpp:1.4 
ometah/metaheuristic/itsEstimationOfDistribution.hpp:1.5
--- ometah/metaheuristic/itsEstimationOfDistribution.hpp:1.4    Sun Mar  6 
14:33:33 2005
+++ ometah/metaheuristic/itsEstimationOfDistribution.hpp        Fri Mar 11 
10:26:08 2005
@@ -1,5 +1,5 @@
 /***************************************************************************
- *  $Id: itsEstimationOfDistribution.hpp,v 1.4 2005/03/06 14:33:33 nojhan Exp $
+ *  $Id: itsEstimationOfDistribution.hpp,v 1.5 2005/03/11 10:26:08 nojhan Exp $
  *  Author : Johann Dréo <address@hidden>
  ****************************************************************************/
 
@@ -25,7 +25,7 @@
 #define ITSESTIMATIONOFDISTRIBUTION
  
 #include "itsMetaheuristic.hpp"
-#incdlude "../common/matrix.hpp"
+#include "../common/matrix.hpp"
  
 class itsEstimationOfDistribution : public itsMetaheuristic
 {
@@ -81,11 +81,12 @@
   //! Change the select ratio
   void setSelectRatio( double ratio );
 
-}
+};
 
-class itsEstimationOfDistributionFactory : itsMetaheuristicFactory
+class itsEstimationOfDistributionFactory : public itsMetaheuristicFactory
 {
+public:
     itsMetaheuristic* create();
-}
+};
 
 #endif
Index: ometah/metaheuristic/itsMetaheuristic.hpp
diff -u ometah/metaheuristic/itsMetaheuristic.hpp:1.2 
ometah/metaheuristic/itsMetaheuristic.hpp:1.3
--- ometah/metaheuristic/itsMetaheuristic.hpp:1.2       Mon Feb 21 09:40:15 2005
+++ ometah/metaheuristic/itsMetaheuristic.hpp   Fri Mar 11 10:26:08 2005
@@ -26,11 +26,13 @@
 #ifndef ITSMETAHEURISTIC
 #define ITSMETAHEURISTIC
 
-#include <fstream>
+#include <ostream>
 
 #include "../common/itsPoint.hpp"
 #include "../communication/itsCommunicationClient.hpp"
- 
+
+using namespace std;
+
 /*! 
   is based on the "Abstract Factory" Pattern
 */
@@ -212,11 +214,12 @@
   This is the base class for all factory classes
 */
 
-class itsMetaheuristicFactory:
+class itsMetaheuristicFactory
 {
+public:
   //! base method for instanciation in the abstract factory 
-  virtual itsMetaheuristic* create();
+  virtual itsMetaheuristic* create() = 0;
 
-}
+};
    
 #endif