[oMetah-devel] ometah ./Doxyfile ./ometah.pws communication/it...

[Johann]

CVSROOT:        /cvsroot/ometah
Module name:    ometah
Branch:         
Changes by:     Johann <address@hidden> 05/05/05 16:40:15

Modified files:
        .              : Doxyfile ometah.pws 
        communication  : itsCommunication.cpp itsCommunication.hpp 
                         itsCommunicationClient.cpp 
                         itsCommunicationClient.hpp 
                         itsCommunicationServer.hpp 
        metaheuristic  : itsMetaheuristic.cpp itsMetaheuristic.hpp 
        problem        : itsProblem.hpp 

Log message:
        * some tests to solve linking problem : all virtual method are know 
defined as empty

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/Doxyfile.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/ometah.pws.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/communication/itsCommunication.cpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/communication/itsCommunication.hpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/communication/itsCommunicationClient.cpp.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/communication/itsCommunicationClient.hpp.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/communication/itsCommunicationServer.hpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/metaheuristic/itsMetaheuristic.cpp.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/metaheuristic/itsMetaheuristic.hpp.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/problem/itsProblem.hpp.diff?tr1=1.11&tr2=1.12&r1=text&r2=text

Patches:
Index: ometah/Doxyfile
diff -u ometah/Doxyfile:1.2 ometah/Doxyfile:1.3
--- ometah/Doxyfile:1.2 Mon Apr 18 09:16:59 2005
+++ ometah/Doxyfile     Thu May  5 16:40:15 2005
@@ -5,9 +5,9 @@
 #---------------------------------------------------------------------------
 PROJECT_NAME           = ometah
 PROJECT_NUMBER         = 1
-OUTPUT_DIRECTORY       = /home/tfaili/CodeSource/
+OUTPUT_DIRECTORY       = doc
 CREATE_SUBDIRS         = NO
-OUTPUT_LANGUAGE        = French
+OUTPUT_LANGUAGE        = English
 USE_WINDOWS_ENCODING   = NO
 BRIEF_MEMBER_DESC      = YES
 REPEAT_BRIEF           = YES
@@ -25,7 +25,7 @@
 ALWAYS_DETAILED_SEC    = NO
 INLINE_INHERITED_MEMB  = NO
 FULL_PATH_NAMES        = YES
-STRIP_FROM_PATH        = /home/tfaili/
+STRIP_FROM_PATH        = 
 STRIP_FROM_INC_PATH    = 
 SHORT_NAMES            = NO
 JAVADOC_AUTOBRIEF      = NO
@@ -80,7 +80,7 @@
 #---------------------------------------------------------------------------
 # configuration options related to the input files
 #---------------------------------------------------------------------------
-INPUT                  = /home/tfaili/CodeSource/ometah/
+INPUT                  = .
 FILE_PATTERNS          = *.c \
                          *.cc \
                          *.cxx \
@@ -120,7 +120,7 @@
                          *.M \
                          *.MM
 RECURSIVE              = YES
-EXCLUDE                = /home/tfaili/CodeSource/ometah/html/
+EXCLUDE                = 
 EXCLUDE_SYMLINKS       = NO
 EXCLUDE_PATTERNS       = 
 EXAMPLE_PATH           = 
Index: ometah/communication/itsCommunication.cpp
diff -u ometah/communication/itsCommunication.cpp:1.2 
ometah/communication/itsCommunication.cpp:1.3
--- ometah/communication/itsCommunication.cpp:1.2       Sat Mar 26 20:33:02 2005
+++ ometah/communication/itsCommunication.cpp   Thu May  5 16:40:15 2005
@@ -1,5 +1,5 @@
 /***************************************************************************
- *  $Id: itsCommunication.cpp,v 1.2 2005/03/26 20:33:02 nojhan Exp $
+ *  $Id: itsCommunication.cpp,v 1.3 2005/05/05 16:40:15 nojhan Exp $
  *  Copyright : Université Paris 12 Val-de-Marne
  *  Author : Johann Dréo <address@hidden>
  ****************************************************************************/
