3a9b5a0e7e
Changed the signature of eoMon, eoBin and eoQuadOp to return a bool, without invalidating fitness. Added a set of invalidators to take over that job (see for instance eoSGA and eoSGATransform how this can transparantly used) Derived eoState from eoFunctorStore (for convenience, from a design perspective this may sound wrong) Added a wrap_op function that does the wrapping for you (see eoOpContainer how this made this functor exceedingly less hairy). Checked all the tests removed the eoGeneric*Op family (not needed anymore) and of course changed all the operators to reflect the change (and found a few that didn't invalidate the fitness, thus really pointing out the advantage of the current approach)
66 lines
2.1 KiB
C++
66 lines
2.1 KiB
C++
// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
|
|
|
|
//-----------------------------------------------------------------------------
|
|
// eoFunctorStore.h
|
|
// (c) Maarten Keijzer 2000, GeNeura Team, 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 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
|
|
Marc.Schoenauer@polytechnique.fr
|
|
mak@dhi.dk
|
|
*/
|
|
//-----------------------------------------------------------------------------
|
|
|
|
#ifndef _eoFunctorStore_h
|
|
#define _eoFunctorStore_h
|
|
|
|
#include <vector>
|
|
|
|
class eoFunctorBase;
|
|
|
|
/**
|
|
eoFunctorStore is a class that stores functors that are allocated on the
|
|
heap. This class can be used in factories to store allocated memory for
|
|
dynamically created functors.
|
|
*/
|
|
class eoFunctorStore
|
|
{
|
|
public :
|
|
|
|
eoFunctorStore() {}
|
|
|
|
~eoFunctorStore();
|
|
|
|
/// Add an eoFunctorBase to the store
|
|
template <class Functor>
|
|
Functor& storeFunctor(Functor* r)
|
|
{
|
|
// If the compiler complains about the following line, check if you really are giving it a pointer to an eoFunctorBase derived object
|
|
vec.push_back(r);
|
|
return *r;
|
|
}
|
|
|
|
private :
|
|
|
|
/// no copying allowed
|
|
eoFunctorStore(const eoFunctorStore&);
|
|
|
|
/// no copying allowed
|
|
eoFunctorStore operator=(const eoFunctorStore&);
|
|
std::vector<eoFunctorBase*> vec;
|
|
};
|
|
|
|
#endif
|