[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: |
Fri, 13 May 2005 14:36:01 -0400 |
CVSROOT: /cvsroot/ometah
Module name: ometah
Branch:
Changes by: Johann <address@hidden> 05/05/13 18:36:01
Modified files:
. : ometah.pws
communication : itsCommunication.hpp itsCommunicationClient.hpp
itsCommunicationClient_embedded.cpp
itsCommunicationClient_embedded.hpp
itsCommunicationServer.hpp
itsCommunicationServer_embedded.hpp
interface : ometah.cpp
metaheuristic : itsMetaheuristic.hpp
problem : itsProblem.hpp
Log message:
* solved most compilation problem at linking stage
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/ometah.pws.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/communication/itsCommunication.hpp.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.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/communication/itsCommunicationClient_embedded.cpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/communication/itsCommunicationClient_embedded.hpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/communication/itsCommunicationServer.hpp.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/communication/itsCommunicationServer_embedded.hpp.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/interface/ometah.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.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/problem/itsProblem.hpp.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
Patches:
Index: ometah/communication/itsCommunication.hpp
diff -u ometah/communication/itsCommunication.hpp:1.3
ometah/communication/itsCommunication.hpp:1.4
--- ometah/communication/itsCommunication.hpp:1.3 Thu May 5 16:40:15 2005
+++ ometah/communication/itsCommunication.hpp Fri May 13 18:36:01 2005
@@ -1,5 +1,5 @@
/***************************************************************************
- * $Id: itsCommunication.hpp,v 1.3 2005/05/05 16:40:15 nojhan Exp $
+ * $Id: itsCommunication.hpp,v 1.4 2005/05/13 18:36:01 nojhan Exp $
* Copyright : Université Paris 12 Val-de-Marne
* Author : Johann Dréo <address@hidden>
****************************************************************************/
@@ -24,6 +24,10 @@
#define ITSCOMMUNICATION
#include "../common/itsPoint.hpp"
+#include "../common/logic.hpp"
+
+#include <hash_map.h>
+
class itsCommunication
{
@@ -40,28 +44,31 @@
itsCommunication() {};
//! Call the problem on a point to get its associated values
- virtual itsPoint call(itsPoint point) {};
+ virtual itsPoint call(itsPoint point) =0;
+ //!
+ virtual void initialization(hash_map<string,string, eqstr> args) =0;
+
//! The minima of the problem bounds
- virtual vector<double> boundsMinima() {};
+ virtual vector<double> boundsMinima() =0;
//! The maxima of the problem bounds
- virtual vector<double> boundsMaxima() {};
+ virtual vector<double> boundsMaxima() =0;
//! 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() =0;
//! Return the dimension
- virtual int getDimension() {};
+ virtual int getDimension() =0;
//! Return the key
- string getKey();
+ virtual string getKey();
//! Change the key
- void setKey(string key);
+ virtual void setKey(string key);
};
#endif
Index: ometah/communication/itsCommunicationClient.hpp
diff -u ometah/communication/itsCommunicationClient.hpp:1.9
ometah/communication/itsCommunicationClient.hpp:1.10
--- ometah/communication/itsCommunicationClient.hpp:1.9 Thu May 5 20:19:47 2005
+++ ometah/communication/itsCommunicationClient.hpp Fri May 13 18:36:01 2005
@@ -1,7 +1,7 @@
/***************************************************************************
* itsCommunicationClientt.hpp
*
- * $Id: itsCommunicationClient.hpp,v 1.9 2005/05/05 20:19:47 nojhan Exp $
+ * $Id: itsCommunicationClient.hpp,v 1.10 2005/05/13 18:36:01 nojhan Exp $
* Author : Johann Dréo <address@hidden>
****************************************************************************/
@@ -39,8 +39,8 @@
public:
- //void initialization(hash_map<string,string, eqstr> args);
- void initialization(int args);
+ 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);
@@ -69,7 +69,7 @@
virtual ~itsCommunicationClientFactory() {};
itsCommunicationClientFactory() {};
- virtual itsCommunicationClient * create() {};
+ virtual itsCommunicationClient * create() =0;
};
#endif
Index: ometah/communication/itsCommunicationClient_embedded.cpp
diff -u ometah/communication/itsCommunicationClient_embedded.cpp:1.4
ometah/communication/itsCommunicationClient_embedded.cpp:1.5
--- ometah/communication/itsCommunicationClient_embedded.cpp:1.4 Thu May
5 20:19:47 2005
+++ ometah/communication/itsCommunicationClient_embedded.cpp Fri May 13
18:36:01 2005
@@ -1,5 +1,5 @@
/***************************************************************************
- * $Id: itsCommunicationClient_embedded.cpp,v 1.4 2005/05/05 20:19:47 nojhan
Exp $
+ * $Id: itsCommunicationClient_embedded.cpp,v 1.5 2005/05/13 18:36:01 nojhan
Exp $
* Copyright : Université Paris 12 Val-de-Marne
* Author : Johann Dréo <address@hidden>
****************************************************************************/
@@ -21,28 +21,29 @@
*/
#include "itsCommunicationServer_embedded.hpp"
+#include "itsCommunicationClient_embedded.hpp"
-itsPoint itsCommunicationClientFactory_embedded::call(itsPoint point)
+itsPoint itsCommunicationClient_embedded::call(itsPoint point)
{
return this->problem.call(point);
}
-vector<double> itsCommunicationClientFactory_embedded::boundsMinima()
+vector<double> itsCommunicationClient_embedded::boundsMinima()
{
return this->problem.boundsMinima();
}
-vector<double> itsCommunicationClientFactory_embedded::boundsMaxima()
+vector<double> itsCommunicationClient_embedded::boundsMaxima()
{
return this->problem.boundsMaxima();
}
-vector<vector<double> > itsCommunicationClientFactory_embedded::bounds()
+vector<vector<double> > itsCommunicationClient_embedded::bounds()
{
return this->problem.bounds();
}
-int itsCommunicationClientFactory_embedded::getDimension()
+int itsCommunicationClient_embedded::getDimension()
{
return this->problem.getDimension();
}
Index: ometah/communication/itsCommunicationClient_embedded.hpp
diff -u ometah/communication/itsCommunicationClient_embedded.hpp:1.4
ometah/communication/itsCommunicationClient_embedded.hpp:1.5
--- ometah/communication/itsCommunicationClient_embedded.hpp:1.4 Thu May
5 20:19:47 2005
+++ ometah/communication/itsCommunicationClient_embedded.hpp Fri May 13
18:36:01 2005
@@ -1,5 +1,5 @@
/***************************************************************************
- * $Id: itsCommunicationClient_embedded.hpp,v 1.4 2005/05/05 20:19:47 nojhan
Exp $
+ * $Id: itsCommunicationClient_embedded.hpp,v 1.5 2005/05/13 18:36:01 nojhan
Exp $
* Copyright : Université Paris 12 Val-de-Marne
* Author : Johann Dréo <address@hidden>
****************************************************************************/
@@ -31,15 +31,20 @@
class itsCommunicationClient_embedded : public itsCommunicationClient
{
- itsCommunicationClient_embedded() {};
- ~itsCommunicationClient_embedded() {};
+public:
+
+ itsPoint call(itsPoint point);
+ vector<double> boundsMinima();
+ vector<double> boundsMaxima();
+ vector<vector<double> > bounds();
+ int getDimension();
+
};
class itsCommunicationClientFactory_embedded : public
itsCommunicationClientFactory
{
public:
- //itsCommunicationClientFactory_embedded() {};
- //~itsCommunicationClientFactory_embedded() {};
+ itsCommunicationClientFactory_embedded();
itsCommunicationClient* create();
};
Index: ometah/communication/itsCommunicationServer.hpp
diff -u ometah/communication/itsCommunicationServer.hpp:1.5
ometah/communication/itsCommunicationServer.hpp:1.6
--- ometah/communication/itsCommunicationServer.hpp:1.5 Thu May 5 16:40:15 2005
+++ ometah/communication/itsCommunicationServer.hpp Fri May 13 18:36:01 2005
@@ -1,5 +1,5 @@
/***************************************************************************
- * $Id: itsCommunicationServer.hpp,v 1.5 2005/05/05 16:40:15 nojhan Exp $
+ * $Id: itsCommunicationServer.hpp,v 1.6 2005/05/13 18:36:01 nojhan Exp $
* Copyright : Université Paris 12 Val-de-Marne
* Author : Johann Dréo <address@hidden>
****************************************************************************/
@@ -64,7 +64,7 @@
virtual ~itsCommunicationServerFactory() {};
itsCommunicationServerFactory() {};
- virtual itsCommunicationServer * create() {};
+ virtual itsCommunicationServer * create() =0;
};
#endif
Index: ometah/communication/itsCommunicationServer_embedded.hpp
diff -u ometah/communication/itsCommunicationServer_embedded.hpp:1.3
ometah/communication/itsCommunicationServer_embedded.hpp:1.4
--- ometah/communication/itsCommunicationServer_embedded.hpp:1.3 Thu May
5 20:19:47 2005
+++ ometah/communication/itsCommunicationServer_embedded.hpp Fri May 13
18:36:01 2005
@@ -1,5 +1,5 @@
/***************************************************************************
- * $Id: itsCommunicationServer_embedded.hpp,v 1.3 2005/05/05 20:19:47 nojhan
Exp $
+ * $Id: itsCommunicationServer_embedded.hpp,v 1.4 2005/05/13 18:36:01 nojhan
Exp $
* Copyright : Université Paris 12 Val-de-Marne
* Author : Johann Dréo <address@hidden>
****************************************************************************/
@@ -30,7 +30,7 @@
public:
//! Constructor
itsCommunicationServer_embedded();
- ~itsCommunicationServer_embedded() {};
+ //~itsCommunicationServer_embedded() {};
};
Index: ometah/interface/ometah.cpp
diff -u ometah/interface/ometah.cpp:1.9 ometah/interface/ometah.cpp:1.10
--- ometah/interface/ometah.cpp:1.9 Thu May 5 20:19:47 2005
+++ ometah/interface/ometah.cpp Fri May 13 18:36:01 2005
@@ -1,5 +1,5 @@
/***************************************************************************
- * $Id: ometah.cpp,v 1.9 2005/05/05 20:19:47 nojhan Exp $
+ * $Id: ometah.cpp,v 1.10 2005/05/13 18:36:01 nojhan Exp $
* Copyright : Université Paris 12 Val-de-Marne
* Author : Johann Dréo <address@hidden>
****************************************************************************/
@@ -131,8 +131,8 @@
}
// giving parameters
- //hash_map<string,string, eqstr> parameters;
- int parameters;
+ hash_map<string,string, eqstr> parameters;
+ //int parameters;
setCommunicationClient.item()->initialization( parameters );
Index: ometah/metaheuristic/itsMetaheuristic.hpp
diff -u ometah/metaheuristic/itsMetaheuristic.hpp:1.11
ometah/metaheuristic/itsMetaheuristic.hpp:1.12
--- ometah/metaheuristic/itsMetaheuristic.hpp:1.11 Thu May 5 16:40:15 2005
+++ ometah/metaheuristic/itsMetaheuristic.hpp Fri May 13 18:36:01 2005
@@ -237,7 +237,7 @@
{
public:
//! base method for instanciation in the abstract factory
- virtual itsMetaheuristic* create() {};
+ virtual itsMetaheuristic* create() =0;
};
Index: ometah/ometah.pws
diff -u ometah/ometah.pws:1.8 ometah/ometah.pws:1.9
--- ometah/ometah.pws:1.8 Thu May 5 20:19:47 2005
+++ ometah/ometah.pws Fri May 13 18:36:00 2005
@@ -1,12 +1,13 @@
[filenumbers]
-0=69
+0=42
1=64
-2=41
+2=34
3=1
4=1
5=27
6=41
+7=136
[filemarkers]
0=
@@ -16,6 +17,7 @@
4=
5=
6=
+7=
[File View]
filter.file.unmatch=*.so *.o *.a *.la
@@ -36,14 +38,10 @@
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
[Project Tree]
0=0
-1=0:0
-2=0:1
-
-[Symbol Tree]
-0=1
[File Tree]
0=0
Index: ometah/problem/itsProblem.hpp
diff -u ometah/problem/itsProblem.hpp:1.12 ometah/problem/itsProblem.hpp:1.13
--- ometah/problem/itsProblem.hpp:1.12 Thu May 5 16:40:15 2005
+++ ometah/problem/itsProblem.hpp Fri May 13 18:36:01 2005
@@ -1,5 +1,5 @@
/***************************************************************************
- * $Id: itsProblem.hpp,v 1.12 2005/05/05 16:40:15 nojhan Exp $
+ * $Id: itsProblem.hpp,v 1.13 2005/05/13 18:36:01 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 point) {} ;// const = 0;
+ virtual itsPoint objectiveFunction(itsPoint point) =0;// const = 0;
};
@@ -192,7 +192,7 @@
{
public:
//! Base method for instanciation in the abstract factory
- virtual itsProblem* create() {} ;// const = 0;
+ virtual itsProblem* create() =0;// const = 0;
};
#endif
- [oMetah-devel] ometah ./ometah.pws communication/itsCommunicat...,
Johann <=