[oMetah-devel] ometah ./SConstruct common/logic.hpp communicat...

[Johann]

CVSROOT:        /cvsroot/ometah
Module name:    ometah
Branch:         
Changes by:     Johann <address@hidden> 05/05/14 16:07:57

Modified files:
        .              : SConstruct 
        common         : logic.hpp 
        communication  : itsCommunication.cpp itsCommunicationClient.cpp 
                         itsCommunicationClient.hpp 
                         itsCommunicationClient_embedded.cpp 
                         itsCommunicationServer.hpp 
                         itsCommunicationServer_embedded.hpp 
        interface      : ometah.cpp 

Log message:
        * all link errors corrected

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/SConstruct.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/common/logic.hpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/communication/itsCommunication.cpp.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/communication/itsCommunicationClient.cpp.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/communication/itsCommunicationClient.hpp.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/communication/itsCommunicationClient_embedded.cpp.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/communication/itsCommunicationServer.hpp.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/communication/itsCommunicationServer_embedded.hpp.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/interface/ometah.cpp.diff?tr1=1.10&tr2=1.11&r1=text&r2=text

Patches:
Index: ometah/SConstruct
diff -u ometah/SConstruct:1.7 ometah/SConstruct:1.8
--- ometah/SConstruct:1.7       Sat Mar 26 20:33:01 2005
+++ ometah/SConstruct   Sat May 14 16:07:57 2005
@@ -35,4 +35,4 @@
 interface = ['ometah.cpp']
 interface = ['interface/'+i for i in interface]
 
-env.Program( target = 'ometah', source = 
common+metaheuristic+problem+interface )
+env.Program( target = 'ometah', source = 
common+metaheuristic+problem+communication+interface )
Index: ometah/common/logic.hpp
diff -u ometah/common/logic.hpp:1.4 ometah/common/logic.hpp:1.5
--- ometah/common/logic.hpp:1.4 Sat Mar 26 11:46:47 2005
+++ ometah/common/logic.hpp     Sat May 14 16:07:57 2005
@@ -2,7 +2,7 @@
 /***************************************************************************
  *  logic.hpp
  *
- *  $Id: logic.hpp,v 1.4 2005/03/26 11:46:47 nojhan Exp $
+ *  $Id: logic.hpp,v 1.5 2005/05/14 16:07:57 nojhan Exp $
  *  Author : Johann Dréo <address@hidden>
  ****************************************************************************/
 
@@ -25,6 +25,8 @@
 #ifndef LOGIC
 #define LOGIC
 
+#include <string>
+
 //! Exclusive or
 template<class T>
 bool xOr(T cond1, T cond2)
Index: ometah/communication/itsCommunication.cpp
diff -u ometah/communication/itsCommunication.cpp:1.3 
ometah/communication/itsCommunication.cpp:1.4
--- ometah/communication/itsCommunication.cpp:1.3       Thu May  5 16:40:15 2005
+++ ometah/communication/itsCommunication.cpp   Sat May 14 16:07:57 2005
@@ -1,5 +1,5 @@
 /***************************************************************************
- *  $Id: itsCommunication.cpp,v 1.3 2005/05/05 16:40:15 nojhan Exp $
+ *  $Id: itsCommunication.cpp,v 1.4 2005/05/14 16:07:57 nojhan Exp $
  *  Copyright : Université Paris 12 Val-de-Marne
  *  Author : Johann Dréo <address@hidden>
  ****************************************************************************/
@@ -22,9 +22,6 @@
  
  #include "itsCommunication.hpp"
 
-itsCommunication::~itsCommunication()
-{
-}
   
 string itsCommunication::getKey()
 {
Index: ometah/communication/itsCommunicationClient.cpp
diff -u ometah/communication/itsCommunicationClient.cpp:1.3 
ometah/communication/itsCommunicationClient.cpp:1.4
--- ometah/communication/itsCommunicationClient.cpp:1.3 Thu May  5 20:19:47 2005
+++ ometah/communication/itsCommunicationClient.cpp     Sat May 14 16:07:57 2005
@@ -1,5 +1,5 @@
 /***************************************************************************
- *  $Id: itsCommunicationClient.cpp,v 1.3 2005/05/05 20:19:47 nojhan Exp $
+ *  $Id: itsCommunicationClient.cpp,v 1.4 2005/05/14 16:07:57 nojhan Exp $
  *  Copyright : Université Paris 12 Val-de-Marne
  *  Author : Johann Dréo <address@hidden>
  ****************************************************************************/
@@ -24,8 +24,7 @@
  #include "itsCommunicationClient.hpp"
 
 
-//void itsCommunicationClient::initialization(hash_map<string,string, eqstr> 
args)
-void itsCommunicationClient::initialization(int args)
+void itsCommunicationClient::initialization(hash_map<string,string, eqstr> 
args)
 {
 }
 
Index: ometah/communication/itsCommunicationClient.hpp
diff -u ometah/communication/itsCommunicationClient.hpp:1.11 
ometah/communication/itsCommunicationClient.hpp:1.12
--- ometah/communication/itsCommunicationClient.hpp:1.11        Sat May 14 
06:33:15 2005
+++ ometah/communication/itsCommunicationClient.hpp     Sat May 14 16:07:57 2005
@@ -1,7 +1,7 @@
 /***************************************************************************
  *  itsCommunicationClientt.hpp
  *
- *  $Id: itsCommunicationClient.hpp,v 1.11 2005/05/14 06:33:15 nojhan Exp $
+ *  $Id: itsCommunicationClient.hpp,v 1.12 2005/05/14 16:07:57 nojhan Exp $
  *  Author : Johann Dréo <address@hidden>
  ****************************************************************************/
 
