nojhan/paradiseo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

cleanup, docs

Browse source
This commit is contained in:
kuepper 2006-12-02 11:46:34 +00:00
commit 14b3a61ba8
1 changed files with 82 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

145
eo/src/eoVector.h
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
//-----------------------------------------------------------------------------
// eoVector.h
// (c) GeNeura Team, 2000 - EEAAX 1999 - Maarten Keijzer 2000
/*
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 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.
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
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
Contact: eodev-main@lists.sourceforge.net
Old contact: todos@geneura.ugr.es, http://geneura.ugr.es
Marc.Schoenauer@polytechnique.fr
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 $
*/
//-----------------------------------------------------------------------------
mak@dhi.dk
*/
#ifndef _eoVector_h
#define _eoVector_h
@ -34,13 +27,13 @@
#include <iterator>
#include <EO.h>
/**
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,
/** Base class for fixed length chromosomes
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>
class eoVector : public EO<FitT>, public std::vector<GeneType>
@ -69,71 +62,91 @@ public:
/// copy ctor abstracting from the FitT
template <class OtherFitnessType>
eoVector(const eoVector<OtherFitnessType, GeneType>& _vec) : std::vector<GeneType>(_vec)
{}
{}
// we can't have a Ctor from a std::vector, it would create ambiguity
// with the copy Ctor
void value(const std::vector<GeneType>& _v)
{
if (_v.size() != size()) // safety check
{
if (size()) // NOT an initial empty std::vector
std::cout << "Warning: Changing size in eoVector assignation"<<std::endl;
resize(_v.size());
}
// we can't have a Ctor from a std::vector, it would create ambiguity
// with the copy Ctor
void value(const std::vector<GeneType>& _v)
{
if (_v.size() != size()) // safety check
{
if (size()) // NOT an initial empty std::vector
std::cout << "Warning: Changing size in eoVector assignation"<<std::endl;
resize(_v.size());
}
std::copy(_v.begin(), _v.end(), begin());
invalidate();
}
std::copy(_v.begin(), _v.end(), begin());
invalidate();
}
/// to avoid conflicts between EO::operator< and std::vector<GeneType>::operator<
bool operator<(const eoVector<FitT, GeneType>& _eo) const
{
return EO<FitT>::operator<(_eo);
}
{
return EO<FitT>::operator<(_eo);
}
/// printing...
virtual void printOn(std::ostream& os) const
{
EO<FitT>::printOn(os);
os << ' ';
{
EO<FitT>::printOn(os);
os << ' ';
os << size() << ' ';
os << size() << ' ';
std::copy(begin(), end(), std::ostream_iterator<AtomType>(os, " "));
}
std::copy(begin(), end(), std::ostream_iterator<AtomType>(os, " "));
}
/// reading...
virtual void readFrom(std::istream& is)
{
EO<FitT>::readFrom(is);
unsigned sz;
is >> sz;
resize(sz);
unsigned i;
for (i = 0; i < sz; ++i)
{
AtomType atom;
is >> atom;
operator[](i) = atom;
EO<FitT>::readFrom(is);
unsigned sz;
is >> sz;
resize(sz);
unsigned i;
for (i = 0; i < sz; ++i)
{
AtomType atom;
is >> atom;
operator[](i) = atom;
}
}
}
};
/// 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>
bool operator<(const eoVector<FitT, GeneType>& _eo1, const eoVector<FitT, GeneType>& _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>
bool operator>(const eoVector<FitT, GeneType>& _eo1, const eoVector<FitT, GeneType>& _eo2)
{
return _eo1.operator>(_eo2);
}
#endif
// Local Variables:
// coding: iso-8859-1
// mode: C++
// c-file-offsets: ((c . 0))
// c-file-style: "Stroustrup"
// fill-column: 80
// End: