[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[oMetah-devel] ometah ./ometah.pws common/itsSet.hpp communica...
From: |
Johann |
Subject: |
[oMetah-devel] ometah ./ometah.pws common/itsSet.hpp communica... |
Date: |
Thu, 05 May 2005 16:19:48 -0400 |
CVSROOT: /cvsroot/ometah
Module name: ometah
Branch:
Changes by: Johann <address@hidden> 05/05/05 20:19:47
Modified files:
. : ometah.pws
common : itsSet.hpp
communication : itsCommunicationClient.cpp
itsCommunicationClient.hpp
itsCommunicationClient_embedded.cpp
itsCommunicationClient_embedded.hpp
itsCommunicationServer_embedded.cpp
itsCommunicationServer_embedded.hpp
interface : ometah.cpp
Log message:
* alway searching for a solution
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/ometah.pws.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/common/itsSet.hpp.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/communication/itsCommunicationClient.cpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/communication/itsCommunicationClient.hpp.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/communication/itsCommunicationClient_embedded.cpp.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/communication/itsCommunicationClient_embedded.hpp.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/communication/itsCommunicationServer_embedded.cpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/communication/itsCommunicationServer_embedded.hpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/interface/ometah.cpp.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
Patches:
Index: ometah/common/itsSet.hpp
diff -u ometah/common/itsSet.hpp:1.9 ometah/common/itsSet.hpp:1.10
--- ometah/common/itsSet.hpp:1.9 Sat Mar 26 11:46:47 2005
+++ ometah/common/itsSet.hpp Thu May 5 20:19:47 2005
@@ -1,5 +1,5 @@
/***************************************************************************
- * $Id: itsSet.hpp,v 1.9 2005/03/26 11:46:47 nojhan Exp $
+ * $Id: itsSet.hpp,v 1.10 2005/05/05 20:19:47 nojhan Exp $
* Author: Walid TFAILI <address@hidden>
****************************************************************************/
@@ -56,10 +56,10 @@
[<string> => <object>]
It use the "name" method to get the key associated to the object.
*/
- void add(T item)
+ void add(T anItem)
{
// key is based on a const char*, so we take the c_str
- collection[item->getKey().c_str()] = item;
+ collection[anItem->getKey().c_str()] = anItem;
};
//! Remove an object
Index: ometah/communication/itsCommunicationClient.cpp
diff -u ometah/communication/itsCommunicationClient.cpp:1.2
ometah/communication/itsCommunicationClient.cpp:1.3
--- ometah/communication/itsCommunicationClient.cpp:1.2 Thu May 5 16:40:15 2005
+++ ometah/communication/itsCommunicationClient.cpp Thu May 5 20:19:47 2005
@@ -1,5 +1,5 @@
/***************************************************************************
- * $Id: itsCommunicationClient.cpp,v 1.2 2005/05/05 16:40:15 nojhan Exp $
+ * $Id: itsCommunicationClient.cpp,v 1.3 2005/05/05 20:19:47 nojhan Exp $
* Copyright : Université Paris 12 Val-de-Marne
* Author : Johann Dréo <address@hidden>
****************************************************************************/
@@ -24,7 +24,8 @@
#include "itsCommunicationClient.hpp"
-void itsCommunicationClient::initialization(hash_map<string,string, eqstr>
args)
+//void itsCommunicationClient::initialization(hash_map<string,string, eqstr>
args)
+void itsCommunicationClient::initialization(int args)
{
}
Index: ometah/communication/itsCommunicationClient.hpp
diff -u ometah/communication/itsCommunicationClient.hpp:1.8
ometah/communication/itsCommunicationClient.hpp:1.9
--- ometah/communication/itsCommunicationClient.hpp:1.8 Thu May 5 16:40:15 2005
+++ ometah/communication/itsCommunicationClient.hpp Thu May 5 20:19:47 2005
@@ -1,7 +1,7 @@
/***************************************************************************
* itsCommunicationClientt.hpp
*
- * $Id: itsCommunicationClient.hpp,v 1.8 2005/05/05 16:40:15 nojhan Exp $
+ * $Id: itsCommunicationClient.hpp,v 1.9 2005/05/05 20:19:47 nojhan Exp $
* Author : Johann Dréo <address@hidden>
****************************************************************************/
@@ -38,7 +38,9 @@
itsCommunicationServer* problem;
public:
- void initialization(hash_map<string,string, eqstr> 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);
Index: ometah/communication/itsCommunicationClient_embedded.cpp
diff -u ometah/communication/itsCommunicationClient_embedded.cpp:1.3
ometah/communication/itsCommunicationClient_embedded.cpp:1.4
--- ometah/communication/itsCommunicationClient_embedded.cpp:1.3 Sat Mar
26 09:17:38 2005
+++ ometah/communication/itsCommunicationClient_embedded.cpp Thu May 5
20:19:47 2005
@@ -1,5 +1,5 @@
/***************************************************************************
- * $Id: itsCommunicationClient_embedded.cpp,v 1.3 2005/03/26 09:17:38 nojhan
Exp $
+ * $Id: itsCommunicationClient_embedded.cpp,v 1.4 2005/05/05 20:19:47 nojhan
Exp $
* Copyright : Université Paris 12 Val-de-Marne
* Author : Johann Dréo <address@hidden>
****************************************************************************/
@@ -22,13 +22,6 @@
#include "itsCommunicationServer_embedded.hpp"
-itsCommunicationClientFactory_embedded::itsCommunicationClientFactory_embedded()
-{
- setKey("Embedded");
-
- this->problem = itsCommunicationServer_embedded();
-}
-
itsPoint itsCommunicationClientFactory_embedded::call(itsPoint point)
{
return this->problem.call(point);
@@ -58,5 +51,13 @@
itsCommunicationClient* itsCommunicationClientFactory_embedded::create()
{
- return new itsCommunicationClientFactory_embedded;
+ return new itsCommunicationClient_embedded;
+}
+
+
+itsCommunicationClientFactory_embedded::itsCommunicationClientFactory_embedded()
+{
+ this->setKey("Embedded");
+
+ this->problem = itsCommunicationServer_embedded();
}
Index: ometah/communication/itsCommunicationClient_embedded.hpp
diff -u ometah/communication/itsCommunicationClient_embedded.hpp:1.3
ometah/communication/itsCommunicationClient_embedded.hpp:1.4
--- ometah/communication/itsCommunicationClient_embedded.hpp:1.3 Sat Mar
26 09:17:38 2005
+++ ometah/communication/itsCommunicationClient_embedded.hpp Thu May 5
20:19:47 2005
@@ -1,5 +1,5 @@
/***************************************************************************
- * $Id: itsCommunicationClient_embedded.hpp,v 1.3 2005/03/26 09:17:38 nojhan
Exp $
+ * $Id: itsCommunicationClient_embedded.hpp,v 1.4 2005/05/05 20:19:47 nojhan
Exp $
* Copyright : Université Paris 12 Val-de-Marne
* Author : Johann Dréo <address@hidden>
****************************************************************************/
@@ -31,12 +31,16 @@
class itsCommunicationClient_embedded : public itsCommunicationClient
{
-
+ itsCommunicationClient_embedded() {};
+ ~itsCommunicationClient_embedded() {};
};
class itsCommunicationClientFactory_embedded : public
itsCommunicationClientFactory
{
public:
+ //itsCommunicationClientFactory_embedded() {};
+ //~itsCommunicationClientFactory_embedded() {};
+
itsCommunicationClient* create();
};
Index: ometah/communication/itsCommunicationServer_embedded.cpp
diff -u ometah/communication/itsCommunicationServer_embedded.cpp:1.2
ometah/communication/itsCommunicationServer_embedded.cpp:1.3
--- ometah/communication/itsCommunicationServer_embedded.cpp:1.2 Wed Mar
16 19:03:31 2005
+++ ometah/communication/itsCommunicationServer_embedded.cpp Thu May 5
20:19:47 2005
@@ -1,5 +1,5 @@
/***************************************************************************
- * $Id: itsCommunicationServer_embedded.cpp,v 1.2 2005/03/16 19:03:31 nojhan
Exp $
+ * $Id: itsCommunicationServer_embedded.cpp,v 1.3 2005/05/05 20:19:47 nojhan
Exp $
* Copyright : Université Paris 12 Val-de-Marne
* Author : Johann Dréo <address@hidden>
****************************************************************************/
@@ -24,7 +24,7 @@
itsCommunicationServer_embedded::itsCommunicationServer_embedded()
{
- setKey("Embedded");
+ this->setKey("Embedded");
}
itsCommunicationServer* itsCommunicationServerFactory_embedded::create()
Index: ometah/communication/itsCommunicationServer_embedded.hpp
diff -u ometah/communication/itsCommunicationServer_embedded.hpp:1.2
ometah/communication/itsCommunicationServer_embedded.hpp:1.3
--- ometah/communication/itsCommunicationServer_embedded.hpp:1.2 Wed Mar
16 19:03:31 2005
+++ ometah/communication/itsCommunicationServer_embedded.hpp Thu May 5
20:19:47 2005
@@ -1,5 +1,5 @@
/***************************************************************************
- * $Id: itsCommunicationServer_embedded.hpp,v 1.2 2005/03/16 19:03:31 nojhan
Exp $
+ * $Id: itsCommunicationServer_embedded.hpp,v 1.3 2005/05/05 20:19:47 nojhan
Exp $
* Copyright : Université Paris 12 Val-de-Marne
* Author : Johann Dréo <address@hidden>
****************************************************************************/
@@ -30,12 +30,16 @@
public:
//! Constructor
itsCommunicationServer_embedded();
+ ~itsCommunicationServer_embedded() {};
};
class itsCommunicationServerFactory_embedded : public
itsCommunicationServerFactory
{
public:
+ //itsCommunicationServerFactory_embedded() {};
+ //~itsCommunicationServerFactory_embedded() {};
+
itsCommunicationServer* create();
};
Index: ometah/interface/ometah.cpp
diff -u ometah/interface/ometah.cpp:1.8 ometah/interface/ometah.cpp:1.9
--- ometah/interface/ometah.cpp:1.8 Sat Mar 26 20:33:02 2005
+++ ometah/interface/ometah.cpp Thu May 5 20:19:47 2005
@@ -1,5 +1,5 @@
/***************************************************************************
- * $Id: ometah.cpp,v 1.8 2005/03/26 20:33:02 nojhan Exp $
+ * $Id: ometah.cpp,v 1.9 2005/05/05 20:19:47 nojhan Exp $
* Copyright : Université Paris 12 Val-de-Marne
* Author : Johann Dréo <address@hidden>
****************************************************************************/
@@ -131,7 +131,8 @@
}
// giving parameters
- hash_map<string,string, eqstr> parameters;
+ //hash_map<string,string, eqstr> parameters;
+ int parameters;
setCommunicationClient.item()->initialization( parameters );
Index: ometah/ometah.pws
diff -u ometah/ometah.pws:1.7 ometah/ometah.pws:1.8
--- ometah/ometah.pws:1.7 Thu May 5 16:40:15 2005
+++ ometah/ometah.pws Thu May 5 20:19:47 2005
@@ -1,29 +1,49 @@
-[filelist]
-0=/home/nojhan/travail/openMetaheuristic/source/ometah/metaheuristic/itsEstimationOfDistribution.cpp
-1=/home/nojhan/travail/openMetaheuristic/source/ometah/interface/ometah.cpp
-
[filenumbers]
-0=84
-1=135
+0=69
+1=64
+2=41
+3=1
+4=1
+5=27
+6=41
[filemarkers]
0=
1=
+2=
+3=
+4=
+5=
+6=
[File View]
filter.file.unmatch=*.so *.o *.a *.la
filter.file.ignore.hidden=0
filter.dir.ignore.hidden=0
-[Project Tree]
-0=0
-
-[File Tree]
-0=0
-
[executer]
RunInTerminal=true
[Project State]
clean before build=false
+
+[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
+
+[Project Tree]
+0=0
+1=0:0
+2=0:1
+
+[Symbol Tree]
+0=1
+
+[File Tree]
+0=0
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [oMetah-devel] ometah ./ometah.pws common/itsSet.hpp communica...,
Johann <=