cleanup, docs

This commit is contained in:
kuepper 2006-12-02 11:46:34 +00:00
commit 14b3a61ba8

View file

@ -1,31 +1,24 @@
// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- /* (C) GeNeura Team, 2000 - EEAAX 1999 - Maarten Keijzer 2000
//----------------------------------------------------------------------------- This library is free software; you can redistribute it and/or
// eoVector.h modify it under the terms of the GNU Lesser General Public
// (c) GeNeura Team, 2000 - EEAAX 1999 - Maarten Keijzer 2000 License as published by the Free Software Foundation; either
/* version 2 of the License, or (at your option) any later version.
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, 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: eodev-main@lists.sourceforge.net
Old contact: todos@geneura.ugr.es, http://geneura.ugr.es
Marc.Schoenauer@polytechnique.fr Marc.Schoenauer@polytechnique.fr
mak@dhi.dk mak@dhi.dk
*/
CVS Info: $Date: 2006-12-02 11:36:29 $ $Header: /home/nojhan/dev/eodev/eodev_cvs/eo/src/eoVector.h,v 1.18 2006-12-02 11:36:29 kuepper Exp $ $Author: kuepper $
*/
//-----------------------------------------------------------------------------
#ifndef _eoVector_h #ifndef _eoVector_h
#define _eoVector_h #define _eoVector_h
@ -34,13 +27,13 @@
#include <iterator> #include <iterator>
#include <EO.h> #include <EO.h>
/** /** Base class for fixed length chromosomes
Base class for fixed length chromosomes, just derives from EO and std::vector and
redirects the smaller than operator to EO (fitness based comparison). GeneType
must have the following methods: void ctor (needed for the std::vector<>), copy ctor,
It just derives from EO and std::vector and redirects the smaller than
operator to EO (fitness based comparison).
GeneType must have the following methods: void ctor (needed for the
std::vector<>), copy ctor,
*/ */
template <class FitT, class GeneType> template <class FitT, class GeneType>
class eoVector : public EO<FitT>, public std::vector<GeneType> class eoVector : public EO<FitT>, public std::vector<GeneType>
@ -123,17 +116,37 @@ public:
} }
}; };
/// to avoid conflicts between EO::operator< and std::vector<double>::operator< /** Less than
This is impemented to avoid conflicts between EO::operator< and
std::vector<GeneType>::operator<
*/
template <class FitT, class GeneType> template <class FitT, class GeneType>
bool operator<(const eoVector<FitT, GeneType>& _eo1, const eoVector<FitT, GeneType>& _eo2) bool operator<(const eoVector<FitT, GeneType>& _eo1, const eoVector<FitT, GeneType>& _eo2)
{ {
return _eo1.operator<(_eo2); return _eo1.operator<(_eo2);
} }
/** Greater than
This is impemented to avoid conflicts between EO::operator> and
std::vector<GeneType>::operator>
*/
template <class FitT, class GeneType> template <class FitT, class GeneType>
bool operator>(const eoVector<FitT, GeneType>& _eo1, const eoVector<FitT, GeneType>& _eo2) bool operator>(const eoVector<FitT, GeneType>& _eo1, const eoVector<FitT, GeneType>& _eo2)
{ {
return _eo1.operator>(_eo2); return _eo1.operator>(_eo2);
} }
#endif #endif
// Local Variables:
// coding: iso-8859-1
// mode: C++
// c-file-offsets: ((c . 0))
// c-file-style: "Stroustrup"
// fill-column: 80
// End: