Fix test post merge

AntaresSimulatorTeam · Dec 1, 2022 · 1c87a33 · 1c87a33
1 parent 96cbf04
commit 1c87a33
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 25 deletions.
diff --git a/data_test/mini_instance_LP/structure.txt b/data_test/mini_instance_LP/structure.txt
@@ -1,3 +1,3 @@
 master		x		0
-SP1			x		0
-SP2			x		0
+SP1.mps			x		0
+SP2.mps			x		0
diff --git a/data_test/mini_instance_LP/structure_default_restart.txt b/data_test/mini_instance_LP/structure_default_restart.txt
@@ -1,3 +1,3 @@
 master_default_restart		x		0
-SP1			x		0
-SP2			x		0
+SP1.mps			x		0
+SP2.mps			x		0
diff --git a/data_test/mini_instance_MIP/structure.txt b/data_test/mini_instance_MIP/structure.txt
@@ -1,3 +1,3 @@
 master		x		0
-SP1			x		0
-SP2			x		0
+SP1.mps			x		0
+SP2.mps			x		0
diff --git a/data_test/mini_instance_MIP/structure_default_restart.txt b/data_test/mini_instance_MIP/structure_default_restart.txt
@@ -1,3 +1,3 @@
 master_default_restart		x		0
-SP1			x		0
-SP2			x		0
+SP1.mps			x		0
+SP2.mps			x		0
diff --git a/data_test/mini_instance_UNBOUNDED/structure.txt b/data_test/mini_instance_UNBOUNDED/structure.txt
@@ -1,3 +1,3 @@
 master		x		0
-SP1			x		0
-SP2			x		0
+SP1.mps			x		0
+SP2.mps			x		0
diff --git a/data_test/mini_network/slave_weights.txt b/data_test/mini_network/slave_weights.txt
@@ -1,3 +1,3 @@
-SP1             0.99
-SP2             0.01
+SP1.mps             0.99
+SP2.mps             0.01
 WEIGHT_SUM      1.0
diff --git a/data_test/mini_network/structure.txt b/data_test/mini_network/structure.txt
@@ -1,6 +1,6 @@
 master		t       0
 master      p       1
-SP1			t		0
-SP1			p		1
-SP2			t		0
-SP2			p		1
+SP1.mps			t		0
+SP1.mps			p		1
+SP2.mps			t		0
+SP2.mps			p		1
diff --git a/data_test/mini_network/structure_default_restart.txt b/data_test/mini_network/structure_default_restart.txt
@@ -1,6 +1,6 @@
 master_default_restart		t       0
 master_default_restart      p       1
-SP1			t		0
-SP1			p		1
-SP2			t		0
-SP2			p		1
+SP1.mps			t		0
+SP1.mps			p		1
+SP2.mps			t		0
+SP2.mps			p		1
diff --git a/data_test/mini_network/structure_weights_restart.txt b/data_test/mini_network/structure_weights_restart.txt
@@ -1,6 +1,6 @@
 master_weights_restart		t       0
 master_weights_restart      p       1
-SP1			t		0
-SP1			p		1
-SP2			t		0
-SP2			p		1
+SP1.mps			t		0
+SP1.mps			p		1
+SP2.mps			t		0
+SP2.mps			p		1
diff --git a/src/cpp/benders/merge_mps/MergeMPS.cpp b/src/cpp/benders/merge_mps/MergeMPS.cpp
@@ -29,7 +29,7 @@ void MergeMPS::launch() {
   auto reader = ArchiveReader(inputRootDir / _options.MPS_ZIP_FILE);
   reader.Open();
   for (auto const &kvp : input) {
-    auto problem_name(inputRootDir / (kvp.first + MPS_SUFFIX));
+    auto problem_name(inputRootDir / (kvp.first));
     SolverAbstract::Ptr solver_l = factory.create_solver(solver_to_use);
     solver_l->init();
     solver_l->set_output_log_level(_options.LOG_LEVEL);