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

Package have been updated according to the tests under Windows

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1078 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
jboisson 2008-03-05 15:55:41 +00:00
commit ae4f880827
18 changed files with 83 additions and 160 deletions
Download patch file Download diff file Expand all files Collapse all files

10
trunk/paradiseo-mo/tutorial/examples/function/deviation_next.cpp
View file

@ -40,21 +40,21 @@ DeviationNext::DeviationNext(double _bound, double _step): bound(_bound), step(_
{
if(bound<0.0)
{
std::cout << "[affectation_next.cpp][DeviationNext]: bound is negative, " << bound << " is tranformed to ";
std::cout << "[deviation_next.cpp][DeviationNext]: bound is negative, " << bound << " is tranformed to ";
bound=-bound;
std::cout << bound << "." << std::endl;
}
if(step<0.0)
{
std::cout << "[affectation_next.cpp][DeviationNext]: step is negative, " << step << " is tranformed to ";
std::cout << "[deviation_next.cpp][DeviationNext]: step is negative, " << step << " is tranformed to ";
step=-step;
std::cout << step << "." << std::endl;
}
if(step>bound)
{
std::cout << "[affectation_next.cpp][DeviationNext]: step is higher than bound, " << step << " is tranformed to ";
std::cout << "[deviation_next.cpp][DeviationNext]: step is higher than bound, " << step << " is tranformed to ";
step = bound / 2;
std::cout << step << "." << std::endl;
}
@ -71,12 +71,12 @@ bool DeviationNext::operator () (Deviation & _move, const Affectation & _affecta
//std::cout << "deltaX1 = " << deltaX1 << ", deltaX2 = " << deltaX2 << std::endl;
if( (deltaX1>=bound) && (deltaX2)>=bound )
if( (deltaX1 >= bound) && (deltaX2 > bound) )
{
return false;
}
if(deltaX2 >= bound)
if(deltaX2 > bound)
{
deltaX1+=step;
deltaX2=-bound;