Skip to content

FIC_DK_P GA Solving
FIC_DK_P GA Solving
Commit 557f6071 authored by Alexis Lebis's avatar Alexis Lebis
1 Browse files
Options

fix stagnation value for prereq

parent 4cc8a0e0
Show whitespace changes
Inline Side-by-side
Showing with 68 additions and 16 deletions
src/model/constraints/prerequisitesConstraints.cpp
View file @ 557f6071
...@@ -272,17 +272,14 @@ std::pair<bool, double> ConstraintsPrerequisites::integrityCheck(Cursus indiv) ...@@ -272,17 +272,14 @@ std::pair<bool, double> ConstraintsPrerequisites::integrityCheck(Cursus indiv)
if(delta == 0) //if 0 -->comp not mobilized here, thus stagnation therefore decay for the jth comp if(delta == 0) //if 0 -->comp not mobilized here, thus stagnation therefore decay for the jth comp
{ {
decayClock.at(j)++; decayClock.at(j)++;
}
else
{
if(decayClock.at(j)>0) //if there is decay if(decayClock.at(j)>0) //if there is decay
{ {
decayVal = DecayEngine::defaultDecay(decayClock.at(j)); //we take the diff between decay(j) and decay(j-1) since for each stagnation we instantly repercut the decay
decayVal = DecayEngine::defaultDecay(decayClock.at(j)) - DecayEngine::defaultDecay(decayClock.at(j)-1);
decaynb++; decaynb++;
} }
//delta = compDistribyTF.at(i).at(j) - compDistribyTF.at(i-1).at(j);
decayed = compDistribyTF.at(i-1).at(j) - decayVal; decayed = compDistribyTF.at(i-1).at(j) - decayVal;
if(decayed < 0) if(decayed < 0)
...@@ -301,8 +298,37 @@ std::pair<bool, double> ConstraintsPrerequisites::integrityCheck(Cursus indiv) ...@@ -301,8 +298,37 @@ std::pair<bool, double> ConstraintsPrerequisites::integrityCheck(Cursus indiv)
compDistribyTF.at(k).at(j) = 0; compDistribyTF.at(k).at(j) = 0;
} }
} }
}
else
{
// if(decayClock.at(j)>0) //if there is decay
// {
// decayVal = DecayEngine::defaultDecay(decayClock.at(j));
// decaynb++;
// }
// //delta = compDistribyTF.at(i).at(j) - compDistribyTF.at(i-1).at(j);
// decayed = compDistribyTF.at(i-1).at(j) - decayVal;
// if(decayed < 0)
// decayed = 0;
// compDistribyTF.at(i).at(j) = delta + decayed;
// // affecting the decay to this comp in upper TFs
// if(decayed > 0)
// {
// for(int k = i+1 ; k < compDistribyTF.size(); k++)
// {
// compDistribyTF.at(k).at(j) -= decayVal;
// if(compDistribyTF.at(k).at(j) < 0)
// compDistribyTF.at(k).at(j) = 0;
// }
// }
decayClock.at(j) = 0; decayClock.at(j) = 0; //we just reset the decay counter since we found the comp at j
} }
} }
} }
...@@ -473,17 +499,14 @@ std::pair<bool, double> res; ...@@ -473,17 +499,14 @@ std::pair<bool, double> res;
if(delta == 0) //if 0 -->comp not mobilized here, thus stagnation therefore decay for the jth comp if(delta == 0) //if 0 -->comp not mobilized here, thus stagnation therefore decay for the jth comp
{ {
decayClock.at(j)++; decayClock.at(j)++;
}
else
{
if(decayClock.at(j)>0) //if there is decay if(decayClock.at(j)>0) //if there is decay
{ {
decayVal = DecayEngine::defaultDecay(decayClock.at(j)); //we take the diff between decay(j) and decay(j-1) since for each stagnation we instantly repercut the decay
decayVal = DecayEngine::defaultDecay(decayClock.at(j)) - DecayEngine::defaultDecay(decayClock.at(j)-1);
decaynb++; decaynb++;
} }
//delta = compDistribyTF.at(i).at(j) - compDistribyTF.at(i-1).at(j);
decayed = compDistribyTF.at(i-1).at(j) - decayVal; decayed = compDistribyTF.at(i-1).at(j) - decayVal;
if(decayed < 0) if(decayed < 0)
...@@ -502,8 +525,37 @@ std::pair<bool, double> res; ...@@ -502,8 +525,37 @@ std::pair<bool, double> res;
compDistribyTF.at(k).at(j) = 0; compDistribyTF.at(k).at(j) = 0;
} }
} }
}
else
{
// if(decayClock.at(j)>0) //if there is decay
// {
// decayVal = DecayEngine::defaultDecay(decayClock.at(j));
// decaynb++;
// }
// //delta = compDistribyTF.at(i).at(j) - compDistribyTF.at(i-1).at(j);
// decayed = compDistribyTF.at(i-1).at(j) - decayVal;
// if(decayed < 0)
// decayed = 0;
// compDistribyTF.at(i).at(j) = delta + decayed;
// // affecting the decay to this comp in upper TFs
// if(decayed > 0)
// {
// for(int k = i+1 ; k < compDistribyTF.size(); k++)
// {
// compDistribyTF.at(k).at(j) -= decayVal;
// if(compDistribyTF.at(k).at(j) < 0)
// compDistribyTF.at(k).at(j) = 0;
// }
// }
decayClock.at(j) = 0; decayClock.at(j) = 0; //we just reset the decay counter since we found the comp at j
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment