[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[oMetah-devel] ometah ./ometah.pws communication/itsCommunicat...
From: |
Johann |
Subject: |
[oMetah-devel] ometah ./ometah.pws communication/itsCommunicat... |
Date: |
Sat, 14 May 2005 02:33:15 -0400 |
CVSROOT: /cvsroot/ometah
Module name: ometah
Branch:
Changes by: Johann <address@hidden> 05/05/14 06:33:15
Modified files:
. : ometah.pws
communication : itsCommunication.hpp itsCommunicationClient.hpp
itsCommunicationClient_embedded.cpp
itsCommunicationClient_embedded.hpp
itsCommunicationServer.hpp
itsCommunicationServer_embedded.hpp
Log message:
* a constructor was not at the good place
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/ometah.pws.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/communication/itsCommunication.hpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/communication/itsCommunicationClient.hpp.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/communication/itsCommunicationClient_embedded.cpp.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/communication/itsCommunicationClient_embedded.hpp.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/communication/itsCommunicationServer.hpp.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/communication/itsCommunicationServer_embedded.hpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
Patches:
Index: ometah/communication/itsCommunication.hpp
diff -u ometah/communication/itsCommunication.hpp:1.4
ometah/communication/itsCommunication.hpp:1.5
--- ometah/communication/itsCommunication.hpp:1.4 Fri May 13 18:36:01 2005
+++ ometah/communication/itsCommunication.hpp Sat May 14 06:33:15 2005
@@ -1,5 +1,5 @@
/***************************************************************************
- * $Id: itsCommunication.hpp,v 1.4 2005/05/13 18:36:01 nojhan Exp $
+ * $Id: itsCommunication.hpp,v 1.5 2005/05/14 06:33:15 nojhan Exp $
* Copyright : Université Paris 12 Val-de-Marne
* Author : Johann Dréo <address@hidden>
****************************************************************************/
@@ -47,7 +47,7 @@
virtual itsPoint call(itsPoint point) =0;
//!
- virtual void initialization(hash_map<string,string, eqstr> args) =0;
+ virtual void initialization(hash_map<string,string, eqstr> args) {};
//! The minima of the problem bounds
virtual vector<double> boundsMinima() =0;
Index: ometah/communication/itsCommunicationClient.hpp
diff -u ometah/communication/itsCommunicationClient.hpp:1.10
ometah/communication/itsCommunicationClient.hpp:1.11
--- ometah/communication/itsCommunicationClient.hpp:1.10 Fri May 13
18:36:01 2005
+++ ometah/communication/itsCommunicationClient.hpp Sat May 14 06:33:15 2005
@@ -1,7 +1,7 @@
/***************************************************************************
* itsCommunicationClientt.hpp
*
- * $Id: itsCommunicationClient.hpp,v 1.10 2005/05/13 18:36:01 nojhan Exp $
+ * $Id: itsCommunicationClient.hpp,v 1.11 2005/05/14 06:33:15 nojhan Exp $
* Author : Johann Dréo <address@hidden>
****************************************************************************/
@@ -39,35 +39,35 @@
public:
- void initialization(hash_map<string,string, eqstr> args);
+ virtual void initialization(hash_map<string,string, eqstr> args);
//void initialization(int args);
//! Call the problem on a point to get its associated values
- itsPoint call(itsPoint point);
+ virtual itsPoint call(itsPoint point);
//! The minima of the problem boundsitsCommunication
- vector<double> boundsMinima();
+ virtual vector<double> boundsMinima();
//! The maxima of the problem bounds
- 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.
*/
- vector<vector<double> > bounds();
+ virtual vector<vector<double> > bounds();
//! Return the dimension
- int getDimension();
+ virtual int getDimension();
};
class itsCommunicationClientFactory
{
public:
- virtual ~itsCommunicationClientFactory() {};
- itsCommunicationClientFactory() {};
+ //virtual ~itsCommunicationClientFactory() {};
+ //itsCommunicationClientFactory() {};
virtual itsCommunicationClient * create() =0;
};
Index: ometah/communication/itsCommunicationClient_embedded.cpp
diff -u ometah/communication/itsCommunicationClient_embedded.cpp:1.5
ometah/communication/itsCommunicationClient_embedded.cpp:1.6
--- ometah/communication/itsCommunicationClient_embedded.cpp:1.5 Fri May
13 18:36:01 2005
+++ ometah/communication/itsCommunicationClient_embedded.cpp Sat May 14
06:33:15 2005
@@ -1,5 +1,5 @@
/***************************************************************************
- * $Id: itsCommunicationClient_embedded.cpp,v 1.5 2005/05/13 18:36:01 nojhan
Exp $
+ * $Id: itsCommunicationClient_embedded.cpp,v 1.6 2005/05/14 06:33:15 nojhan
Exp $
* Copyright : Université Paris 12 Val-de-Marne
* Author : Johann Dréo <address@hidden>
****************************************************************************/
@@ -50,15 +50,15 @@
-itsCommunicationClient* itsCommunicationClientFactory_embedded::create()
+itsCommunicationClient_embedded::itsCommunicationClient_embedded()
{
- return new itsCommunicationClient_embedded;
+ this->setKey("Embedded");
+
+ this->problem = itsCommunicationServer_embedded();
}
-itsCommunicationClientFactory_embedded::itsCommunicationClientFactory_embedded()
+itsCommunicationClient* itsCommunicationClientFactory_embedded::create()
{
- this->setKey("Embedded");
-
- this->problem = itsCommunicationServer_embedded();
+ return new itsCommunicationClient_embedded;
}
Index: ometah/communication/itsCommunicationClient_embedded.hpp
diff -u ometah/communication/itsCommunicationClient_embedded.hpp:1.5
ometah/communication/itsCommunicationClient_embedded.hpp:1.6
--- ometah/communication/itsCommunicationClient_embedded.hpp:1.5 Fri May
13 18:36:01 2005
+++ ometah/communication/itsCommunicationClient_embedded.hpp Sat May 14
06:33:15 2005
@@ -1,5 +1,5 @@
/***************************************************************************
- * $Id: itsCommunicationClient_embedded.hpp,v 1.5 2005/05/13 18:36:01 nojhan
Exp $
+ * $Id: itsCommunicationClient_embedded.hpp,v 1.6 2005/05/14 06:33:15 nojhan
Exp $
* Copyright : Université Paris 12 Val-de-Marne
* Author : Johann Dréo <address@hidden>
****************************************************************************/
@@ -32,6 +32,8 @@
class itsCommunicationClient_embedded : public itsCommunicationClient
{
public:
+ itsCommunicationClient_embedded();
+
itsPoint call(itsPoint point);
vector<double> boundsMinima();
@@ -44,8 +46,6 @@
class itsCommunicationClientFactory_embedded : public
itsCommunicationClientFactory
{
public:
- itsCommunicationClientFactory_embedded();
-
itsCommunicationClient* create();
};
Index: ometah/communication/itsCommunicationServer.hpp
diff -u ometah/communication/itsCommunicationServer.hpp:1.6
ometah/communication/itsCommunicationServer.hpp:1.7
--- ometah/communication/itsCommunicationServer.hpp:1.6 Fri May 13 18:36:01 2005
+++ ometah/communication/itsCommunicationServer.hpp Sat May 14 06:33:15 2005
@@ -1,5 +1,5 @@
/***************************************************************************
- * $Id: itsCommunicationServer.hpp,v 1.6 2005/05/13 18:36:01 nojhan Exp $
+ * $Id: itsCommunicationServer.hpp,v 1.7 2005/05/14 06:33:15 nojhan Exp $
* Copyright : Université Paris 12 Val-de-Marne
* Author : Johann Dréo <address@hidden>
****************************************************************************/
@@ -34,6 +34,8 @@
class itsCommunicationServer : public itsCommunication
{
public:
+ itsCommunicationServer();
+
//! The problem
itsProblem* problem;
@@ -61,8 +63,8 @@
class itsCommunicationServerFactory
{
public:
- virtual ~itsCommunicationServerFactory() {};
- itsCommunicationServerFactory() {};
+ //virtual ~itsCommunicationServerFactory() {};
+ //itsCommunicationServerFactory() {};
virtual itsCommunicationServer * create() =0;
};
Index: ometah/communication/itsCommunicationServer_embedded.hpp
diff -u ometah/communication/itsCommunicationServer_embedded.hpp:1.4
ometah/communication/itsCommunicationServer_embedded.hpp:1.5
--- ometah/communication/itsCommunicationServer_embedded.hpp:1.4 Fri May
13 18:36:01 2005
+++ ometah/communication/itsCommunicationServer_embedded.hpp Sat May 14
06:33:15 2005
@@ -1,5 +1,5 @@
/***************************************************************************
- * $Id: itsCommunicationServer_embedded.hpp,v 1.4 2005/05/13 18:36:01 nojhan
Exp $
+ * $Id: itsCommunicationServer_embedded.hpp,v 1.5 2005/05/14 06:33:15 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/ometah.pws
diff -u ometah/ometah.pws:1.9 ometah/ometah.pws:1.10
--- ometah/ometah.pws:1.9 Fri May 13 18:36:00 2005
+++ ometah/ometah.pws Sat May 14 06:33:15 2005
@@ -1,9 +1,9 @@
[filenumbers]
-0=42
-1=64
-2=34
-3=1
+0=76
+1=1
+2=29
+3=32
4=1
5=27
6=41
@@ -32,16 +32,14 @@
[filelist]
0=/home/nojhan/travail/openMetaheuristic/source/ometah/communication/itsCommunicationClient.hpp
-1=/home/nojhan/travail/openMetaheuristic/source/ometah/communication/itsCommunicationClient_embedded.cpp
-2=/home/nojhan/travail/openMetaheuristic/source/ometah/communication/itsCommunicationClient_embedded.hpp
-3=/home/nojhan/travail/openMetaheuristic/source/ometah/communication/itsCommunicationServer.cpp
-4=/home/nojhan/travail/openMetaheuristic/source/ometah/communication/itsCommunicationServer.hpp
-5=/home/nojhan/travail/openMetaheuristic/source/ometah/communication/itsCommunicationServer_embedded.cpp
-6=/home/nojhan/travail/openMetaheuristic/source/ometah/communication/itsCommunicationServer_embedded.hpp
-7=/home/nojhan/travail/openMetaheuristic/source/ometah/interface/ometah.cpp
+1=/home/nojhan/travail/openMetaheuristic/source/ometah/communication/itsCommunicationServer.hpp
+2=/home/nojhan/travail/openMetaheuristic/source/ometah/communication/itsCommunicationServer_embedded.cpp
+3=/home/nojhan/travail/openMetaheuristic/source/ometah/communication/itsCommunicationServer_embedded.hpp
[Project Tree]
0=0
+1=0:0
+2=0:1
[File Tree]
0=0