Extreme cleanup, see src/obsolete for details

eo/src/obsolete/eoES.h

@@ -0,0 +1,164 @@
+// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
+
+//-----------------------------------------------------------------------------
+// eoESChrom.h
+// (c) GeNeura Team, 1998
+/* 
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+    Contact: todos@geneura.ugr.es, http://geneura.ugr.es
+ */
+//-----------------------------------------------------------------------------
+
+
+#ifndef _eoESCHROM_H
+#define _eoESCHROM_H
+
+// STL libraries
+#include <vector>		// For vector<>
+#include <stdexcept>
+#include <strstream>
+#include <iostream>		// for ostream
+
+// EO includes
+#include <eoVector.h>
+
+/**@name Chromosomes for evolution strategies
+Each chromosome in an evolution strategies is composed of a vector of floating point
+values plus a vector of sigmas, that are added to them during mutation
+*/ 
+//@{
+
+/**
+\class eoESValue
+
+*/
+template <class T>
+struct eoESValue
+{
+    T value;
+    
+    /**
+        The gene has a mutate member because this particular gaussian mutation 
+        is paradigmatic for an evolution strategy. 
+    */
+    void mutate(double sigma, T minimum = T(), T maximum = T())
+    {
+        value += rng.normal(0.0, sigma);
+
+        if (minimum > value)
+            value = minimum;
+        if (value > maximum)
+            value = maximum;
+    }
+};
+
+/** 
+\class eoESGene eoESGene.h es/eoESGene.h
+Each gene in an Evolution Strategies is composed of a value plus an standard
+deviation, sigma, used for mutation*/
+template <class T>
+struct eoESGene : public eoESValue<T>
+{
+    double sigma;
+
+	eoESGene( double _val = 0, double _sigma = 1.0 ): eoESValue( _val ), sigma( _sigma ) {};
+
+    /**
+        The gene has a mutate member because the sigma member implies
+        that the updating routine should use a normal distribution
+    */
+    void mutate(T minimum, T maximum)
+    {
+        mutate(sigma, minimum, maximum);
+    }
+};
+
+/// Tricky operator to avoid errors in some VC++ systems, namely VC 5.0 SP3
+bool operator < ( eoESGene _e1, eoESGene _e2 ) {
+	return _e1.val < _e2.val;
+}
+
+/// Tricky operator to avoid errors in some VC++ systems
+bool operator == ( eoESGene _e1, eoESGene _e2 ) {
+	return ( _e1.val == _e2.val ) && ( _e1.sigma == _e2.sigma ) ;
+}
+
+///
+ostream & operator << ( ostream& _s, const eoESGene& _e ) {
+	_s << _e.val << ", " << _e.sigma << " | ";
+	return _s;
+}
+
+/// Dummy >>
+istream & operator >> ( istream& _s, const eoESGene& _e ) {
+	_s >> _e.val;
+	_s >> _e.sigma;
+	return _s;
+}
+
+
+/** Basic chromosome for evolution strategies (ES), as defined by Rechenberg and
+Schwefel. Each chromosomes is composed of "genes"; each one of then is an eoESGene
+@see eoESGene
+*/
+template <typename fitT = float >
+class eoESChrom: public eoVector<eoESGene, fitT> {	
+public:
+	/// Basic ctor
+	eoESChrom( ):eoVector<eoESGene, fitT>() {};
+
+	/** Ctor using a couple of random number generators
+	@param _size Lineal length of the object
+	@param _rnd a random number generator, which returns a random value each time it´s called.
+	@param _rndS another one, for the sigma
+	*/
+	eoESChrom( unsigned _size, eoRnd<double>& _rnd, eoRnd<double>& _rndS  )
+		: eoVector<eoESGene, fitT>( _size ){ 
+		for ( iterator i = begin(); i != end(); i ++ ) {
+			i->val = _rnd();
+			i->sigma = _rndS();
+		}
+	};
+
+	/// Copy ctor
+	eoESChrom( const eoESChrom& _eoes): eoVector<eoESGene, fitT>( _eoes ) {};
+
+	/// Assignment operator
+	const eoESChrom& operator =( const eoESChrom & _eoes ) {
+		if ( this != &_eoes ){
+			eoVector<eoESGene, fitT>::operator=( _eoes );
+		}
+		return *this;
+	}
+
+	///
+	~eoESChrom() {};
+
+	/** @name Methods from eoObject
+	readFrom and printOn are directly inherited from eo1d
+	*/
+	//@{
+	/** Inherited from eoObject 
+		  @see eoObject
+	*/
+	string className() const {return "eoESChrom";};
+    //@}
+
+};
+
+//@}
+#endif
+