More renaming, fixing test issues (EqPosy).

convexengineering · Jun 25, 2019 · 76b856f · 76b856f
1 parent ff7b0ce
commit 76b856f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/robust/signomial_simple_wing/models.py b/robust/signomial_simple_wing/models.py
@@ -74,7 +74,7 @@ def simple_ac():
     uncertainty_sets = ['box', 'elliptical']
 
     variable_pwl_file_name = os.path.dirname(__file__) + '/simulation_data_variable_pwl.txt'
-    simulate.generate_variable_pwlsections_results(model, model_name, gamma, number_of_iterations,
+    simulate.print_variable_pwlsections_results(model, model_name, gamma, number_of_iterations,
                                                                numbers_of_linear_sections, linearization_tolerance,
                                                                verbosity, variable_pwl_file_name,
                                                                number_of_time_average_solves, methods, uncertainty_sets,

diff --git a/robust/simple_wing/models.py b/robust/simple_wing/models.py
@@ -95,7 +95,7 @@ def simple_wing():
     uncertainty_sets = ['box', 'elliptical']
 
     variable_pwl_file_name = os.path.dirname(__file__) + '/simulation_data_variable_pwl.txt'
-    simulate.generate_variable_pwlsections_results(model, model_name, gamma, number_of_iterations,
+    simulate.print_variable_pwlsections_results(model, model_name, gamma, number_of_iterations,
                                                                numbers_of_linear_sections, linearization_tolerance,
                                                                verbosity, variable_pwl_file_name,
                                                                number_of_time_average_solves, methods, uncertainty_sets,

diff --git a/robust/solar_model/models.py b/robust/solar_model/models.py
@@ -49,7 +49,7 @@ def mike_solar_model(lat):
     uncertainty_sets = ['box', 'elliptical']
 
     variable_pwl_file_name = os.path.dirname(__file__) + '/simulation_data_variable_pwl.txt'
-    simulate.generate_variable_pwlsections_results(model, model_name, gamma, number_of_iterations,
+    simulate.print_variable_pwlsections_results(model, model_name, gamma, number_of_iterations,
                                                                numbers_of_linear_sections, linearization_tolerance,
                                                                verbosity, variable_pwl_file_name,
                                                                number_of_time_average_solves, methods, uncertainty_sets,

diff --git a/robust/testing/t_equivalent_posynomials.py b/robust/testing/t_equivalent_posynomials.py
@@ -81,8 +81,7 @@ def test_correlated_monomials():
         theoretical_partition = EquivalentPosynomials.merge_intersected_lists(correlations)
 
         p = sum(m)
-
-        equivalent_posynomial = EquivalentPosynomials(p, p_uncertain_vars, [], 0, False, False)
+        equivalent_posynomial = EquivalentPosynomials(p, 0, False, False)
         equivalent_posynomial.main_p = p
         actual_partition = equivalent_posynomial.correlated_monomials()
 
@@ -101,7 +100,7 @@ def test_correlated_monomials():
             temp += part
 
         theoretical_partition = list(set(dependent_theoretical_partition))
-        equivalent_posynomial = EquivalentPosynomials(p, p_uncertain_vars, [], 0, False, True)
+        equivalent_posynomial = EquivalentPosynomials(p, 0, False, True)
         equivalent_posynomial.main_p = p
         actual_partition = equivalent_posynomial.correlated_monomials()