@@ -37,10 +37,11 @@
     //! The problem directly embedded, if necessary
     itsCommunicationServer* problem;
 
+    virtual ~itsCommunicationClient() {};
+
 public:
     
     virtual void initialization(hash_map<string,string, eqstr> args);
-    //void initialization(int args);
 
     //! Call the problem on a point to get its associated values
     virtual itsPoint call(itsPoint point);
Index: ometah/communication/itsCommunicationClient_embedded.cpp
diff -u ometah/communication/itsCommunicationClient_embedded.cpp:1.6 
ometah/communication/itsCommunicationClient_embedded.cpp:1.7
--- ometah/communication/itsCommunicationClient_embedded.cpp:1.6        Sat May 
14 06:33:15 2005
+++ ometah/communication/itsCommunicationClient_embedded.cpp    Sat May 14 
16:07:57 2005
@@ -1,5 +1,5 @@
 /***************************************************************************
- *  $Id: itsCommunicationClient_embedded.cpp,v 1.6 2005/05/14 06:33:15 nojhan 
Exp $
+ *  $Id: itsCommunicationClient_embedded.cpp,v 1.7 2005/05/14 16:07:57 nojhan 
Exp $
  *  Copyright : Université Paris 12 Val-de-Marne
  *  Author : Johann Dréo <address@hidden>
  ****************************************************************************/
@@ -25,27 +25,27 @@
 
 itsPoint itsCommunicationClient_embedded::call(itsPoint point)
 {
-    return this->problem.call(point);
+    return this->problem->call(point);
 }
 
 vector<double> itsCommunicationClient_embedded::boundsMinima()
 {
-    return this->problem.boundsMinima();
+    return this->problem->boundsMinima();
 }
 
 vector<double> itsCommunicationClient_embedded::boundsMaxima()
 {
-    return this->problem.boundsMaxima();
+    return this->problem->boundsMaxima();
 }
 
 vector<vector<double> > itsCommunicationClient_embedded::bounds()
 {
-    return this->problem.bounds();
+    return this->problem->bounds();
 }
 
 int itsCommunicationClient_embedded::getDimension()
 {
-    return this->problem.getDimension();
+    return this->problem->getDimension();
 }
 
 
@@ -54,7 +54,7 @@
 {
     this->setKey("Embedded");
 
-    this->problem = itsCommunicationServer_embedded();
+    this->problem = new itsCommunicationServer_embedded;
 }
 
 
Index: ometah/communication/itsCommunicationServer.hpp
diff -u ometah/communication/itsCommunicationServer.hpp:1.7 
ometah/communication/itsCommunicationServer.hpp:1.8
--- ometah/communication/itsCommunicationServer.hpp:1.7 Sat May 14 06:33:15 2005
+++ ometah/communication/itsCommunicationServer.hpp     Sat May 14 16:07:57 2005
@@ -1,5 +1,5 @@
 /***************************************************************************
- *  $Id: itsCommunicationServer.hpp,v 1.7 2005/05/14 06:33:15 nojhan Exp $
+ *  $Id: itsCommunicationServer.hpp,v 1.8 2005/05/14 16:07:57 nojhan Exp $
  *  Copyright : Université Paris 12 Val-de-Marne
  *  Author : Johann Dréo <address@hidden>
  ****************************************************************************/
@@ -34,7 +34,8 @@
 class itsCommunicationServer : public itsCommunication
 {
 public:
-    itsCommunicationServer();    
+    itsCommunicationServer() {};
+    virtual ~itsCommunicationServer() {};
 
     //! The problem 
     itsProblem* problem;
Index: ometah/communication/itsCommunicationServer_embedded.hpp
diff -u ometah/communication/itsCommunicationServer_embedded.hpp:1.5 
ometah/communication/itsCommunicationServer_embedded.hpp:1.6
--- ometah/communication/itsCommunicationServer_embedded.hpp:1.5        Sat May 
14 06:33:15 2005
+++ ometah/communication/itsCommunicationServer_embedded.hpp    Sat May 14 
16:07:57 2005
@@ -1,5 +1,5 @@
 /***************************************************************************
- *  $Id: itsCommunicationServer_embedded.hpp,v 1.5 2005/05/14 06:33:15 nojhan 
Exp $
+ *  $Id: itsCommunicationServer_embedded.hpp,v 1.6 2005/05/14 16:07:57 nojhan 
Exp $
  *  Copyright : Université Paris 12 Val-de-Marne
  *  Author : Johann Dréo <address@hidden>
  ****************************************************************************/
@@ -29,7 +29,7 @@
 {
 public:
     //! Constructor
-    //itsCommunicationServer_embedded();
+    itsCommunicationServer_embedded();
     //~itsCommunicationServer_embedded() {};
  
 };
Index: ometah/interface/ometah.cpp
diff -u ometah/interface/ometah.cpp:1.10 ometah/interface/ometah.cpp:1.11
--- ometah/interface/ometah.cpp:1.10    Fri May 13 18:36:01 2005
+++ ometah/interface/ometah.cpp Sat May 14 16:07:57 2005
@@ -1,5 +1,5 @@
 /***************************************************************************
- *  $Id: ometah.cpp,v 1.10 2005/05/13 18:36:01 nojhan Exp $
+ *  $Id: ometah.cpp,v 1.11 2005/05/14 16:07:57 nojhan Exp $
  *  Copyright : Université Paris 12 Val-de-Marne
  *  Author : Johann Dréo <address@hidden>
  ****************************************************************************/
@@ -132,7 +132,6 @@
 
     // giving parameters
     hash_map<string,string, eqstr> parameters;
-    //int parameters;
     setCommunicationClient.item()->initialization( parameters );