Ran black, all tests pass, final lookover

Author: sscini

pyomo/contrib/parmest/graphics.py

@@ -273,6 +273,9 @@ def pairwise_plot(
         Add a legend to the plot
     filename: string, optional
         Filename used to save the figure
+    seed: int, optional
+        Random seed used to generate theta values if theta_values is a tuple.
+        If None, the seed is not set.
     """
     assert isinstance(theta_values, (pd.DataFrame, tuple))
     assert isinstance(theta_star, (type(None), dict, pd.Series, pd.DataFrame))

pyomo/contrib/parmest/parmest.py

@@ -817,7 +817,7 @@ def _Q_at_theta(self, thetavals, initialize_parmest_model=False):
 
         return retval, thetavals, WorstStatus
 
-    def _get_sample_list(self, samplesize, num_samples, replacement=True, seed=None):
+    def _get_sample_list(self, samplesize, num_samples, replacement=True):
         samplelist = list()
 
         scenario_numbers = list(range(len(self.exp_list)))
@@ -834,8 +834,6 @@ def _get_sample_list(self, samplesize, num_samples, replacement=True, seed=None)
                 while (unique_samples <= len(self._return_theta_names())) and (
                     not duplicate
                 ):
-                    # if seed is not None:
-                    # np.random.seed(seed)  # set seed for reproducibility
                     sample = np.random.choice(
                         scenario_numbers, samplesize, replace=replacement
                     )
@@ -1037,9 +1035,7 @@ def theta_est_leaveNout(
         if seed is not None:
             np.random.seed(seed)
 
-        global_list = self._get_sample_list(
-            samplesize, lNo_samples, replacement=False, seed=seed
-        )
+        global_list = self._get_sample_list(samplesize, lNo_samples, replacement=False)
 
         task_mgr = utils.ParallelTaskManager(len(global_list))
         local_list = task_mgr.global_to_local_data(global_list)

pyomo/contrib/parmest/tests/test_graphics.py

@@ -31,6 +31,8 @@
 import pyomo.contrib.parmest.parmest as parmest
 import pyomo.contrib.parmest.graphics as graphics
 
+from pyomo.contrib.parmest.tests.test_parmest import _RANDOM_SEED_FOR_TESTING
+
 testdir = os.path.dirname(os.path.abspath(__file__))
 
 
@@ -47,6 +49,7 @@
 )
 class TestGraphics(unittest.TestCase):
     def setUp(self):
+        np.random.seed(_RANDOM_SEED_FOR_TESTING)
         self.A = pd.DataFrame(
             np.random.randint(0, 100, size=(100, 4)), columns=list('ABCD')
         )
@@ -55,7 +58,12 @@ def setUp(self):
         )
 
     def test_pairwise_plot(self):
-        graphics.pairwise_plot(self.A, alpha=0.8, distributions=['Rect', 'MVN', 'KDE'])
+        graphics.pairwise_plot(
+            self.A,
+            alpha=0.8,
+            distributions=['Rect', 'MVN', 'KDE'],
+            seed=_RANDOM_SEED_FOR_TESTING,
+        )
 
     def test_grouped_boxplot(self):
         graphics.grouped_boxplot(self.A, self.B, normalize=True, group_names=['A', 'B'])