[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[oMetah-devel] ometah/interface itsArgument.cpp ometah.cpp
From: |
Jean-Philippe Aumasson |
Subject: |
[oMetah-devel] ometah/interface itsArgument.cpp ometah.cpp |
Date: |
Fri, 03 Jun 2005 10:41:25 -0400 |
CVSROOT: /cvsroot/ometah
Module name: ometah
Branch:
Changes by: Jean-Philippe Aumasson <address@hidden> 05/06/03 14:41:25
Modified files:
interface : itsArgument.cpp ometah.cpp
Log message:
* minor modifs...comments, indentation...
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/interface/itsArgument.cpp.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/interface/ometah.cpp.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
Patches:
Index: ometah/interface/itsArgument.cpp
diff -u ometah/interface/itsArgument.cpp:1.12
ometah/interface/itsArgument.cpp:1.13
--- ometah/interface/itsArgument.cpp:1.12 Fri Jun 3 13:39:11 2005
+++ ometah/interface/itsArgument.cpp Fri Jun 3 14:41:25 2005
@@ -1,5 +1,5 @@
/***************************************************************************
- * $Id: itsArgument.cpp,v 1.12 2005/06/03 13:39:11 jpa Exp $
+ * $Id: itsArgument.cpp,v 1.13 2005/06/03 14:41:25 jpa Exp $
* Copyright : Université Paris 12 Val-de-Marne
* Author : Johann Dréo <address@hidden>
* Author : Jean-Philippe Aumasson <address@hidden>
@@ -125,7 +125,7 @@
// if not end of line AND next word isnt a flag
if ( (++i) < this->argv.size() && (this->argv.at(i)[0] != '-' ) )
value = this->argv.at(i);
- else { // ONLY CASE OF LAST PARAM !!
+ else {
stringstream s;
s << "Value missing for " << flagShort << endl;
throw (s.str()).c_str();
@@ -138,8 +138,7 @@
}
i++;
}
-
-
+
itsArgument newArgument(flagShort, flagLong, usage, hasValue, type, value);
arguments.push_back(newArgument);
Index: ometah/interface/ometah.cpp
diff -u ometah/interface/ometah.cpp:1.30 ometah/interface/ometah.cpp:1.31
--- ometah/interface/ometah.cpp:1.30 Fri Jun 3 13:39:11 2005
+++ ometah/interface/ometah.cpp Fri Jun 3 14:41:25 2005
@@ -1,5 +1,5 @@
/***************************************************************************
- * $Id: ometah.cpp,v 1.30 2005/06/03 13:39:11 jpa Exp $
+ * $Id: ometah.cpp,v 1.31 2005/06/03 14:41:25 jpa Exp $
* Copyright : Université Paris 12 Val-de-Marne
* Author : Johann Dréo <address@hidden>
* Author : Jean-Philippe Aumasson <address@hidden>
@@ -158,15 +158,16 @@
if (VERBOSE){
- cout << "\ngetValues :\n-----" << "\n problem: " <<
argumentParser.getStringValue("-p")
- << "\n metah: "<< argumentParser.getStringValue("-m");
- cout << "\n client: " << argumentParser.getStringValue("-C")
+ cout << "\ngetValues :"
+ << "\n problem: " << argumentParser.getStringValue("-p")
+ << "\n metah: "<< argumentParser.getStringValue("-m")
+ << "\n client: " << argumentParser.getStringValue("-C")
<< "\n server " << argumentParser.getStringValue("-S")
<< "\n debug: "<< argumentParser.getStringValue("-D")
<< "\n iterations: " << argumentParser.getIntValue("-i")
<< "\n sample size: " << argumentParser.getIntValue("-s")
<< "\n dimension: " << argumentParser.getIntValue("-d")
- << endl << endl;
+ << endl;
}
@@ -218,13 +219,10 @@
hash_map<string,string, eqstr> parameters;
setCommunicationClient.item()->initialization( parameters );
-
if (VERBOSE)
cout << "initialization communication client done" << endl;
-
-
/*
* Launch the optimization
*/