plot_scripts/table_pl_sizes.py

@@ -36,9 +36,9 @@ print("\t& \\#var & \\#const & time & \\#var & \\#const & p. time & time \\tabul
 print("\t\\hline")
 
 
-aude_rows = readCSV('output/time_aude.csv')
-print("\tAude & {} & {} & {} & {} & {} & {} & {}\\tabularnewline".format(int(get_datas(aude_rows, "pl_2_variables")[0]), int(get_datas(aude_rows, "pl_2_constraints")[0]), avg(get_datas(aude_rows, "pl_2_time")), int(
-    get_datas(aude_rows, "pl_3_variables")[0]), int(get_datas(aude_rows, "pl_3_constraints")[0]), avg(get_datas(aude_rows, "pl_3_preprocessing_time")), avg(get_datas(aude_rows, "pl_3_time"))))
+# aude_rows = readCSV('output/time_aude.csv')
+# print("\tAude & {} & {} & {} & {} & {} & {} & {}\\tabularnewline".format(int(get_datas(aude_rows, "pl_2_variables")[0]), int(get_datas(aude_rows, "pl_2_constraints")[0]), avg(get_datas(aude_rows, "pl_2_time")), int(
+#     get_datas(aude_rows, "pl_3_variables")[0]), int(get_datas(aude_rows, "pl_3_constraints")[0]), avg(get_datas(aude_rows, "pl_3_preprocessing_time")), avg(get_datas(aude_rows, "pl_3_time"))))
 
 
 quebec_rows = readCSV('output/time_quebec.csv')
@@ -46,9 +46,9 @@ print("\tMontereal & {} & {} & {} & {} & {} & {} & {}\\tabularnewline".format(in
     get_datas(quebec_rows, "pl_3_variables")[0]), int(get_datas(quebec_rows, "pl_3_constraints")[0]), avg(get_datas(quebec_rows, "pl_3_preprocessing_time")), avg(get_datas(quebec_rows, "pl_3_time"))))
 
 
-biorevaix_rows = readCSV('output/time_biorevaix.csv')
-print("\tAix & {} & {} & {} & {} & {} & {} & {}\\tabularnewline".format(int(get_datas(biorevaix_rows, "pl_2_variables")[0]), int(get_datas(biorevaix_rows, "pl_2_constraints")[0]), avg(get_datas(biorevaix_rows, "pl_2_time")), int(
-    get_datas(biorevaix_rows, "pl_3_variables")[0]), int(get_datas(biorevaix_rows, "pl_3_constraints")[0]), avg(get_datas(biorevaix_rows, "pl_3_preprocessing_time")), avg(get_datas(biorevaix_rows, "pl_3_time"))))
+# biorevaix_rows = readCSV('output/time_biorevaix.csv')
+# print("\tAix & {} & {} & {} & {} & {} & {} & {}\\tabularnewline".format(int(get_datas(biorevaix_rows, "pl_2_variables")[0]), int(get_datas(biorevaix_rows, "pl_2_constraints")[0]), avg(get_datas(biorevaix_rows, "pl_2_time")), int(
+#     get_datas(biorevaix_rows, "pl_3_variables")[0]), int(get_datas(biorevaix_rows, "pl_3_constraints")[0]), avg(get_datas(biorevaix_rows, "pl_3_preprocessing_time")), avg(get_datas(biorevaix_rows, "pl_3_time"))))
 
 
 marseille_rows = readCSV('output/time_marseille.csv')

src/solvers/pl_eca_2.cpp

@@ -2,7 +2,11 @@
 
 #include "CglFlowCover.hpp"
 #include "CglMixedIntegerRounding2.hpp"
+
+// #define WITH_GUROBI
+#ifdef WITH_GUROBI
 #include "gurobi_c.h"
+#endif
 
 namespace Solvers::PL_ECA_2_Vars {
 class PreprocessedDatas {
@@ -288,7 +292,6 @@ Solution Solvers::PL_ECA_2::solve(
                   << " variables" << std::endl;
     }
     fill_solver(solver_builder, landscape, plan, B, vars, preprocessed_datas);
-#define WITH_GUROBI
 #ifndef WITH_GUROBI
     OsiSolverInterface * solver =
         solver_builder.buildSolver<OsiClpSolverInterface>(OSI_Builder::MAX);

src/solvers/pl_eca_3.cpp

@@ -2,7 +2,11 @@
 
 #include "CglFlowCover.hpp"
 #include "CglMixedIntegerRounding2.hpp"
+
+// #define WITH_GUROBI
+#ifdef WITH_GUROBI
 #include "gurobi_c.h"
+#endif
 
 namespace Solvers::PL_ECA_3_Vars {
 class PreprocessedDatas {
@@ -337,7 +341,6 @@ Solution Solvers::PL_ECA_3::solve(
                   << " variables" << std::endl;
     }
     fill_solver(solver_builder, landscape, plan, B, vars, preprocessed_datas);
-#define WITH_GUROBI
 #ifndef WITH_GUROBI
     OsiSolverInterface * solver =
         solver_builder.buildSolver<OsiClpSolverInterface>(OSI_Builder::MAX);