Update for gcc-4.3 compatibility

eo/app/gprop/gprop.cpp

@@ -35,7 +35,7 @@ eoValueParam<unsigned> hiddenp(0, "hidden", "number of neurons in hidden layer",
 //-----------------------------------------------------------------------------
 
 void arg(int argc, char** argv);
-void load_file(mlp::set& s, const string& s);
+void load_file(mlp::set& s1, const string& s2);
 void ga();
 
 //-----------------------------------------------------------------------------

eo/app/gprop/gprop.h

@@ -52,12 +52,12 @@ struct phenotype
 
   friend bool operator<(const phenotype& a, const phenotype& b)
   {
-    return a.val_ok < b.val_ok || !(b.val_ok < a.val_ok) && b.mse_error < a.mse_error;
+      return (a.val_ok < b.val_ok) || (!(b.val_ok < a.val_ok)) && (b.mse_error < a.mse_error);
   }
 
   friend bool operator==(const phenotype& a, const phenotype& b)
   {
-    return a.val_ok == b.val_ok && b.mse_error == a.mse_error;
+      return (a.val_ok == b.val_ok) && (b.mse_error == a.mse_error);
   }
 
   friend bool operator>=(const phenotype& a, const phenotype& b)

eo/src/eoFitContinue.h

@@ -39,13 +39,12 @@ public:
     /// Define Fitness
     typedef typename EOT::Fitness FitnessType;
 
-	/// Ctor
+    /// Ctor
     eoFitContinue( const FitnessType _maximum)
-		: eoContinue<EOT> (), maximum( _maximum ) {};
+        : eoContinue<EOT> (), maximum( _maximum ) {};
 
-	/** Returns false when a fitness criterium is
+    /** Returns false when a fitness criterium is reached. Assumes pop is not sorted! */
-	* reached. Assumes pop is not sorted! */
+    virtual bool operator() ( const eoPop<EOT>& _pop )
-	virtual bool operator() ( const eoPop<EOT>& _pop ) 
     {
     FitnessType bestCurrentFitness = _pop.nth_element_fitness(0);
     if (bestCurrentFitness >= maximum)

eo/src/eoInitializer.h

@@ -68,7 +68,7 @@ public:
         eoParticleBestInit <POT> &_initBest,
         eoTopology <POT> &_topology,
         eoPop < POT > &_pop
-    ) : proc(_proc), procPara(dummyEval), initVelo(_initVelo), initBest(_initBest), topology(_topology), pop(_pop)
+    ) : proc(_proc), initVelo(_initVelo), procPara(dummyEval), initBest(_initBest), topology(_topology), pop(_pop)
     {}
 
     //!	Constructor for parallel evaluation

eo/src/eoTwoOptMutation.h

@@ -1,29 +1,27 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
 //-----------------------------------------------------------------------------
 // eoTwoOptMutation.h
 // (c) GeNeura Team, 2000 - EEAAX 2000 - Maarten Keijzer 2000
 // (c) INRIA Futurs - Dolphin Team - Thomas Legrand 2007
 /*
-    This library is free software; you can redistribute it and/or
+This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
+modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
+License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
+version 2 of the License, or (at your option) any later version.
 
-    This library is distributed in the hope that it will be useful,
+This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
+but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
+Lesser General Public License for more details.
 
-    You should have received a copy of the GNU Lesser General Public
+You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
+License along with this library; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-    Contact: todos@geneura.ugr.es, http://geneura.ugr.es
+Contact: todos@geneura.ugr.es, http://geneura.ugr.es
-    		 thomas.legrand@lifl.fr
+thomas.legrand@lifl.fr
-             Marc.Schoenauer@polytechnique.fr
+Marc.Schoenauer@polytechnique.fr
-             mak@dhi.dk
+mak@dhi.dk
- */
+*/
 //-----------------------------------------------------------------------------
 
 #ifndef eoTwoOptMutation_h
