[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[oMetah-devel] ometah common/itsSet.cpp common/itsSet.hpp meta...
From: |
Johann |
Subject: |
[oMetah-devel] ometah common/itsSet.cpp common/itsSet.hpp meta... |
Date: |
Sat, 12 Mar 2005 17:50:35 -0500 |
CVSROOT: /cvsroot/ometah
Module name: ometah
Branch:
Changes by: Johann <address@hidden> 05/03/12 22:50:35
Modified files:
common : itsSet.cpp itsSet.hpp
metaheuristic : itsEstimationOfDistribution.cpp
itsMetaheuristic.cpp itsMetaheuristic.hpp
problem : itsProblem.cpp itsProblem.hpp itsRosenbrock.cpp
itsRosenbrock.hpp
Log message:
* more files in the project
* infos about EDA
* more stuff to deal with communication
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/common/itsSet.cpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/common/itsSet.hpp.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/metaheuristic/itsEstimationOfDistribution.cpp.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/metaheuristic/itsMetaheuristic.cpp.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/metaheuristic/itsMetaheuristic.hpp.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/problem/itsProblem.cpp.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/problem/itsProblem.hpp.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/problem/itsRosenbrock.cpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/problem/itsRosenbrock.hpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
Patches:
Index: ometah/common/itsSet.cpp
diff -u ometah/common/itsSet.cpp:1.2 ometah/common/itsSet.cpp:1.3
--- ometah/common/itsSet.cpp:1.2 Fri Mar 11 10:23:36 2005
+++ ometah/common/itsSet.cpp Sat Mar 12 22:50:34 2005
@@ -1,5 +1,5 @@
/***************************************************************************
- * $Id: itsSet.cpp,v 1.2 2005/03/11 10:23:36 nojhan Exp $
+ * $Id: itsSet.cpp,v 1.3 2005/03/12 22:50:34 nojhan Exp $
* Author: Walid TFAILI <address@hidden>
****************************************************************************/
@@ -29,7 +29,7 @@
void itsSet<T>::add(T item)
{
// key is based on a const char*, so we take the c_str
- collection[item->name().c_str()] = item;
+ collection[item->getKey().c_str()] = item;
}
template <class T>
Index: ometah/common/itsSet.hpp
diff -u ometah/common/itsSet.hpp:1.5 ometah/common/itsSet.hpp:1.6
--- ometah/common/itsSet.hpp:1.5 Fri Mar 11 10:23:36 2005
+++ ometah/common/itsSet.hpp Sat Mar 12 22:50:34 2005
@@ -1,5 +1,5 @@
/***************************************************************************
- * $Id: itsSet.hpp,v 1.5 2005/03/11 10:23:36 nojhan Exp $
+ * $Id: itsSet.hpp,v 1.6 2005/03/12 22:50:34 nojhan Exp $
* Author: Walid TFAILI <address@hidden>
****************************************************************************/
@@ -58,7 +58,7 @@
//! The current choice
string currentItem;
-
+
public:
//! Add an object
/*!
Index: ometah/metaheuristic/itsEstimationOfDistribution.cpp
diff -u ometah/metaheuristic/itsEstimationOfDistribution.cpp:1.7
ometah/metaheuristic/itsEstimationOfDistribution.cpp:1.8
--- ometah/metaheuristic/itsEstimationOfDistribution.cpp:1.7 Fri Mar 11
21:28:50 2005
+++ ometah/metaheuristic/itsEstimationOfDistribution.cpp Sat Mar 12
22:50:35 2005
@@ -1,7 +1,7 @@
/***************************************************************************
* itsMetaheuristic.hpp
*
- * $Id: itsEstimationOfDistribution.cpp,v 1.7 2005/03/11 21:28:50 nojhan Exp $
+ * $Id: itsEstimationOfDistribution.cpp,v 1.8 2005/03/12 22:50:35 nojhan Exp $
* Author : Johann Dréo <address@hidden>
****************************************************************************/
@@ -36,8 +36,30 @@
itsEstimationOfDistribution::itsEstimationOfDistribution()
{
- setDistribution("Uniform");
- setSelectRatio(0.5);
+ setName("Continuous Estimation of Distribution Algorithm");
+ setKey("CEDA");
+ setAccronym("CEDA");
+ setDescription("An estimation of distribution algorithm");
+ setCitation("
address@hidden,
+ Author = {Bengoetxea, E. and Miqu\'elez, T. and Larra\~naga, P.
+ and Lozano, J. A.},
+ Editor = {Larranaga, P. and Lozano, J. A.},
+ Title = {Estimation of {D}istribution {A}lgorithms, {A} {N}ew
+ {T}ool for {E}volutionary {C}omputation},
+ Chapter = {Experimental Results in Function Optimization with
+ EDAs in Continuous Domain},
+ Pages = {181--194},
+ Publisher = {Kluwer Academic Publishers},
+ Series = {Genetic Algorithms and Evolutionary Computation},
+ year = 2002
+}
+");
+ setFamily("Estimation of Distribution Algorithm");
+
+
+ setDistribution("Uniform");
+ setSelectRatio(0.5);
}
void itsEstimationOfDistribution::learning()
Index: ometah/metaheuristic/itsMetaheuristic.cpp
diff -u ometah/metaheuristic/itsMetaheuristic.cpp:1.5
ometah/metaheuristic/itsMetaheuristic.cpp:1.6
--- ometah/metaheuristic/itsMetaheuristic.cpp:1.5 Fri Mar 11 21:28:50 2005
+++ ometah/metaheuristic/itsMetaheuristic.cpp Sat Mar 12 22:50:35 2005
@@ -29,6 +29,7 @@
#include "itsMetaheuristic.hpp"
#include "../common/random.hpp"
#include "../problem/itsProblem.hpp"
+#include "../communication/itsCommunicationClient.hpp"
using namespace std;
@@ -127,8 +128,11 @@
}
+string itsMetaheuristic::getKey()
+{
+ return this->key;
+}
-
string itsMetaheuristic::getName()
{
Index: ometah/metaheuristic/itsMetaheuristic.hpp
diff -u ometah/metaheuristic/itsMetaheuristic.hpp:1.5
ometah/metaheuristic/itsMetaheuristic.hpp:1.6
--- ometah/metaheuristic/itsMetaheuristic.hpp:1.5 Fri Mar 11 21:28:50 2005
+++ ometah/metaheuristic/itsMetaheuristic.hpp Sat Mar 12 22:50:35 2005
@@ -69,6 +69,9 @@
*/
string name;
+ //! The unique key identifying the algorithm among other
+ string key;
+
//! The acronym of the algorithm
string accronym;
@@ -208,6 +211,9 @@
int getIterationsMaxNumber();
//! Change the maximum iterations number
void setIterationsMaxNumber(int nbr);
+
+ //! Return the key
+ string getKey();
//@}
};
Index: ometah/problem/itsProblem.cpp
diff -u ometah/problem/itsProblem.cpp:1.5 ometah/problem/itsProblem.cpp:1.6
--- ometah/problem/itsProblem.cpp:1.5 Fri Mar 11 21:28:50 2005
+++ ometah/problem/itsProblem.cpp Sat Mar 12 22:50:35 2005
@@ -1,5 +1,5 @@
/***************************************************************************
- * $Id: itsProblem.cpp,v 1.5 2005/03/11 21:28:50 nojhan Exp $
+ * $Id: itsProblem.cpp,v 1.6 2005/03/12 22:50:35 nojhan Exp $
* Copyright 2005 Université Paris 12 Val-de-Marne
* Author : Johann Dréo <address@hidden>
****************************************************************************/
@@ -48,6 +48,11 @@
//setOptima(optim);
}
+string itsProblem::getKey()
+{
+ return this->key;
+}
+
string itsProblem::getName()
{
return this->name;
Index: ometah/problem/itsProblem.hpp
diff -u ometah/problem/itsProblem.hpp:1.8 ometah/problem/itsProblem.hpp:1.9
--- ometah/problem/itsProblem.hpp:1.8 Fri Mar 11 21:28:50 2005
+++ ometah/problem/itsProblem.hpp Sat Mar 12 22:50:35 2005
@@ -1,5 +1,5 @@
/***************************************************************************
- * $Id: itsProblem.hpp,v 1.8 2005/03/11 21:28:50 nojhan Exp $
+ * $Id: itsProblem.hpp,v 1.9 2005/03/12 22:50:35 nojhan Exp $
* Copyright 2005 Université Paris 12 Val-de-Marne
* Author : Johann Dréo <address@hidden>
****************************************************************************/
@@ -44,6 +44,9 @@
*/
string name;
+ //! A unique key identifying the problem
+ string key;
+
//! A brief description
string description;
@@ -96,6 +99,9 @@
//! Set the name
void setName(string name);
+ //! Return the key
+ string getKey();
+
//! Return the description
string getDescription();
//! Change the description
Index: ometah/problem/itsRosenbrock.cpp
diff -u ometah/problem/itsRosenbrock.cpp:1.2
ometah/problem/itsRosenbrock.cpp:1.3
--- ometah/problem/itsRosenbrock.cpp:1.2 Fri Mar 11 21:28:50 2005
+++ ometah/problem/itsRosenbrock.cpp Sat Mar 12 22:50:35 2005
@@ -1,5 +1,5 @@
/***************************************************************************
- * $Id: itsRosenbrock.cpp,v 1.2 2005/03/11 21:28:50 nojhan Exp $
+ * $Id: itsRosenbrock.cpp,v 1.3 2005/03/12 22:50:35 nojhan Exp $
* Copyright 2005 Université Paris 12 Val-de-Marne
* Author : Johann Dréo <address@hidden>
****************************************************************************/
@@ -32,6 +32,7 @@
{
// informations
setName("Rosenbrock");
+ setKey("Rosenbrock");
setDescription("Rosenbrock is a classical test problem");
setCitation("Unknown");
setFormula("$R_{n}(\\overrightarrow{x})=\\sum_{i=1}^{n-1}\\left(100\\cdot\\left(x_{i}^{2}-x_{i+1}\\right)^{2}+\\left(x_{i}-1\\right)^{2}\\right)$");
@@ -67,3 +68,8 @@
return point;
}
+
+itsProblem * itsRosenbrockFactory::create()
+{
+ return new itsRosenbrock;
+}
Index: ometah/problem/itsRosenbrock.hpp
diff -u ometah/problem/itsRosenbrock.hpp:1.2
ometah/problem/itsRosenbrock.hpp:1.3
--- ometah/problem/itsRosenbrock.hpp:1.2 Fri Mar 11 21:28:50 2005
+++ ometah/problem/itsRosenbrock.hpp Sat Mar 12 22:50:35 2005
@@ -1,5 +1,5 @@
/***************************************************************************
- * $Id: itsRosenbrock.hpp,v 1.2 2005/03/11 21:28:50 nojhan Exp $
+ * $Id: itsRosenbrock.hpp,v 1.3 2005/03/12 22:50:35 nojhan Exp $
* Copyright 2005 Université Paris 12 Val-de-Marne
* Author : Johann Dréo <address@hidden>
****************************************************************************/
@@ -39,4 +39,10 @@
itsPoint objectiveFunction(itsPoint point);
};
+class itsRosenbrockFactory : public itsProblemFactory
+{
+public:
+ itsProblem * create();
+};
+
#endif
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [oMetah-devel] ometah common/itsSet.cpp common/itsSet.hpp meta...,
Johann <=