Commit 62835d4d authored by Francois Hamonic's avatar Francois Hamonic
Browse files

execution times ok

parent 047cc46d
.vscode
/cache
/build
/output
*.lp
*.mps.gz
*.dot
*.pdf
*.eps
*.svg
*.index
*.patches
*.links
/doc/html
/doc/latex
This diff is collapsed.
source_id,target_id,dam
0,1,1
1,3,0
2,3,0
3,4,0
4,24,1
5,7,0
6,7,0
7,8,0
8,9,1
10,11,1
11,12,1
12,13,0
9,13,0
13,14,1
15,17,0
16,17,0
17,18,0
18,19,1
19,20,1
20,21,1
21,22,0
14,22,0
22,23,0
23,25,1
24,25,0
25,26,0
27,28,0
26,28,0
28,29,1
30,31,1
29,31,0
31,32,0
32,33,1
33,34,1
36,39,0
37,39,0
38,39,0
39,40,0
35,41,0
40,41,0
41,42,1
34,43,0
42,43,0
43,44,0
1,0,1
3,1,0
3,2,0
4,3,0
24,4,1
7,5,0
7,6,0
8,7,0
9,8,1
11,10,1
12,11,1
13,12,0
13,9,0
14,13,1
17,15,0
17,16,0
18,17,0
19,18,1
20,19,1
21,20,1
22,21,0
22,14,0
23,22,0
25,23,1
25,24,0
26,25,0
28,27,0
28,26,0
29,28,1
31,30,1
31,29,0
32,31,0
33,32,1
34,33,1
39,36,0
39,37,0
39,38,0
40,39,0
41,35,0
41,40,0
42,41,1
43,34,0
43,42,0
44,43,0
\ No newline at end of file
name,id,length,x,y
AUD-Puy,0,235,400,70
AUD-Car-1,1,60,385,180
AUD-Car-2,2,120,350,140
AUD-Car-hub,3,0,360,200
AUD-Car-3,4,55,335,220
QUE-Mas-1,5,112,270,80
QUE-Mas-2,6,74,315,120
QUE-Mas-hub,7,0,275,130
QUE-Mas-3,8,42,265,155
QUE-Ria-1,9,43,250,190
ART-Lau,10,173,100,0
,11,41,140,110
QUE-Ria-2,12,114,200,160
QUE-Ria-hub,13,0,240,200
QUE-Ria-3,14,28,235,220
BRU-Mii-1,15,80,100,170
BRU-Mii-2,16,129,60,230
BRU-Mii-hub,17,0,120,200
BRU-Mii-3,18,46,140,220
,19,10,165,235
,20,17,180,235
,21,36,207,240
BRU-Uss-hub-1,22,0,225,240
BRU-Uss-1,23,38,240,250
BRU-Uss-2,24,57,295,250
BRU-Uss-hub-2,25,0,260,270
BRU-Uss-3,26,64,260,300
CAM-Sau-1,27,210,190,355
AUD-Far-hub,28,0,260,325
AGU-Sou-1,29,80,280,370
AGU-Sou-2,30,80,340,340
AGU-Sou-hub,31,0,315,390
AUD-Fou-1,32,134,395,405
,33,36,470,420
AUD-Ser-1,34,160,570,415
BAI-Pas-1,35,175,735,250
AIG-Sou-1,36,240,680,180
ROQ-Sau-1,37,205,580,180
ROQ-Sau-2,38,190,530,280
ROQ-Sau-hub,39,0,660,270
AIG-Pou-1,40,50,670,290
AIG-Pou-hub,41,0,695,315
AUD-Nen-1,42,108,665,360
AUD-Nen-hub,43,0,630,400
AUD-Nen-2,44,100,650,450
\ No newline at end of file
......@@ -94,9 +94,9 @@ int main() {
for(int i = 17; i <= 40; ++i) budget_percents.push_back(i);
Solvers::PL_ECA_2 pl_eca_2;
pl_eca_2.setTimeout(10).setLogLevel(2);
pl_eca_2.setTimeout(36000).setLogLevel(2);
Solvers::PL_ECA_3 pl_eca_3;
pl_eca_3.setTimeout(10000).setLogLevel(2);
pl_eca_3.setTimeout(36000).setLogLevel(2);
const double dist_coef = 1.5;
const double restoration_coef = 6;
......
......@@ -31,9 +31,9 @@ int main() {
for(int i = 0; i <= 40; ++i) budget_percents.push_back(i);
Solvers::PL_ECA_2 pl_eca_2;
pl_eca_2.setTimeout(10).setLogLevel(2);
pl_eca_2.setTimeout(36000).setLogLevel(2);
Solvers::PL_ECA_3 pl_eca_3;
pl_eca_3.setTimeout(7200).setLogLevel(2);
pl_eca_3.setTimeout(36000).setLogLevel(2);
const double median = 3000;
Instance instance = make_instance_marseille(1, 0.135, median, 100);
......
......@@ -31,9 +31,9 @@ int main() {
for(int i = 31; i <= 40; ++i) budget_percents.push_back(i);
Solvers::PL_ECA_2 pl_eca_2;
pl_eca_2.setTimeout(3600).setLogLevel(2);
pl_eca_2.setTimeout(36000).setLogLevel(2);
Solvers::PL_ECA_3 pl_eca_3;
pl_eca_3.setTimeout(3600).setLogLevel(2);
pl_eca_3.setTimeout(36000).setLogLevel(2);
const double median = 300;
Instance instance = make_instance_quebec_frog(1, 0, median);
......
......@@ -118,7 +118,7 @@ Instance make_instance_quebec_hare(double pow, double thresold, double median,
std::vector<ThreatData> threaten_list;
io::CSVReader<5> patches(
"datas/quebec_leam_v3/raw/sommets_leam_v3.csv");
"datas/Montreal_hare/sommets_leam_v3.csv");
patches.read_header(io::ignore_extra_column, "count", "area", "xcoord",
"ycoord", "count2050");
int id;
......@@ -146,7 +146,7 @@ Instance make_instance_quebec_hare(double pow, double thresold, double median,
}
io::CSVReader<3> links(
"datas/quebec_leam_v3/raw/aretes_leam_v3.csv");
"datas/Montreal_hare/aretes_leam_v3.csv");
links.read_header(io::ignore_extra_column, "from", "to", "Dist");
int from, to;
double Dist;
......@@ -203,7 +203,7 @@ Instance make_instance_quebec_frog(double pow, double thresold, double median) {
std::vector<ThreatData> threaten_list;
io::CSVReader<5> patches(
"datas/quebec_438_RASY/vertices_438_RASY.csv");
"datas/Montreal_frog/vertices.csv");
patches.read_header(io::ignore_extra_column, "name", "area", "xcoord",
"ycoord", "per_menace");
int id;
......@@ -229,7 +229,7 @@ Instance make_instance_quebec_frog(double pow, double thresold, double median) {
}
io::CSVReader<3> links(
"datas/quebec_438_RASY/edges_438_RASY.csv");
"datas/Montreal_frog/edges.csv");
links.read_header(io::ignore_extra_column, "from", "to", "Dist");
int from, to;
double Dist;
......
......@@ -23,8 +23,8 @@ public:
params["relaxed"]->set(relaxed);
return *this;
}
PL_ECA_2 & setTimeout(int fortest) {
params["timeout"]->set(fortest);
PL_ECA_2 & setTimeout(int seconds) {
params["timeout"]->set(seconds);
return *this;
}
......
This diff is collapsed.
......@@ -28,9 +28,9 @@ def plot(name, subplot, file_name):
fig, axs = plt.subplots(2, 2)
plot("Aude", axs[0, 0], "time_aude.csv")
plot("Montreal", axs[0, 1], "time_quebec_analysis.csv")
plot("Aix", axs[1, 0], "time_biorevaix_analysis.csv")
plot("Marseille", axs[1, 1], "time_marseille_analysis.csv")
plot("Montreal", axs[0, 1], "time_quebec.csv")
plot("Aix", axs[1, 0], "time_biorevaix.csv")
plot("Marseille", axs[1, 1], "time_marseille.csv")
axs[0, 0].set(xlabel=None, ylabel='execution time (s)')
axs[0, 1].set(xlabel=None, ylabel=None)
......@@ -44,5 +44,5 @@ fig.set_size_inches(8,5)
plt.rcParams.update({'font.size': 18})
# plt.tight_layout()
plt.savefig("figures/execution_times.pdf", dpi=500)
plt.savefig("output/execution_times.pdf", dpi=500)
plt.show()
\ No newline at end of file
Supports Markdown
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