@@ -33,43 +31,39 @@
 
 
 /**
- * Especially designed for combinatorial problem such as the TSP.
+* Especially designed for combinatorial problem such as the TSP.
- */
+*/
 template<class EOT> class eoTwoOptMutation: public eoMonOp<EOT>
 {
- public:
+public:
 
-  typedef typename EOT::AtomType GeneType;
+    typedef typename EOT::AtomType GeneType;
 
-  /// CTor
+    /// CTor
-  eoTwoOptMutation(){}
+    eoTwoOptMutation(){}
 
+    /// The class name.
+    virtual std::string className() const { return "eoTwoOptMutation"; }
 
-  /// The class name.
+    /**
-  virtual std::string className() const { return "eoTwoOptMutation"; }
+    *
+    * @param eo The cromosome which is going to be changed.
+    */
+    bool operator()(EOT& _eo) {
+        // generate two different indices
+        unsigned i(eo::rng.random(_eo.size()));
+        unsigned j;
+        do {
+            j = eo::rng.random(_eo.size());
+        } while(i == j);
+        unsigned from(std::min(i,j));
+        unsigned to(std::max(i,j));
+        unsigned idx((to - from)/2);
 
-
+        // inverse between from and to
-  /**
+        for(unsigned k = 0; k <= idx; ++k)
-   * 
+            std::swap(_eo[from+k],_eo[to-k]);
-   * @param eo The cromosome which is going to be changed.
+        return true;
-   */
-  bool operator()(EOT& _eo)
-    {    	
-      unsigned i,j,from,to;
-       
-      // generate two different indices
-      i=eo::rng.random(_eo.size());
-      do j = eo::rng.random(_eo.size()); while (i == j);
-     	
-      from=std::min(i,j);
-      to=std::max(i,j); 
-	  int idx =(to-from)/2;
-	  
-	  // inverse between from and to
-      for(unsigned int k = 0; k <= idx ;k++)
-      	std::swap(_eo[from+k],_eo[to-k]);
-
-      return true;
     }
 
 };
@@ -78,3 +72,11 @@ template<class EOT> class eoTwoOptMutation: public eoMonOp<EOT>
 //-----------------------------------------------------------------------------
 #endif
 
+
+// Local Variables:
+// coding: iso-8859-1
+// mode: C++
+// c-file-offsets: ((c . 0))
+// c-file-style: "Stroustrup"
+// fill-column: 80
+// End:

eo/src/ga/eoBit.h

@@ -35,9 +35,10 @@
 
 //-----------------------------------------------------------------------------
 
-#include <iostream>    // std::ostream, std::istream
+#include <algorithm>
-#include <functional>  // bind2nd
+#include <functional>
-#include <string>      // std::string
+#include <iostream>
+#include <string>
 
 #include "eoVector.h"
 
@@ -102,7 +103,7 @@ public:
 	{
 	  resize(bits.size());
 	  std::transform(bits.begin(), bits.end(), begin(),
-		    std::bind2nd(std::equal_to<char>(), '1'));
+                         std::bind2nd(std::equal_to<char>(), '1'));
 	}
     }
 };
@@ -113,6 +114,9 @@ public:
 
 
 // Local Variables:
+// coding: iso-8859-1
 // mode: C++
+// c-file-offsets: ((c . 0))
 // c-file-style: "Stroustrup"
+// fill-column: 80
 // End:

eo/src/other/eoExternalEO.h

@@ -41,7 +41,7 @@ class eoExternalEO : public EO<Fit>, virtual public External
 public :
 
     eoExternalEO()
-        : EO<Fit>(), External()
+        : External(), EO<Fit>()
         {}
 
     /** Init externalEo with the struct itself and set fitness to zero */

eo/src/utils/eoFileSnapshot.h

@@ -1,5 +1,3 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
 //-----------------------------------------------------------------------------
 // eoFileSnapshot.h
 // (c) Marc Schoenauer, Maarten Keijzer and GeNeura Team, 2001
@@ -27,8 +25,10 @@
 #ifndef _eoFileSnapshot_h
 #define _eoFileSnapshot_h
 
-#include <string>
+#include <cstdlib>
 #include <fstream>
+#include <string>
+
 #include <utils/eoParam.h>
 #include <utils/eoMonitor.h>
 #include <eoObject.h>
@@ -188,3 +188,12 @@ private :
 };
 
 #endif
+
+
+// Local Variables:
+// coding: iso-8859-1
+// mode: C++
+// c-file-offsets: ((c . 0))
+// c-file-style: "Stroustrup"
+// fill-column: 80
+// End:

eo/src/utils/eoGnuplot1DSnapshot.cpp

@@ -11,7 +11,6 @@ eoMonitor& eoGnuplot1DSnapshot::operator()()
     // update file using the eoFileMonitor method
     eoFileSnapshot::operator()();
 #ifdef HAVE_GNUPLOT
-
     // sends plot order to gnuplot
     std::ostringstream os;
     os << "set title 'Gen. " << getCounter() << "'; plot '"
@@ -25,8 +24,10 @@ eoMonitor& eoGnuplot1DSnapshot::operator()()
 }
 
 
-
 // Local Variables:
+// coding: iso-8859-1
+// mode: C++
+// c-file-offsets: ((c . 0))
 // c-file-style: "Stroustrup"
 // fill-column: 80
 // End:

eo/src/utils/make_help.cpp

@@ -1,5 +1,3 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
 //-----------------------------------------------------------------------------
 // make_help.h
 // (c) Maarten Keijzer, Marc Schoenauer and GeNeura Team, 2001
@@ -28,10 +26,12 @@
 #pragma warning(disable:4786)
 #endif
 
-#include <utils/eoParser.h>
+#include <cstdlib>
 #include <fstream>
 #include <stdexcept>
 
+#include <utils/eoParser.h>
+
 using namespace std;
 
 /** Generation of the status file, and output of the help message if needed
@@ -107,3 +107,12 @@ bool testDirRes(std::string _dirName, bool _erase=true)
   throw runtime_error(s);
   return true;
 }
+
+
+// Local Variables:
+// coding: iso-8859-1
+// mode: C++
+// c-file-offsets: ((c . 0))
+// c-file-style: "Stroustrup"
+// fill-column: 80
+// End:

eo/test/t-eoSelect.cpp

@@ -1,13 +1,11 @@
-//-----------------------------------------------------------------------------
-
 // to avoid long name warnings
 #ifdef _MSC_VER
 #pragma warning(disable:4786)
 #endif
 
-#include <stdexcept>  // runtime_error
+#include <cstring>
+#include <stdexcept>
 
-// general
 #include <eo>
 
 //-----------------------------------------------------------------------------