Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision

Target

Select target project
  • francois.hamonic/landscape_opt_networks_submission
1 result
Select Git revision
Show changes
Expand all Show whitespace changes
Inline Side-by-side
Showing
with 26367 additions and 173218 deletions
datas/worst_cases/decremental/dec_worst_case.eps 0 → 100755
View file @ d45b5e60
%!PS-Adobe-2.0 EPSF-2.0
%%Title: dec_worst_case
%%Creator: LEMON, graphToEps()
%%CreationDate: Sat Dec 5 17:45:14 2020
%%BoundingBox: -77 -71 77 71
%%EndComments
/lb { setlinewidth setrgbcolor newpath moveto
4 2 roll 1 index 1 index curveto stroke } bind def
/l { setlinewidth setrgbcolor newpath moveto lineto stroke } bind def
/c { newpath dup 3 index add 2 index moveto 0 360 arc closepath } bind def
/sq { newpath 2 index 1 index add 2 index 2 index add moveto
2 index 1 index sub 2 index 2 index add lineto
2 index 1 index sub 2 index 2 index sub lineto
2 index 1 index add 2 index 2 index sub lineto
closepath pop pop pop} bind def
/di { newpath 2 index 1 index add 2 index moveto
2 index 2 index 2 index add lineto
2 index 1 index sub 2 index lineto
2 index 2 index 2 index sub lineto
closepath pop pop pop} bind def
/nc { 0 0 0 setrgbcolor 5 index 5 index 5 index c fill
setrgbcolor 1.1 div c fill
} bind def
/nsq { 0 0 0 setrgbcolor 5 index 5 index 5 index sq fill
setrgbcolor 1.1 div sq fill
} bind def
/ndi { 0 0 0 setrgbcolor 5 index 5 index 5 index di fill
setrgbcolor 1.1 div di fill
} bind def
/nfemale { 0 0 0 setrgbcolor 3 index 0.0909091 1.5 mul mul setlinewidth
newpath 5 index 5 index moveto 5 index 5 index 5 index 3.01 mul sub
lineto 5 index 4 index .7 mul sub 5 index 5 index 2.2 mul sub moveto
5 index 4 index .7 mul add 5 index 5 index 2.2 mul sub lineto stroke
5 index 5 index 5 index c fill
setrgbcolor 1.1 div c fill
} bind def
/nmale {
0 0 0 setrgbcolor 3 index 0.0909091 1.5 mul mul setlinewidth
newpath 5 index 5 index moveto
5 index 4 index 1 mul 1.5 mul add
5 index 5 index 3 sqrt 1.5 mul mul add
1 index 1 index lineto
1 index 1 index 7 index sub moveto
1 index 1 index lineto
exch 5 index 3 sqrt .5 mul mul sub exch 5 index .5 mul sub lineto
stroke
5 index 5 index 5 index c fill
setrgbcolor 1.1 div c fill
} bind def
/arrl 0.2 def
/arrw 0.0524974 def
/lrl { 2 index mul exch 2 index mul exch rlineto pop} bind def
/arr { setrgbcolor /y1 exch def /x1 exch def /dy exch def /dx exch def
/w exch def /len exch def
newpath x1 dy w 2 div mul add y1 dx w 2 div mul sub moveto
len w sub arrl sub dx dy lrl
arrw dy dx neg lrl
dx arrl w add mul dy w 2 div arrw add mul sub
dy arrl w add mul dx w 2 div arrw add mul add rlineto
dx arrl w add mul neg dy w 2 div arrw add mul sub
dy arrl w add mul neg dx w 2 div arrw add mul add rlineto
arrw dy dx neg lrl
len w sub arrl sub neg dx dy lrl
closepath fill } bind def
/cshow { 2 index 2 index moveto dup stringwidth pop
neg 2 div fosi .35 mul neg rmoveto show pop pop} def
gsave
10 dup scale
%Arcs:
gsave
4 0 5 0 1 0 0 0.0874956 l
4 0 3 0 1 0 0 0.0874956 l
3 0 4 0 1 0 0 0.0874956 l
3 0 2 0 1 0 0 0.0874956 l
2 0 3 0 1 0 0 0.0874956 l
2 0 1 0 1 0 0 0.0874956 l
1 0 2 0 1 0 0 0.0874956 l
1 0 0 0 1 0 0 0.0874956 l
2.5 -4.33013 0 0 1 0 0 0.0874956 l
-2.5 -4.33013 0 0 1 0 0 0.0874956 l
-5 6.12323e-16 0 0 1 0 0 0.0874956 l
-2.5 4.33013 0 0 1 0 0 0.0874956 l
2.5 4.33013 0 0 1 0 0 0.0874956 l
5 0 4 0 1 0 0 0.0874956 l
0 0 1 0 1 0 0 0.0874956 l
0 0 2.5 -4.33013 1 0 0 0.0874956 l
0 0 -2.5 -4.33013 1 0 0 0.0874956 l
0 0 -5 6.12323e-16 1 0 0 0.0874956 l
0 0 -2.5 4.33013 1 0 0 0.0874956 l
0 0 2.5 4.33013 1 0 0 0.0874956 l
grestore
%Nodes:
gsave
4 0 0.138164 0 0 0 nc
3 0 0.138164 0 0 0 nc
2 0 0.138164 0 0 0 nc
1 0 0.138164 0 0 0 nc
2.5 -4.33013 0.699965 1 1 1 nc
-2.5 -4.33013 0.699965 1 1 1 nc
-5 6.12323e-16 0.699965 1 1 1 nc
-2.5 4.33013 0.699965 1 1 1 nc
2.5 4.33013 0.699965 1 1 1 nc
5 0 0.7 1 1 1 nc
0 0 0.699965 1 1 1 nc
grestore
%Node texts:
gsave
/fosi 0.749963 def
(Helvetica) findfont fosi scalefont setfont
0 0 0 setrgbcolor
4 0 () cshow
0 0 0 setrgbcolor
3 0 () cshow
0 0 0 setrgbcolor
2 0 () cshow
0 0 0 setrgbcolor
1 0 () cshow
0 0 0 setrgbcolor
2.5 -4.33013 (6) cshow
0 0 0 setrgbcolor
-2.5 -4.33013 (5) cshow
0 0 0 setrgbcolor
-5 6.12323e-16 (4) cshow
0 0 0 setrgbcolor
-2.5 4.33013 (3) cshow
0 0 0 setrgbcolor
2.5 4.33013 (2) cshow
0 0 0 setrgbcolor
5 0 (1) cshow
0 0 0 setrgbcolor
0 0 (0) cshow
grestore
grestore
showpage
datas/worst_cases/decremental/dec_worst_case.index 0 → 100755
View file @ d45b5e60
patches_file,links_file
data/worst_cases/decremental/dec_worst_case.patches,data/worst_cases/decremental/dec_worst_case.links
datas/worst_cases/decremental/dec_worst_case.links 0 → 100755
View file @ d45b5e60
from,to,probability
0,2,0
2,0,0
0,3,0
3,0,0
0,4,0
4,0,0
0,5,0
5,0,0
0,6,0
6,0,0
0,7,0
7,0,0
7,8,0
8,7,0
8,9,0
9,8,0
9,10,0
10,9,0
10,1,0
1,10,0
datas/worst_cases/decremental/dec_worst_case.patches 0 → 100755
View file @ d45b5e60
id,weight,x,y
0,1,0,0
1,1.0001,5.0,0.0
2,1,2.5,4.33012701892
3,1,-2.5,4.33012701892
4,1,-5.0,6.12323399574e-16
5,1,-2.5,-4.33012701892
6,1,2.5,-4.33012701892
7,0,1,0
8,0,2,0
9,0,3,0
10,0,4,0
datas/worst_cases/inc worst case-opt ratio vs budget.pdf 0 → 100755
View file @ d45b5e60
File added
datas/worst_cases/incremental/inc worst case-opt ratio vs budget.pdf 0 → 100755
View file @ d45b5e60
File added
datas/worst_cases/incremental/inc_worst_case.eps 0 → 100755
View file @ d45b5e60
%!PS-Adobe-2.0 EPSF-2.0
%%Title: inc_worst_case
%%Creator: LEMON, graphToEps()
%%CreationDate: Sat Dec 5 17:45:10 2020
%%BoundingBox: -290 -290 290 290
%%EndComments
/lb { setlinewidth setrgbcolor newpath moveto
4 2 roll 1 index 1 index curveto stroke } bind def
/l { setlinewidth setrgbcolor newpath moveto lineto stroke } bind def
/c { newpath dup 3 index add 2 index moveto 0 360 arc closepath } bind def
/sq { newpath 2 index 1 index add 2 index 2 index add moveto
2 index 1 index sub 2 index 2 index add lineto
2 index 1 index sub 2 index 2 index sub lineto
2 index 1 index add 2 index 2 index sub lineto
closepath pop pop pop} bind def
/di { newpath 2 index 1 index add 2 index moveto
2 index 2 index 2 index add lineto
2 index 1 index sub 2 index lineto
2 index 2 index 2 index sub lineto
closepath pop pop pop} bind def
/nc { 0 0 0 setrgbcolor 5 index 5 index 5 index c fill
setrgbcolor 1.1 div c fill
} bind def
/nsq { 0 0 0 setrgbcolor 5 index 5 index 5 index sq fill
setrgbcolor 1.1 div sq fill
} bind def
/ndi { 0 0 0 setrgbcolor 5 index 5 index 5 index di fill
setrgbcolor 1.1 div di fill
} bind def
/nfemale { 0 0 0 setrgbcolor 3 index 0.0909091 1.5 mul mul setlinewidth
newpath 5 index 5 index moveto 5 index 5 index 5 index 3.01 mul sub
lineto 5 index 4 index .7 mul sub 5 index 5 index 2.2 mul sub moveto
5 index 4 index .7 mul add 5 index 5 index 2.2 mul sub lineto stroke
5 index 5 index 5 index c fill
setrgbcolor 1.1 div c fill
} bind def
/nmale {
0 0 0 setrgbcolor 3 index 0.0909091 1.5 mul mul setlinewidth
newpath 5 index 5 index moveto
5 index 4 index 1 mul 1.5 mul add
5 index 5 index 3 sqrt 1.5 mul mul add
1 index 1 index lineto
1 index 1 index 7 index sub moveto
1 index 1 index lineto
exch 5 index 3 sqrt .5 mul mul sub exch 5 index .5 mul sub lineto
stroke
5 index 5 index 5 index c fill
setrgbcolor 1.1 div c fill
} bind def
/arrl 0.2 def
/arrw 0.000519802 def
/lrl { 2 index mul exch 2 index mul exch rlineto pop} bind def
/arr { setrgbcolor /y1 exch def /x1 exch def /dy exch def /dx exch def
/w exch def /len exch def
newpath x1 dy w 2 div mul add y1 dx w 2 div mul sub moveto
len w sub arrl sub dx dy lrl
arrw dy dx neg lrl
dx arrl w add mul dy w 2 div arrw add mul sub
dy arrl w add mul dx w 2 div arrw add mul add rlineto
dx arrl w add mul neg dy w 2 div arrw add mul sub
dy arrl w add mul neg dx w 2 div arrw add mul add rlineto
arrw dy dx neg lrl
len w sub arrl sub neg dx dy lrl
closepath fill } bind def
/cshow { 2 index 2 index moveto dup stringwidth pop
neg 2 div fosi .35 mul neg rmoveto show pop pop} def
gsave
100 dup scale
%Arcs:
gsave
-1.83697e-16 -1 -3.67394e-16 -2 1 0 0 0.000866337 l
-1.83697e-16 -1 0 0 1 0 0 0.000866337 l
-1 1.22465e-16 -2 2.44929e-16 1 0 0 0.000866337 l
-1 1.22465e-16 0 0 1 0 0 0.000866337 l
6.12323e-17 1 1.22465e-16 2 1 0 0 0.000866337 l
6.12323e-17 1 0 0 1 0 0 0.000866337 l
1 0 2 0 1 0 0 0.000866337 l
1 0 0 0 1 0 0 0.000866337 l
0.707107 -0.707107 0 0 1 0 0 0.000866337 l
-3.67394e-16 -2 -1.83697e-16 -1 1 0 0 0.000866337 l
-0.707107 -0.707107 0 0 1 0 0 0.000866337 l
-2 2.44929e-16 -1 1.22465e-16 1 0 0 0.000866337 l
-0.707107 0.707107 0 0 1 0 0 0.000866337 l
1.22465e-16 2 6.12323e-17 1 1 0 0 0.000866337 l
0.707107 0.707107 0 0 1 0 0 0.000866337 l
2 0 1 0 1 0 0 0.000866337 l
0 0 -1.83697e-16 -1 1 0 0 0.000866337 l
0 0 -1 1.22465e-16 1 0 0 0.000866337 l
0 0 6.12323e-17 1 1 0 0 0.000866337 l
0 0 1 0 1 0 0 0.000866337 l
0 0 0.707107 -0.707107 1 0 0 0.000866337 l
0 0 -0.707107 -0.707107 1 0 0 0.000866337 l
0 0 -0.707107 0.707107 1 0 0 0.000866337 l
0 0 0.707107 0.707107 1 0 0 0.000866337 l
grestore
%Nodes:
gsave
-1.83697e-16 -1 0.00135455 0 0 0 nc
-1 1.22465e-16 0.00135455 0 0 0 nc
6.12323e-17 1 0.00135455 0 0 0 nc
1 0 0.00135455 0 0 0 nc
0.707107 -0.707107 0.00693069 1 1 1 nc
-3.67394e-16 -2 0.693069 1 1 1 nc
-0.707107 -0.707107 0.00693069 1 1 1 nc
-2 2.44929e-16 0.693069 1 1 1 nc
-0.707107 0.707107 0.00693069 1 1 1 nc
1.22465e-16 2 0.693069 1 1 1 nc
0.707107 0.707107 0.00693069 1 1 1 nc
2 0 0.693069 1 1 1 nc
0 0 0.693069 1 1 1 nc
grestore
%Node texts:
gsave
/fosi 0.00742574 def
(Helvetica) findfont fosi scalefont setfont
0 0 0 setrgbcolor
-1.83697e-16 -1 () cshow
0 0 0 setrgbcolor
-1 1.22465e-16 () cshow
0 0 0 setrgbcolor
6.12323e-17 1 () cshow
0 0 0 setrgbcolor
1 0 () cshow
0 0 0 setrgbcolor
0.707107 -0.707107 (8) cshow
0 0 0 setrgbcolor
-3.67394e-16 -2 (7) cshow
0 0 0 setrgbcolor
-0.707107 -0.707107 (6) cshow
0 0 0 setrgbcolor
-2 2.44929e-16 (5) cshow
0 0 0 setrgbcolor
-0.707107 0.707107 (4) cshow
0 0 0 setrgbcolor
1.22465e-16 2 (3) cshow
0 0 0 setrgbcolor
0.707107 0.707107 (2) cshow
0 0 0 setrgbcolor
2 0 (1) cshow
0 0 0 setrgbcolor
0 0 (0) cshow
grestore
grestore
showpage
datas/worst_cases/incremental/inc_worst_case.index 0 → 100755
View file @ d45b5e60
patches_file,links_file
data/worst_cases/incremental/inc_worst_case.patches,data/worst_cases/incremental/inc_worst_case.links
datas/worst_cases/incremental/inc_worst_case.links 0 → 100755
View file @ d45b5e60
from,to,probability
0,2,0
2,0,0
0,4,0
4,0,0
0,6,0
6,0,0
0,8,0
8,0,0
0,9,0
9,0,0
9,1,0
1,9,0
0,10,0
10,0,0
10,3,0
3,10,0
0,11,0
11,0,0
11,5,0
5,11,0
0,12,0
12,0,0
12,7,0
7,12,0
datas/worst_cases/incremental/inc_worst_case.patches 0 → 100755
View file @ d45b5e60
id,weight,x,y
0,1,0,0
1,1,2.0,0.0
2,0.0001,0.707106781187,0.707106781187
3,1,1.22464679915e-16,2.0
4,0.0001,-0.707106781187,0.707106781187
5,1,-2.0,2.44929359829e-16
6,0.0001,-0.707106781187,-0.707106781187
7,1,-3.67394039744e-16,-2.0
8,0.0001,0.707106781187,-0.707106781187
9,0,1.0,0.0
10,0,6.12323399574e-17,1.0
11,0,-1.0,1.22464679915e-16
12,0,-1.83697019872e-16,-1.0
exec/execution_times/marseille.cpp
View file @ d45b5e60
......@@ -31,7 +31,7 @@ int main() {
for(int i = 1; i <= 40; ++i) budget_percents.push_back(i);
Solvers::PL_ECA_2 pl_eca_2;
pl_eca_2.setTimeout(36000).setLogLevel(2);
pl_eca_2.setTimeout(0).setLogLevel(2);
Solvers::PL_ECA_3 pl_eca_3;
pl_eca_3.setTimeout(36000).setLogLevel(2);
......@@ -41,6 +41,11 @@ int main() {
const MutableLandscape & landscape = instance.landscape;
const RestorationPlan<MutableLandscape> & plan = instance.plan;
std::cout << "nb nodes:" << lemon::countNodes(landscape.getNetwork())
<< std::endl;
std::cout << "nb arcs:" << lemon::countArcs(landscape.getNetwork())
<< std::endl;
for(double budget_percent : budget_percents) {
const double B = plan.totalCost() * budget_percent / 100;
......
include/algorithms/my_bin_heap.hpp 100644 → 100755
View file @ d45b5e60
File mode changed from 100644 to 100755
include/bpo_utils.hpp 100644 → 100755
View file @ d45b5e60
File mode changed from 100644 to 100755
include/parsers/parse_instance2.hpp 100644 → 100755
View file @ d45b5e60
File mode changed from 100644 to 100755
include/precomputation/trivial_reformulation.hpp 100644 → 100755
View file @ d45b5e60
File mode changed from 100644 to 100755
include/solvers/concept/instance.hpp 100644 → 100755
View file @ d45b5e60
File mode changed from 100644 to 100755
include/solvers/concept/instance2.hpp 100644 → 100755
View file @ d45b5e60
File mode changed from 100644 to 100755
pl_eca_3.lp 100644 → 100755
View file @ d45b5e60
This diff is collapsed.
plot_scripts/execution_times_tiled.py 100644 → 100755
View file @ d45b5e60
File mode changed from 100644 to 100755
plot_scripts/optimum_ratios_tiled.py 100644 → 100755
View file @ d45b5e60
File mode changed from 100644 to 100755