Changeset 3572 in Sophya for trunk/SophyaLib/NTools/simplex.cc

Timestamp:

Feb 7, 2009, 10:50:34 PM (17 years ago)

Author:

cmv

Message:

char* -> const char* pour regler les problemes de deprecated string const... + comparaison unsigned signed + suppression EVOL_PLANCK rz+cmv 07/02/2009

File:

• trunk/SophyaLib/NTools/simplex.cc (modified) (2 diffs)

trunk/SophyaLib/NTools/simplex.cc

@@ -366 +366 @@
   int ilo, ihi, inhi;
   int move = 0;
-  char* smov[6] = { "None", "Reflection", "ReflecExpand", "ContractHigh", "ContractLow", "ExpandHigh" };
+  const char* smov[6] = { "None", "Reflection", "ReflecExpand", "ContractHigh", "ContractLow", "ExpandHigh" };
   int movcnt[6] = {0,0,0,0,0,0};
 
@@ -511 +511 @@
 int MinZSimplex::StopReason(string& s)
 {
-  char* sr[5] = { "NoConverg, MaxIterReached", "OK, fm<Tol0", "OK, Df/f<Tol1", 
+  const char* sr[5] = { "NoConverg, MaxIterReached", "OK, fm<Tol0", "OK, Df/f<Tol1", 
                   "OK, [Df/f max]Iter<Tol2" "Error - Wrong StopReason" };
   int stop = mStop;