[oMetah-devel] ometah/interface itsArgument.cpp itsArgument.hp...

[Jean-Philippe Aumasson]

CVSROOT:        /cvsroot/ometah
Module name:    ometah
Branch:         
Changes by:     Jean-Philippe Aumasson <address@hidden> 05/06/03 13:39:11

Modified files:
        interface      : itsArgument.cpp itsArgument.hpp ometah.cpp 
                         ometah.hpp 

Log message:
        * minor modifs, usage formatting optimized, rosenbrock header changed

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/interface/itsArgument.cpp.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/interface/itsArgument.hpp.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/interface/ometah.cpp.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/interface/ometah.hpp.diff?tr1=1.7&tr2=1.8&r1=text&r2=text

Patches:
Index: ometah/interface/itsArgument.cpp
diff -u ometah/interface/itsArgument.cpp:1.11 
ometah/interface/itsArgument.cpp:1.12
--- ometah/interface/itsArgument.cpp:1.11       Fri Jun  3 12:55:47 2005
+++ ometah/interface/itsArgument.cpp    Fri Jun  3 13:39:11 2005
@@ -1,5 +1,5 @@
 /***************************************************************************
- *  $Id: itsArgument.cpp,v 1.11 2005/06/03 12:55:47 jpa Exp $
+ *  $Id: itsArgument.cpp,v 1.12 2005/06/03 13:39:11 jpa Exp $
  *  Copyright : Université Paris 12 Val-de-Marne
  *  Author : Johann Dréo <address@hidden>
  *  Author : Jean-Philippe Aumasson <address@hidden>
@@ -79,6 +79,7 @@
   return this->hasValue;
 }
 
+
 // ITSPARSER 
 
 
@@ -142,12 +143,6 @@
   itsArgument newArgument(flagShort, flagLong, usage, hasValue, type, value);
   arguments.push_back(newArgument);
 
-#ifdef DEBUG
-  cout << "(" << flagShort << ",  " << flagLong 
-       << ", " << usage << ", " << hasValue 
-       << ", " << type << ", " << value << ")" << endl; 
-#endif
-
   return found;
 }
 
@@ -229,7 +224,7 @@
   vector<itsArgument>::iterator iter;
   iter = this->arguments.begin();
   while (iter != this->arguments.end()){
-    printf("\t%s, %15s\t%s\n", iter->getKey().c_str(), 
+    printf(" %s, %13s\t%s\n", iter->getKey().c_str(), 
           iter->getLongKey().c_str(), iter->getUsage().c_str());
     iter++;
   }  
Index: ometah/interface/itsArgument.hpp
diff -u ometah/interface/itsArgument.hpp:1.10 
ometah/interface/itsArgument.hpp:1.11
--- ometah/interface/itsArgument.hpp:1.10       Fri Jun  3 12:55:47 2005
+++ ometah/interface/itsArgument.hpp    Fri Jun  3 13:39:11 2005
@@ -1,5 +1,5 @@
 /***************************************************************************
- *  $Id: itsArgument.hpp,v 1.10 2005/06/03 12:55:47 jpa Exp $
+ *  $Id: itsArgument.hpp,v 1.11 2005/06/03 13:39:11 jpa Exp $
  *  Copyright : Université Paris 12 Val-de-Marne
  *  Author : Johann Dréo <address@hidden>
  *  Author : Jean-Philippe Aumasson <address@hidden>
@@ -30,7 +30,6 @@
 
 #include "../common/logic.hpp"
 
-// #define DEBUG 1
 
 #define VERSION "Open Metaheuristic - 2005"
 #define USAGE "usage" // string value doesn't matter
Index: ometah/interface/ometah.cpp
diff -u ometah/interface/ometah.cpp:1.29 ometah/interface/ometah.cpp:1.30
--- ometah/interface/ometah.cpp:1.29    Fri Jun  3 12:55:47 2005
+++ ometah/interface/ometah.cpp Fri Jun  3 13:39:11 2005
@@ -1,5 +1,5 @@
 /***************************************************************************
- *  $Id: ometah.cpp,v 1.29 2005/06/03 12:55:47 jpa Exp $
+ *  $Id: ometah.cpp,v 1.30 2005/06/03 13:39:11 jpa Exp $
  *  Copyright : Université Paris 12 Val-de-Marne
  *  Author : Johann Dréo <address@hidden>
  *  Author : Jean-Philippe Aumasson <address@hidden>
@@ -102,13 +102,17 @@
   try {
     // arguments definitions (only here !!)
     argumentParser.defArg("-p", "--problem",
-                         "problem's name", true, "string", "Rosenbrock");
+                         "problem ( Rosenbrock | ... )", 
+                         true, "string", "Rosenbrock");
     argumentParser.defArg("-m", "--metah",
-                         "metaheuristic's name", true, "string", "CEDA");
+                         "metaheuristic ( CEDA | ... ) ", 
+                         true, "string", "CEDA");
     argumentParser.defArg("-C", "--com-client", 
-                         "communication client mode" ,true, "string", 
"Embedded");
+                         "communication client mode ( Embedded | ...)" ,
+                         true, "string", "Embedded");
     argumentParser.defArg("-S", "--com-server", 
-                         "communication server mode" ,true, "string", 
"Embedded");
+                         "communication server mode ( Embedded | ...)" ,
+                         true, "string", "Embedded");
     argumentParser.defArg("-D", "--debug", 
                          "debug key" ,true, "string", "");
     argumentParser.defArg("-i", "--iterations", 
@@ -228,7 +232,7 @@
   // TESTS
 
   // Debug keys
-  //setMetaheuristic.item()->addDebugKey(argumentParser.getStringValue("-D"));
+  setMetaheuristic.item()->addDebugKey(argumentParser.getStringValue("-D"));
   //setMetaheuristic.item()->addDebugKey("selectNumber");
 
   // Log
@@ -241,14 +245,13 @@
 
   if (VERBOSE)
     cout << "parameters ok, starting optimization..." << endl;
-
     
-
   // Starting the optimization
   
-  clog << "Launching " << setMetaheuristic.item()->getName() 
-       << " on " << setProblem.item()->getName() 
-       << " using " << setCommunicationClient.item()->getKey() << endl;
+  if (VERBOSE)
+    clog << "Launching " << setMetaheuristic.item()->getName() 
+        << " on " << setProblem.item()->getName() 
+        << " using " << setCommunicationClient.item()->getKey() << endl;
   
   //clog << setProblem.item()->getName() << " description:" << endl;
   //clog << setProblem.item()->getInformations() << endl;
Index: ometah/interface/ometah.hpp
diff -u ometah/interface/ometah.hpp:1.7 ometah/interface/ometah.hpp:1.8
--- ometah/interface/ometah.hpp:1.7     Fri Jun  3 10:37:32 2005
+++ ometah/interface/ometah.hpp Fri Jun  3 13:39:11 2005
@@ -1,5 +1,5 @@
 /***************************************************************************
- *  $Id: ometah.hpp,v 1.7 2005/06/03 10:37:32 jpa Exp $
+ *  $Id: ometah.hpp,v 1.8 2005/06/03 13:39:11 jpa Exp $
  *  Copyright : Université Paris 12 Val-de-Marne
  *  Author : Johann Dréo <address@hidden>
  *  Author : Jean-Philippe Aumasson <address@hidden>
@@ -40,7 +40,7 @@
 #include "../metaheuristic/itsEstimationOfDistribution.hpp"
 
 // problems
-#include "../problem/itsRosenbrock.hpp"
+#include "../problem/CEC05/itsCEC05_SSRPO_Base.hpp"
 
 // communication
 #include "../communication/itsCommunicationServer_embedded.hpp"