[oMetah-devel] ometah/interface ometah.cpp ometah.hpp

[NoJhan]

CVSROOT:        /cvsroot/ometah
Module name:    ometah
Branch:         
Changes by:     NoJhan <address@hidden> 05/06/09 13:36:36

Modified files:
        interface      : ometah.cpp ometah.hpp 

Log message:
        * simplifcation of the usage string
        * redirecting log on clog instead of cout

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/interface/ometah.cpp.diff?tr1=1.38&tr2=1.39&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/interface/ometah.hpp.diff?tr1=1.8&tr2=1.9&r1=text&r2=text

Patches:
Index: ometah/interface/ometah.cpp
diff -u ometah/interface/ometah.cpp:1.38 ometah/interface/ometah.cpp:1.39
--- ometah/interface/ometah.cpp:1.38    Thu Jun  9 13:24:56 2005
+++ ometah/interface/ometah.cpp Thu Jun  9 13:36:36 2005
@@ -1,5 +1,5 @@
 /***************************************************************************
- *  $Id: ometah.cpp,v 1.38 2005/06/09 13:24:56 nojhan Exp $
+ *  $Id: ometah.cpp,v 1.39 2005/06/09 13:36:36 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>
@@ -121,62 +121,17 @@
    * Make the usage strings
    */
   
-  int k = 0;
-  vector<string> vec =  setProblem.getKeyList();
-  vector<string>::iterator it;
-  it = vec.begin();
   stringstream problemUsage;
-  problemUsage << "problem (";
-  while ( !k ) { 
-    problemUsage << (*it);
-    if ((++it) < vec.end())
-      problemUsage << ", ";
-    else
-      k=1;
-  }
-  problemUsage << ")";
-  
-  k = 0;
-  vec = setMetaheuristic.getKeyList();
-  it = vec.begin();
+  problemUsage << "problem name (" << print(setProblem.getKeyList()) << ")";
+  
   stringstream metahUsage;
-  metahUsage << "metaheuristic (";
-  while ( !k ) { 
-    metahUsage << (*it);
-    if ((++it) < vec.end())
-      metahUsage << ", ";
-    else
-      k=1;
-  }
-  metahUsage << ")";
-
-
-  k = 0;
-  vec = setCommunicationClient.getKeyList();
-  it = vec.begin();
+  metahUsage << "metaheuristic name (" << print(setMetaheuristic.getKeyList()) 
<< ")";
+  
   stringstream clientUsage;
-  clientUsage << "communication client (";
-  while ( !k ) { 
-    clientUsage << (*it);
-    if ((++it) < vec.end())
-      clientUsage << ", ";
-    else
-      k=1;
-  }
-  clientUsage << ")";
-  k = 0;
-  vec = setCommunicationServer.getKeyList();
-  it = vec.begin();
+  clientUsage << "protocol name for client (" << 
print(setCommunicationClient.getKeyList()) << ")";
+  
   stringstream serverUsage;
-  serverUsage << "communication server (";
-  while ( !k ) { 
-    serverUsage << (*it);
-    if ((++it) < vec.end())
-      serverUsage << ", ";
-    else
-      k=1;
-  }
-  serverUsage << ")";
+  serverUsage << "protocol name for server (" << 
print(setCommunicationServer.getKeyList()) << ")";
 
 
   try {
@@ -227,7 +182,7 @@
   try {
     if (argumentParser.syntaxCorrect()){      
       if (VERBOSE)
-       cout << "syntax ok" << endl;      
+       clog << "syntax ok" << endl;      
     }
   }
   catch (const char * s) {
@@ -238,7 +193,7 @@
   
   
   if (VERBOSE){
-    cout << "\ngetValues :" 
+    clog << "\ngetValues :" 
         << "\n problem: " << argumentParser.getStringValue("-p") 
         << "\n metah: "<< argumentParser.getStringValue("-m")
         << "\n client: " << argumentParser.getStringValue("-C") 
@@ -267,7 +222,7 @@
   }
 
   if (VERBOSE)
-    cout << "items chosen" << endl;
+    clog << "items chosen" << endl;
 
 
   /*
@@ -288,7 +243,7 @@
   }
 
   if (VERBOSE)
-    cout << "links done" << endl;
+    clog << "links done" << endl;
   
     
   /*
@@ -300,7 +255,7 @@
   setCommunicationClient.item()->initialization( parameters );
 
   if (VERBOSE)
-    cout << "initialization communication client done" << endl;
+    clog << "initialization communication client done" << endl;
   
     
   /*
@@ -322,7 +277,7 @@
   setMetaheuristic.item()->setIterationsMaxNumber( 
argumentParser.getIntValue("-i") );
 
   if (VERBOSE)
-    cout << "parameters ok, starting optimization..." << endl;
+    clog << "parameters ok, starting optimization..." << endl;
     
   // Starting the optimization
   
Index: ometah/interface/ometah.hpp
diff -u ometah/interface/ometah.hpp:1.8 ometah/interface/ometah.hpp:1.9
--- ometah/interface/ometah.hpp:1.8     Fri Jun  3 13:39:11 2005
+++ ometah/interface/ometah.hpp Thu Jun  9 13:36:36 2005
@@ -1,5 +1,5 @@
 /***************************************************************************
- *  $Id: ometah.hpp,v 1.8 2005/06/03 13:39:11 jpa Exp $
+ *  $Id: ometah.hpp,v 1.9 2005/06/09 13:36:36 nojhan Exp $
  *  Copyright : Université Paris 12 Val-de-Marne
  *  Author : Johann Dréo <address@hidden>
  *  Author : Jean-Philippe Aumasson <address@hidden>
@@ -29,6 +29,7 @@
 // common stuff
 #include "../common/logic.hpp"
 #include "../common/itsSet.hpp"
+#include "../common/string.hpp"
 
 // basic classes
 #include "../metaheuristic/itsMetaheuristic.hpp"