Commit f5cd7216 authored by HUMEAU Jéremie's avatar HUMEAU Jéremie

remove comments

parent 7a6352de
...@@ -87,3 +87,4 @@ ...@@ -87,3 +87,4 @@
-C=400 -c=400 -R=3 -Q=3 -A=15 -n=16 -N=40 -r=1 -q=0 -C=400 -c=400 -R=3 -Q=3 -A=15 -n=16 -N=40 -r=1 -q=0
-C=400 -c=400 -R=3 -Q=3 -A=15 -n=16 -N=40 -r=1 -q=0 -C=400 -c=400 -R=3 -Q=3 -A=15 -n=16 -N=40 -r=1 -q=0
-C=400 -c=400 -R=3 -Q=3 -A=15 -n=16 -N=40 -r=1 -q=0 -C=400 -c=400 -R=3 -Q=3 -A=15 -n=16 -N=40 -r=1 -q=0
-C=400 -c=400 -R=3 -Q=3 -A=15 -n=16 -N=40 -r=1 -q=0
...@@ -7,7 +7,7 @@ do ...@@ -7,7 +7,7 @@ do
do do
for maxPre in 3 for maxPre in 3
do do
for nbGen in 1000 for nbGen in 10000
do do
nbComps=400 nbComps=400
RESDIR="../results/${nbCours}_${nbComps}_${maxCbyC}_${maxPre}_${cbyTF}_${nbGen}" RESDIR="../results/${nbCours}_${nbComps}_${maxCbyC}_${maxPre}_${cbyTF}_${nbGen}"
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#SBATCH --mem=4G #SBATCH --mem=4G
#SBATCH -p defq #SBATCH -p defq
/home/jeremie.humeau/private/gitProject/csdvp-evolutionary-algorithm-optimization/build/application/ceao -G=$G -P=10 -S=$SLURM_ARRAY_TASK_ID -C=$C -c=$c -R=$R -Q=$Q -A=$A --outputfile=$O -n=$n -N=$N -r=$r -q=$q -B=$B -x=$x -X=$X -F=$F -T=10 /home/jeremie.humeau/private/gitProject/csdvp-evolutionary-algorithm-optimization/build/application/ceao -G=$G -P=100 -S=$SLURM_ARRAY_TASK_ID -C=$C -c=$c -R=$R -Q=$Q -A=$A --outputfile=$O -n=$n -N=$N -r=$r -q=$q -B=$B -x=$x -X=$X -F=$F -T=10
exit 0 exit 0
...@@ -40,22 +40,22 @@ class eoInitConstraintCSDVP: public eoInit<EOT> ...@@ -40,22 +40,22 @@ class eoInitConstraintCSDVP: public eoInit<EOT>
possibleIDbyTF[tmp[j]-pb.cfg_minimalTimeFrame()].push_back(i); possibleIDbyTF[tmp[j]-pb.cfg_minimalTimeFrame()].push_back(i);
} }
} }
for(int i=0; i<possibleIDbyTF.size(); i++){ /*for(int i=0; i<possibleIDbyTF.size(); i++){
std::cout << "Possible course in TF " << i+pb.cfg_minimalTimeFrame() << ": "; std::cout << "Possible course in TF " << i+pb.cfg_minimalTimeFrame() << ": ";
for(int j=0; j<possibleIDbyTF[i].size(); j++){ for(int j=0; j<possibleIDbyTF[i].size(); j++){
std::cout << possibleIDbyTF[i][j] << " "; std::cout << possibleIDbyTF[i][j] << " ";
} }
std::cout << std::endl; std::cout << std::endl;
} }*/
} }
virtual void operator()(EOT& chrom){ virtual void operator()(EOT& chrom){
int cpt=0; int cpt=0;
std::cout << "Enter init" << std::endl; //std::cout << "Enter init" << std::endl;
unsigned int r=eo::rng.random(possibleIDbyTF[0].size()); unsigned int r=eo::rng.random(possibleIDbyTF[0].size());
chrom.resize(0); chrom.resize(0);
chrom.push_back(possibleIDbyTF[0][r]); chrom.push_back(possibleIDbyTF[0][r]);
std::cout << "push " << possibleIDbyTF[0][r] << std::endl; //std::cout << "push " << possibleIDbyTF[0][r] << std::endl;
for(int i = 1; i < chromSize; i++){ for(int i = 1; i < chromSize; i++){
cpt=0; cpt=0;
r=eo::rng.random(possibleIDbyTF[i/sizeTF].size()); r=eo::rng.random(possibleIDbyTF[i/sizeTF].size());
......
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