[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[oMetah-devel] ometah ./ometah.prj interface/itsArgument.cpp i...
From: |
NoJhan |
Subject: |
[oMetah-devel] ometah ./ometah.prj interface/itsArgument.cpp i... |
Date: |
Tue, 07 Jun 2005 08:22:47 -0400 |
CVSROOT: /cvsroot/ometah
Module name: ometah
Branch:
Changes by: NoJhan <address@hidden> 05/06/07 12:22:47
Modified files:
. : ometah.prj
interface : itsArgument.cpp itsArgument.hpp ometah.cpp
problem/CEC05 : itsCEC05_SSRPO_Base.cpp itsCEC05_SSRPO_Base.hpp
Log message:
* more copyright statements
* add all current problems to interface
* minor corrections on comments
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/ometah.prj.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/interface/itsArgument.cpp.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/interface/itsArgument.hpp.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/interface/ometah.cpp.diff?tr1=1.32&tr2=1.33&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/problem/CEC05/itsCEC05_SSRPO_Base.cpp.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/problem/CEC05/itsCEC05_SSRPO_Base.hpp.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
Patches:
Index: ometah/interface/itsArgument.cpp
diff -u ometah/interface/itsArgument.cpp:1.13
ometah/interface/itsArgument.cpp:1.14
--- ometah/interface/itsArgument.cpp:1.13 Fri Jun 3 14:41:25 2005
+++ ometah/interface/itsArgument.cpp Tue Jun 7 12:22:47 2005
@@ -1,6 +1,7 @@
/***************************************************************************
- * $Id: itsArgument.cpp,v 1.13 2005/06/03 14:41:25 jpa Exp $
+ * $Id: itsArgument.cpp,v 1.14 2005/06/07 12:22:47 nojhan Exp $
* Copyright : Université Paris 12 Val-de-Marne
+ * (61 avenue du Général de Gaulle, 94010, Créteil, France)
* Author : Johann Dréo <address@hidden>
* Author : Jean-Philippe Aumasson <address@hidden>
****************************************************************************/
Index: ometah/interface/itsArgument.hpp
diff -u ometah/interface/itsArgument.hpp:1.11
ometah/interface/itsArgument.hpp:1.12
--- ometah/interface/itsArgument.hpp:1.11 Fri Jun 3 13:39:11 2005
+++ ometah/interface/itsArgument.hpp Tue Jun 7 12:22:47 2005
@@ -1,6 +1,7 @@
/***************************************************************************
- * $Id: itsArgument.hpp,v 1.11 2005/06/03 13:39:11 jpa Exp $
+ * $Id: itsArgument.hpp,v 1.12 2005/06/07 12:22:47 nojhan Exp $
* Copyright : Université Paris 12 Val-de-Marne
+ * (61 avenue du Général de Gaulle, 94010, Créteil, France)
* Author : Johann Dréo <address@hidden>
* Author : Jean-Philippe Aumasson <address@hidden>
****************************************************************************/
Index: ometah/interface/ometah.cpp
diff -u ometah/interface/ometah.cpp:1.32 ometah/interface/ometah.cpp:1.33
--- ometah/interface/ometah.cpp:1.32 Tue Jun 7 12:11:57 2005
+++ ometah/interface/ometah.cpp Tue Jun 7 12:22:47 2005
@@ -1,5 +1,5 @@
/***************************************************************************
- * $Id: ometah.cpp,v 1.32 2005/06/07 12:11:57 nojhan Exp $
+ * $Id: ometah.cpp,v 1.33 2005/06/07 12:22:47 nojhan Exp $
* Copyright : Université Paris 12 Val-de-Marne
* (61 avenue du Général de Gaulle, 94010, Créteil, France)
* Author : Johann Dréo <address@hidden>
@@ -62,6 +62,24 @@
// add Rosenbrock
factoryProblems = new itsRosenbrockFactory;
setProblem.add( factoryProblems->create() );
+ // add Ackley
+ factoryProblems = new itsAckleyFactory;
+ setProblem.add( factoryProblems->create() );
+ // add Rastrigin
+ factoryProblems = new itsRastriginFactory;
+ setProblem.add( factoryProblems->create() );
+ // add Weierstrass
+ factoryProblems = new itsWeierstrassFactory;
+ setProblem.add( factoryProblems->create() );
+ // add Griewank
+ factoryProblems = new itsGriewankFactory;
+ setProblem.add( factoryProblems->create() );
+ // add Sphere
+ factoryProblems = new itsSphereFactory;
+ setProblem.add( factoryProblems->create() );
+ // add Schwefel
+ factoryProblems = new itsSchwefelFactory;
+ setProblem.add( factoryProblems->create() );
/*
Index: ometah/ometah.prj
diff -u ometah/ometah.prj:1.2 ometah/ometah.prj:1.3
--- ometah/ometah.prj:1.2 Wed Mar 16 19:12:50 2005
+++ ometah/ometah.prj Tue Jun 7 12:22:47 2005
@@ -9,7 +9,7 @@
<CONFIG_LIBS_END>
<CONFIG_HEADERS_START>
/***************************************************************************
- * $Id: ometah.prj,v 1.2 2005/03/16 19:12:50 nojhan Exp $
+ * $Id: ometah.prj,v 1.3 2005/06/07 12:22:47 nojhan Exp $
* Copyright : Université Paris 12 Val-de-Marne
* Author : Johann Dréo <address@hidden>
****************************************************************************/
@@ -101,11 +101,13 @@
common/string.hpp\
common/logic.hpp\
communication/itsCommunicationClient.hpp\
- problem/itsRosenbrock.hpp\
communication/itsCommunicationServer.hpp\
communication/itsCommunication.hpp\
communication/itsCommunicationClient_embedded.hpp\
- communication/itsCommunicationServer_embedded.hpp
+ communication/itsCommunicationServer_embedded.hpp\
+ problem/CEC05/itsCEC05_SSRPO_Base.hpp\
+ interface/ometah.hpp\
+ interface/itsArgument.hpp
module.source.name=.
module.source.type=
@@ -119,7 +121,6 @@
common/matrix.cpp\
common/itsPoint.cpp\
common/string.cpp\
- problem/itsRosenbrock.cpp\
interface/ometah.cpp\
common/itsSet.cpp\
SConstruct\
@@ -127,7 +128,9 @@
communication/itsCommunicationClient.cpp\
communication/itsCommunicationServer.cpp\
communication/itsCommunicationClient_embedded.cpp\
- communication/itsCommunicationServer_embedded.cpp
+ communication/itsCommunicationServer_embedded.cpp\
+ problem/CEC05/itsCEC05_SSRPO_Base.cpp\
+ interface/itsArgument.cpp
module.pixmap.name=.
module.pixmap.type=
Index: ometah/problem/CEC05/itsCEC05_SSRPO_Base.cpp
diff -u ometah/problem/CEC05/itsCEC05_SSRPO_Base.cpp:1.8
ometah/problem/CEC05/itsCEC05_SSRPO_Base.cpp:1.9
--- ometah/problem/CEC05/itsCEC05_SSRPO_Base.cpp:1.8 Fri Jun 3 13:49:29 2005
+++ ometah/problem/CEC05/itsCEC05_SSRPO_Base.cpp Tue Jun 7 12:22:47 2005
@@ -1,5 +1,7 @@
/***************************************************************************
- * $Id: itsCEC05_SSRPO_Base.cpp,v 1.8 2005/06/03 13:49:29 nojhan Exp $
+ * $Id: itsCEC05_SSRPO_Base.cpp,v 1.9 2005/06/07 12:22:47 nojhan Exp $
+ * Copyright : Université Paris 12 Val-de-Marne
+ * (61 avenue du Général de Gaulle, 94010, Créteil, France)
* Author: Johann Dréo <address@hidden>
****************************************************************************/
Index: ometah/problem/CEC05/itsCEC05_SSRPO_Base.hpp
diff -u ometah/problem/CEC05/itsCEC05_SSRPO_Base.hpp:1.8
ometah/problem/CEC05/itsCEC05_SSRPO_Base.hpp:1.9
--- ometah/problem/CEC05/itsCEC05_SSRPO_Base.hpp:1.8 Fri Jun 3 13:49:29 2005
+++ ometah/problem/CEC05/itsCEC05_SSRPO_Base.hpp Tue Jun 7 12:22:47 2005
@@ -1,5 +1,7 @@
/***************************************************************************
- * $Id: itsCEC05_SSRPO_Base.hpp,v 1.8 2005/06/03 13:49:29 nojhan Exp $
+ * $Id: itsCEC05_SSRPO_Base.hpp,v 1.9 2005/06/07 12:22:47 nojhan Exp $
+ * Copyright : Université Paris 12 Val-de-Marne
+ * (61 avenue du Général de Gaulle, 94010, Créteil, France)
* Author: Johann Dréo <address@hidden>
****************************************************************************/
@@ -60,7 +62,7 @@
-/***** Rastrigrin *****/
+/***** Rastrigin *****/
class itsRastrigin : public itsProblem
{
@@ -140,7 +142,7 @@
};
-/***** Schwefel *****/
+/***** Rosenbrock *****/
class itsRosenbrock : public itsProblem
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [oMetah-devel] ometah ./ometah.prj interface/itsArgument.cpp i...,
NoJhan <=