some MO types replacement

This commit is contained in:
Johann Dreo 2010-09-04 23:07:37 +02:00
commit 5dc8a1a8fe
3 changed files with 16 additions and 6 deletions

View file

@ -75,7 +75,9 @@ public:
_sa_continue(sa_continue),
_cooling_schedule(cooling_schedule),
_initial_temperature(initial_temperature),
_replacor(replacor)
_replacor(replacor),
_dummy_neighbor()
{}
//! function that launches the EDASA algorithm.
@ -124,7 +126,7 @@ public:
//-------------------------------------------------------------
_sa_continue.init();
_sa_continue.init( _dummy_neighbor );
//-------------------------------------------------------------
@ -256,6 +258,7 @@ private:
//-------------------------------------------------------------
moDummyNeighbor<EOT> _dummy_neighbor;
};
#endif // !_doEDASA_h

View file

@ -11,6 +11,7 @@
#include <eoFunctor.h>
#include "doBounder.h"
#include "doBounderNo.h"
template < typename D >
class doSampler : public eoUF< D&, typename D::EOType >
@ -22,6 +23,10 @@ public:
: _bounder(bounder)
{}
doSampler()
: _bounder( _dummy_bounder )
{}
// virtual EOType operator()( D& ) = 0 (provided by eoUF< A1, R >)
virtual EOType sample( D& ) = 0;
@ -60,6 +65,8 @@ public:
private:
//! Bounder functor
doBounder< EOType > & _bounder;
doBounderNo<EOType> _dummy_bounder;
};
#endif // !_doSampler_h