@@ -22,6 +22,10 @@
  
  #include "itsCommunication.hpp"
 
+itsCommunication::~itsCommunication()
+{
+}
+  
 string itsCommunication::getKey()
 {
     return this->key;
Index: ometah/communication/itsCommunication.hpp
diff -u ometah/communication/itsCommunication.hpp:1.2 
ometah/communication/itsCommunication.hpp:1.3
--- ometah/communication/itsCommunication.hpp:1.2       Sat Mar 26 20:33:02 2005
+++ ometah/communication/itsCommunication.hpp   Thu May  5 16:40:15 2005
@@ -1,5 +1,5 @@
 /***************************************************************************
- *  $Id: itsCommunication.hpp,v 1.2 2005/03/26 20:33:02 nojhan Exp $
+ *  $Id: itsCommunication.hpp,v 1.3 2005/05/05 16:40:15 nojhan Exp $
  *  Copyright : Université Paris 12 Val-de-Marne
  *  Author : Johann Dréo <address@hidden>
  ****************************************************************************/
@@ -36,26 +36,27 @@
   /*!
     Necessary because of the abstract factory
   */
-  virtual ~itsCommunication();
+  virtual ~itsCommunication() {};
+  itsCommunication() {};
 
   //! Call the problem on a point to get its associated values
-  virtual itsPoint call(itsPoint point);
+  virtual itsPoint call(itsPoint point) {};
 
   //! The minima of the problem bounds
-  virtual vector<double> boundsMinima();
+  virtual vector<double> boundsMinima() {};
 
   //! The maxima of the problem bounds
-  virtual vector<double> boundsMaxima();
+  virtual vector<double> boundsMaxima() {};
 
   //! The bounds matrix
   /*!  
     This method call getBoundsMinima and getBoundsMaxima to produce
     a matrix with each dimension on a row.
    */
-  virtual vector<vector<double> > bounds();
+  virtual vector<vector<double> > bounds() {};
 
   //! Return the dimension
-  virtual int getDimension();
+  virtual int getDimension() {};
 
   //! Return the key
   string getKey();
Index: ometah/communication/itsCommunicationClient.cpp
diff -u ometah/communication/itsCommunicationClient.cpp:1.1 
ometah/communication/itsCommunicationClient.cpp:1.2
--- ometah/communication/itsCommunicationClient.cpp:1.1 Sat Mar 12 22:37:47 2005
+++ ometah/communication/itsCommunicationClient.cpp     Thu May  5 16:40:15 2005
@@ -1,5 +1,5 @@
 /***************************************************************************
- *  $Id: itsCommunicationClient.cpp,v 1.1 2005/03/12 22:37:47 nojhan Exp $
+ *  $Id: itsCommunicationClient.cpp,v 1.2 2005/05/05 16:40:15 nojhan Exp $
  *  Copyright : Université Paris 12 Val-de-Marne
  *  Author : Johann Dréo <address@hidden>
  ****************************************************************************/
@@ -20,4 +20,39 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
  
+ #include "../common/logic.hpp"
  #include "itsCommunicationClient.hpp"
+
+
+void itsCommunicationClient::initialization(hash_map<string,string, eqstr> 
args)
+{
+}
+
+//! Call the problem on a point to get its associated values
+itsPoint itsCommunicationClient::call(itsPoint point)
+{
+}
+
+//! The minima of the problem bounds
+vector<double> itsCommunicationClient::boundsMinima()
+{
+}
+
+//! The maxima of the problem bounds
+vector<double> itsCommunicationClient::boundsMaxima()
+{
+}
+
+//! The bounds matrix
+/*!  
+    This method call getBoundsMinima and getBoundsMaxima to produce
+    a matrix with each dimension on a row.
+*/
+vector<vector<double> > itsCommunicationClient::bounds()
+{
+}
+
+//! Return the dimension
+int itsCommunicationClient::getDimension()
+{
+}
Index: ometah/communication/itsCommunicationClient.hpp
diff -u ometah/communication/itsCommunicationClient.hpp:1.7 
ometah/communication/itsCommunicationClient.hpp:1.8
--- ometah/communication/itsCommunicationClient.hpp:1.7 Sat Mar 26 11:46:47 2005
+++ ometah/communication/itsCommunicationClient.hpp     Thu May  5 16:40:15 2005
@@ -1,7 +1,7 @@
 /***************************************************************************
  *  itsCommunicationClientt.hpp
  *
- *  $Id: itsCommunicationClient.hpp,v 1.7 2005/03/26 11:46:47 nojhan Exp $
+ *  $Id: itsCommunicationClient.hpp,v 1.8 2005/05/05 16:40:15 nojhan Exp $
  *  Author : Johann Dréo <address@hidden>
  ****************************************************************************/
 
@@ -43,7 +43,7 @@
     //! Call the problem on a point to get its associated values
     itsPoint call(itsPoint point);
 
-    //! The minima of the problem bounds
+    //! The minima of the problem boundsitsCommunication
     vector<double> boundsMinima();
 
     //! The maxima of the problem bounds
@@ -64,7 +64,10 @@
 class itsCommunicationClientFactory
 {
 public:
-    virtual itsCommunicationClient * create() = 0;
+    virtual ~itsCommunicationClientFactory() {};
+    itsCommunicationClientFactory() {};
+    
+    virtual itsCommunicationClient * create() {};
 };
 
 #endif
Index: ometah/communication/itsCommunicationServer.hpp
diff -u ometah/communication/itsCommunicationServer.hpp:1.4 
ometah/communication/itsCommunicationServer.hpp:1.5
--- ometah/communication/itsCommunicationServer.hpp:1.4 Wed Mar 16 19:03:31 2005
+++ ometah/communication/itsCommunicationServer.hpp     Thu May  5 16:40:15 2005
@@ -1,5 +1,5 @@
 /***************************************************************************
- *  $Id: itsCommunicationServer.hpp,v 1.4 2005/03/16 19:03:31 nojhan Exp $
+ *  $Id: itsCommunicationServer.hpp,v 1.5 2005/05/05 16:40:15 nojhan Exp $
  *  Copyright : Université Paris 12 Val-de-Marne
  *  Author : Johann Dréo <address@hidden>
  ****************************************************************************/
@@ -61,7 +61,10 @@
 class itsCommunicationServerFactory
 {
 public:
-    virtual itsCommunicationServer * create() = 0;
+    virtual ~itsCommunicationServerFactory() {};
+    itsCommunicationServerFactory() {};
+
+    virtual itsCommunicationServer * create() {};
 };
 
 #endif
Index: ometah/metaheuristic/itsMetaheuristic.cpp
diff -u ometah/metaheuristic/itsMetaheuristic.cpp:1.9 
ometah/metaheuristic/itsMetaheuristic.cpp:1.10
--- ometah/metaheuristic/itsMetaheuristic.cpp:1.9       Wed Mar 30 22:29:20 2005
+++ ometah/metaheuristic/itsMetaheuristic.cpp   Thu May  5 16:40:15 2005
@@ -39,7 +39,7 @@
   instanciated by the user who creates a special 
   metaheuristics
 */
- 
+ /*
 void itsMetaheuristic::intensification()
 { }
 void itsMetaheuristic::diversification()
@@ -49,9 +49,11 @@
 void itsMetaheuristic::parseSpecific()
 { }
 
+
 itsMetaheuristic::~itsMetaheuristic()
 {
 }
+*/
 
 itsMetaheuristic::itsMetaheuristic()
 {
Index: ometah/metaheuristic/itsMetaheuristic.hpp
diff -u ometah/metaheuristic/itsMetaheuristic.hpp:1.10 
ometah/metaheuristic/itsMetaheuristic.hpp:1.11
--- ometah/metaheuristic/itsMetaheuristic.hpp:1.10      Sat Mar 26 21:07:37 2005
+++ ometah/metaheuristic/itsMetaheuristic.hpp   Thu May  5 16:40:15 2005
@@ -41,13 +41,13 @@
 {
 protected:
   //! The intensification phase
-  virtual void intensification();
+  virtual void intensification() {};
       
   //! The diversification phase
-  virtual void diversification();
+  virtual void diversification() {};
       
   //! The learning phase
-  virtual void learning();
+  virtual void learning() {};
       
   //! The initialization phase
   void initialization();
@@ -61,7 +61,7 @@
     A particular protocole to pass data from 
     the Metaheuristics to the Problems 
   */
-  virtual void parseSpecific();
+  virtual void parseSpecific() {};
     
   //! The name of the algorithm
   /*! 
@@ -151,7 +151,7 @@
   /*!
     Necessary because of the abstract factory
   */
-  virtual ~itsMetaheuristic();
+  virtual ~itsMetaheuristic() {};
 
   //! Constructor
   itsMetaheuristic();
@@ -237,7 +237,7 @@
 {
 public:
   //! base method for instanciation in the abstract factory 
-  virtual itsMetaheuristic* create() = 0;
+  virtual itsMetaheuristic* create() {};
 
 };
    
Index: ometah/ometah.pws
diff -u ometah/ometah.pws:1.6 ometah/ometah.pws:1.7
--- ometah/ometah.pws:1.6       Mon Apr 18 09:16:59 2005
+++ ometah/ometah.pws   Thu May  5 16:40:15 2005
@@ -1,44 +1,29 @@
 
-[executer]
-RunInTerminal=true
-
-[Project State]
-clean before build=false
+[filelist]
+0=/home/nojhan/travail/openMetaheuristic/source/ometah/metaheuristic/itsEstimationOfDistribution.cpp
+1=/home/nojhan/travail/openMetaheuristic/source/ometah/interface/ometah.cpp
 
 [filenumbers]
-0=1
-1=146
-2=1
-3=1
-4=345
+0=84
+1=135
 
 [filemarkers]
 0=
 1=
-2=
-3=
-4=
 
 [File View]
 filter.file.unmatch=*.so *.o *.a *.la
 filter.file.ignore.hidden=0
 filter.dir.ignore.hidden=0
 
-[filelist]
-0=/home/tfaili/CodeSource/ometah/common/string.hpp
-1=/home/tfaili/CodeSource/ometah/common/matrix.hpp
-2=/home/tfaili/CodeSource/ometah/common/matrix.cpp
-
 [Project Tree]
 0=0
 
-[Symbol Tree]
-0=1
-1=1:0
-2=1:2
-3=1:7
-4=2
-
 [File Tree]
 0=0
-1=0:1
+
+[executer]
+RunInTerminal=true
+
+[Project State]
+clean before build=false
Index: ometah/problem/itsProblem.hpp
diff -u ometah/problem/itsProblem.hpp:1.11 ometah/problem/itsProblem.hpp:1.12
--- ometah/problem/itsProblem.hpp:1.11  Sat Mar 26 20:33:02 2005
+++ ometah/problem/itsProblem.hpp       Thu May  5 16:40:15 2005
@@ -1,5 +1,5 @@
 /***************************************************************************
- *  $Id: itsProblem.hpp,v 1.11 2005/03/26 20:33:02 nojhan Exp $
+ *  $Id: itsProblem.hpp,v 1.12 2005/05/05 16:40:15 nojhan Exp $
  *  Copyright 2005 Université Paris 12 Val-de-Marne
  *  Author : Johann Dréo <address@hidden>
  ****************************************************************************/
@@ -180,7 +180,7 @@
     This is the main part of the problem. This function computes the
     value of the point and return it.
    */
-  virtual itsPoint objectiveFunction(itsPoint);
+  virtual itsPoint objectiveFunction(itsPoint point) {} ;// const = 0;
 };
 
 
@@ -192,7 +192,7 @@
 {
 public:
   //! Base method for instanciation in the abstract factory
-  virtual itsProblem* create();
+  virtual itsProblem* create() {} ;// const = 0;
 };
 
 #endif