fix: tests to import correct Configuration object

wetransform-os · Sep 10, 2024 · 02a26a5 · 02a26a5
1 parent a809166
commit 02a26a5
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 17 deletions.
diff --git a/mcda/mcda_with_robustness.py b/mcda/mcda_with_robustness.py
@@ -7,7 +7,7 @@
 import numpy as np
 
 from ProMCDA.mcda.utils.application_enums import MonteCarloMarginalDistributions
-from ProMCDA.mcda.models import Configuration
+from ProMCDA.mcda.models.configuration import Configuration
 
 log = logging.getLogger(__name__)
 

diff --git a/mcda/mcda_without_robustness.py b/mcda/mcda_without_robustness.py
@@ -6,7 +6,7 @@
 from ProMCDA.mcda.configuration.config import Config
 from ProMCDA.mcda.mcda_functions.normalization import Normalization
 from ProMCDA.mcda.mcda_functions.aggregation import Aggregation
-from ProMCDA.mcda.models import Configuration
+from ProMCDA.mcda.models.configuration import Configuration
 
 log = logging.getLogger(__name__)
 

diff --git a/tests/unit_tests/test_mcda_with_robustness.py b/tests/unit_tests/test_mcda_with_robustness.py
@@ -7,7 +7,7 @@
 from ProMCDA.mcda import mcda_run
 from ProMCDA.mcda.mcda_with_robustness import MCDAWithRobustness
 from ProMCDA.mcda.configuration.config import Config
-from ProMCDA.mcda.models import Configuration
+from ProMCDA.mcda.models.configuration import Configuration
 
 
 class TestMCDA_with_robustness(unittest.TestCase):

diff --git a/tests/unit_tests/test_mcda_without_robustness.py b/tests/unit_tests/test_mcda_without_robustness.py
@@ -10,7 +10,7 @@
 from ProMCDA.mcda.mcda_functions.aggregation import Aggregation
 import ProMCDA.mcda.utils.utils_for_main as utils_for_main
 import ProMCDA.mcda.utils.utils_for_parallelization as utils_for_parallelization
-from ProMCDA.mcda.models import Configuration
+from ProMCDA.mcda.models.configuration import Configuration
 
 current_directory = os.path.dirname(os.path.abspath(__file__))
 resources_directory = os.path.join(current_directory, '..', 'resources')

diff --git a/tests/unit_tests/test_utils_for_main.py b/tests/unit_tests/test_utils_for_main.py
@@ -139,19 +139,6 @@ def test_pop_indexed_elements(self):
         isinstance(out_list, list)
         TestCase.assertListEqual(self, out_list, expected_list)
 
-    def test_print_input_parameters_pdf(self):
-        # Given
-        input_matrix_1 = TestUtils.get_input_matrix_1()
-        input_matrix_2 = TestUtils.get_input_matrix_2()
-        input_matrix_3 = TestUtils.get_input_matrix_3()
-        input_matrix_alternatives = TestUtils.get_input_matrix_alternatives()
-        car_data = read_matrix("/Users/kapil/workspace/ranking-service/ProMCDA/input_files/toy_example/car_data.csv")
-        pprint(f"input_matrix_1:\n {input_matrix_1.to_json()}")
-        pprint(f"input_matrix_2:\n {input_matrix_2.to_json()}")
-        pprint(f"input_matrix_alternatives:\n {input_matrix_alternatives.to_json()}")
-        pprint(f"car_data:\n {car_data}")
-        pprint(f"car_data:\n {car_data.to_json()}")
-
 
     def test_check_parameters_pdf(self):
         # Given

diff --git a/tests/unit_tests/test_utils_for_parallelization.py b/tests/unit_tests/test_utils_for_parallelization.py
@@ -6,6 +6,7 @@
 
 from ProMCDA.mcda import mcda_run
 from ProMCDA.mcda.mcda_without_robustness import *
+from ProMCDA.mcda.models.configuration import Configuration
 from ProMCDA.mcda.utils.utils_for_parallelization import *