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

Debug some new class again

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@2555 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
verel 2011-12-08 23:31:00 +00:00
commit f22c862d1c
3 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
trunk/paradiseo-mo/src/eval/moDoubleIncrEvaluation.h
View file

@ -44,7 +44,7 @@
* The sizes of the neighborhoods are equal
*/
template<class Neighbor>
class moDoubleIncrEvaluation : public moNeighborhoodEvaluation<Neighbor>, moUpdater
class moDoubleIncrEvaluation : public moNeighborhoodEvaluation<Neighbor>, public moUpdater
{
public:
typedef typename Neighbor::EOT EOT;
@ -76,6 +76,9 @@ public:
firstEval = true;
}
virtual void operator()() {
}
/**
* Evaluation of the neighborhood
* Here nothing to do

12
trunk/paradiseo-mo/src/eval/moUBQPdoubleIncrEvaluation.h
View file

@ -62,12 +62,16 @@ public:
* @param _searchExplorer the neighborhood explorer of the local search
* @param _incrEval the incremental evaluation of the UBQP
*/
moUBQPdoubleIncrEvaluation(unsigned int _neighborhoodSize, moNeighborhoodExplorer<Neighbor> & _searchExplorer, moEval<Neighbor> & _incrEval) : moDoubleIncrEvaluation<Neighbor>(_neighborhoodSize), searchExplorer(_searchExplorer)
// moUBQPdoubleIncrEvaluation(unsigned int _neighborhoodSize, moNeighborhoodExplorer<Neighbor> & _searchExplorer, moEval<Neighbor> & _incrEval) : moDoubleIncrEvaluation<Neighbor>(_neighborhoodSize), searchExplorer(_searchExplorer)
moUBQPdoubleIncrEvaluation(unsigned int _neighborhoodSize, moUBQPSimpleIncrEval<Neighbor> & _incrEval) : moDoubleIncrEvaluation<Neighbor>(_neighborhoodSize), searchExplorer(NULL)
{
n = _incrEval.getNbVar();
Q = _incrEval.getQ();
}
void neighborhoodExplorer(moNeighborhoodExplorer<Neighbor> & _searchExplorer) {
searchExplorer = & _searchExplorer;
}
/**
* Evaluation of the neighborhood
@ -100,11 +104,11 @@ public:
}
} else {
if (searchExplorer.moveApplied()) { // compute the new fitness only when the solution has moved
if (searchExplorer->moveApplied()) { // compute the new fitness only when the solution has moved
// the currentNeighbor is the previous neighbor
// the movement is made on this neighbor
// we suppose that the neighborhood is bit string neighborhood (indexed neighbor)
unsigned iMove = searchExplorer.currentNeighbor.index();
unsigned iMove = searchExplorer->getCurrentNeighbor().index();
for(unsigned i = 0; i < n; i++) {
if (i == iMove)
@ -202,7 +206,7 @@ private:
int ** Q;
/** The search explorer of the local search */
moNeighborhoodExplorer<Neighbor> & searchExplorer;
moNeighborhoodExplorer<Neighbor> * searchExplorer;
};
#endif

8
trunk/paradiseo-mo/src/explorer/moNeighborhoodExplorer.h
View file

@ -125,6 +125,14 @@ public:
isMoved=_isMoved;
}
/**
* Getter of the current neighbor
* @return current neighbor
*/
Neighbor & getCurrentNeighbor() {
return currentNeighbor;
}
protected:
// default class for the empty constructor
moDummyNeighborhood<Neighbor> dummyNeighborhood;