simplified use of suffix update and removed extra prints

kaklise · Apr 30, 2024 · 539d62d · 539d62d
1 parent c7f3634
commit 539d62d
Show file tree

Hide file tree

Showing 18 changed files with 47 additions and 48 deletions.
diff --git a/pyomo/contrib/parmest/examples/reaction_kinetics/simple_reaction_parmest_example.py b/pyomo/contrib/parmest/examples/reaction_kinetics/simple_reaction_parmest_example.py
@@ -89,9 +89,9 @@ def label_model(self):
         m = self.model
 
         m.experiment_outputs = pyo.Suffix(direction=pyo.Suffix.LOCAL)
-        m.experiment_outputs.update([(m.x1, self.data['x1'])])
-        m.experiment_outputs.update([(m.x2, self.data['x2'])])
-        m.experiment_outputs.update([(m.y, self.data['y'])])
+        m.experiment_outputs.update([(m.x1, self.data['x1']),
+                                     (m.x2, self.data['x2']),
+                                     (m.y, self.data['y'])])
 
         return m
 
@@ -156,7 +156,7 @@ def main():
 
     # View one model
     # exp0_model = exp_list[0].get_labeled_model()
-    # print(exp0_model.pprint())
+    # exp0_model.pprint()
 
     # =======================================================================
     # Parameter estimation without covariance estimate

diff --git a/pyomo/contrib/parmest/examples/reactor_design/bootstrap_example.py b/pyomo/contrib/parmest/examples/reactor_design/bootstrap_example.py
@@ -31,7 +31,7 @@ def main():
 
     # View one model
     # exp0_model = exp_list[0].get_labeled_model()
-    # print(exp0_model.pprint())
+    # exp0_model.pprint()
 
     pest = parmest.Estimator(exp_list, obj_function='SSE')
 

diff --git a/pyomo/contrib/parmest/examples/reactor_design/confidence_region_example.py b/pyomo/contrib/parmest/examples/reactor_design/confidence_region_example.py
@@ -1,7 +1,7 @@
 #  ___________________________________________________________________________
 #
 #  Pyomo: Python Optimization Modeling Objects
-#  Copyright (c) 2008-2022
+#  Copyright (c) 2008-2024
 #  National Technology and Engineering Solutions of Sandia, LLC
 #  Under the terms of Contract DE-NA0003525 with National Technology and
 #  Engineering Solutions of Sandia, LLC, the U.S. Government retains certain
@@ -31,7 +31,7 @@ def main():
 
     # View one model
     # exp0_model = exp_list[0].get_labeled_model()
-    # print(exp0_model.pprint())
+    # exp0_model.pprint()
 
     pest = parmest.Estimator(exp_list, obj_function='SSE')
 

diff --git a/pyomo/contrib/parmest/examples/reactor_design/datarec_example.py b/pyomo/contrib/parmest/examples/reactor_design/datarec_example.py
@@ -40,17 +40,17 @@ def label_model(self):
 
         # experiment outputs
         m.experiment_outputs = pyo.Suffix(direction=pyo.Suffix.LOCAL)
-        m.experiment_outputs.update([(m.ca, self.data_i['ca'])])
-        m.experiment_outputs.update([(m.cb, self.data_i['cb'])])
-        m.experiment_outputs.update([(m.cc, self.data_i['cc'])])
-        m.experiment_outputs.update([(m.cd, self.data_i['cd'])])
+        m.experiment_outputs.update([(m.ca, self.data_i['ca']),
+                                     (m.cb, self.data_i['cb']),
+                                     (m.cc, self.data_i['cc']),
+                                     (m.cd, self.data_i['cd'])])
 
         # experiment standard deviations
         m.experiment_outputs_std = pyo.Suffix(direction=pyo.Suffix.LOCAL)
-        m.experiment_outputs_std.update([(m.ca, self.data_std['ca'])])
-        m.experiment_outputs_std.update([(m.cb, self.data_std['cb'])])
-        m.experiment_outputs_std.update([(m.cc, self.data_std['cc'])])
-        m.experiment_outputs_std.update([(m.cd, self.data_std['cd'])])
+        m.experiment_outputs_std.update([(m.ca, self.data_std['ca']),
+                                         (m.cb, self.data_std['cb']),
+                                         (m.cc, self.data_std['cc']),
+                                         (m.cd, self.data_std['cd'])])
 
         # no unknowns (theta names)
         m.unknown_parameters = pyo.Suffix(direction=pyo.Suffix.LOCAL)
@@ -71,10 +71,10 @@ def label_model(self):
 
         # add experiment standard deviations
         m.experiment_outputs_std = pyo.Suffix(direction=pyo.Suffix.LOCAL)
-        m.experiment_outputs_std.update([(m.ca, self.data_std['ca'])])
-        m.experiment_outputs_std.update([(m.cb, self.data_std['cb'])])
-        m.experiment_outputs_std.update([(m.cc, self.data_std['cc'])])
-        m.experiment_outputs_std.update([(m.cd, self.data_std['cd'])])
+        m.experiment_outputs_std.update([(m.ca, self.data_std['ca']),
+                                         (m.cb, self.data_std['cb']),
+                                         (m.cc, self.data_std['cc']),
+                                         (m.cd, self.data_std['cd'])])
 
         return m
 

diff --git a/pyomo/contrib/parmest/examples/reactor_design/leaveNout_example.py b/pyomo/contrib/parmest/examples/reactor_design/leaveNout_example.py
@@ -38,7 +38,7 @@ def main():
 
     # View one model
     # exp0_model = exp_list[0].get_labeled_model()
-    # print(exp0_model.pprint())
+    # exp0_model.pprint()
 
     pest = parmest.Estimator(exp_list, obj_function='SSE')
 

diff --git a/pyomo/contrib/parmest/examples/reactor_design/likelihood_ratio_example.py b/pyomo/contrib/parmest/examples/reactor_design/likelihood_ratio_example.py
@@ -32,7 +32,7 @@ def main():
 
     # View one model
     # exp0_model = exp_list[0].get_labeled_model()
-    # print(exp0_model.pprint())
+    # exp0_model.pprint()
 
     pest = parmest.Estimator(exp_list, obj_function='SSE')
 

diff --git a/pyomo/contrib/parmest/examples/reactor_design/multisensor_data_example.py b/pyomo/contrib/parmest/examples/reactor_design/multisensor_data_example.py
@@ -41,12 +41,11 @@ def label_model(self):
         m = self.model
 
         m.experiment_outputs = pyo.Suffix(direction=pyo.Suffix.LOCAL)
-        m.experiment_outputs.update(
-            [(m.ca, [self.data_i['ca1'], self.data_i['ca2'], self.data_i['ca3']])]
-        )
-        m.experiment_outputs.update([(m.cb, [self.data_i['cb']])])
-        m.experiment_outputs.update([(m.cc, [self.data_i['cc1'], self.data_i['cc2']])])
-        m.experiment_outputs.update([(m.cd, [self.data_i['cd']])])
+        m.experiment_outputs.update([
+            (m.ca, [self.data_i['ca1'], self.data_i['ca2'], self.data_i['ca3']]),
+            (m.cb, [self.data_i['cb']]),
+            (m.cc, [self.data_i['cc1'], self.data_i['cc2']]),
+            (m.cd, [self.data_i['cd']])])
 
         m.unknown_parameters = pyo.Suffix(direction=pyo.Suffix.LOCAL)
         m.unknown_parameters.update(
@@ -80,8 +79,8 @@ def SSE_multisensor(model):
 
     # View one model
     # exp0_model = exp_list[0].get_labeled_model()
-    # print(exp0_model.pprint())
-    # print(SSE_multisensor(exp0_model))
+    # exp0_model.pprint()
+    # SSE_multisensor(exp0_model)
 
     pest = parmest.Estimator(exp_list, obj_function=SSE_multisensor)
     obj, theta = pest.theta_est()

diff --git a/pyomo/contrib/parmest/examples/reactor_design/parameter_estimation_example.py b/pyomo/contrib/parmest/examples/reactor_design/parameter_estimation_example.py
@@ -31,7 +31,7 @@ def main():
 
     # View one model
     # exp0_model = exp_list[0].get_labeled_model()
-    # print(exp0_model.pprint())
+    # exp0_model.pprint()
 
     pest = parmest.Estimator(exp_list, obj_function='SSE')
 

diff --git a/pyomo/contrib/parmest/examples/reactor_design/reactor_design.py b/pyomo/contrib/parmest/examples/reactor_design/reactor_design.py
@@ -107,10 +107,10 @@ def label_model(self):
         m = self.model
 
         m.experiment_outputs = pyo.Suffix(direction=pyo.Suffix.LOCAL)
-        m.experiment_outputs.update([(m.ca, self.data_i['ca'])])
-        m.experiment_outputs.update([(m.cb, self.data_i['cb'])])
-        m.experiment_outputs.update([(m.cc, self.data_i['cc'])])
-        m.experiment_outputs.update([(m.cd, self.data_i['cd'])])
+        m.experiment_outputs.update([(m.ca, self.data_i['ca']),
+                                     (m.cb, self.data_i['cb']),
+                                     (m.cc, self.data_i['cc']),
+                                     (m.cd, self.data_i['cd'])])
 
         m.unknown_parameters = pyo.Suffix(direction=pyo.Suffix.LOCAL)
         m.unknown_parameters.update(

diff --git a/pyomo/contrib/parmest/examples/reactor_design/timeseries_data_example.py b/pyomo/contrib/parmest/examples/reactor_design/timeseries_data_example.py
@@ -68,7 +68,7 @@ def SSE_timeseries(model):
 
     # View one model & SSE
     # exp0_model = exp_list[0].get_labeled_model()
-    # print(exp0_model.pprint())
+    # exp0_model.pprint()
     # print(SSE_timeseries(exp0_model))
 
     pest = parmest.Estimator(exp_list, obj_function=SSE_timeseries)

diff --git a/pyomo/contrib/parmest/examples/rooney_biegler/bootstrap_example.py b/pyomo/contrib/parmest/examples/rooney_biegler/bootstrap_example.py
@@ -39,7 +39,7 @@ def SSE(model):
 
     # View one model
     # exp0_model = exp_list[0].get_labeled_model()
-    # print(exp0_model.pprint())
+    # exp0_model.pprint()
 
     # Create an instance of the parmest estimator
     pest = parmest.Estimator(exp_list, obj_function=SSE)

diff --git a/pyomo/contrib/parmest/examples/rooney_biegler/likelihood_ratio_example.py b/pyomo/contrib/parmest/examples/rooney_biegler/likelihood_ratio_example.py
@@ -40,7 +40,7 @@ def SSE(model):
 
     # View one model
     # exp0_model = exp_list[0].get_labeled_model()
-    # print(exp0_model.pprint())
+    # exp0_model.pprint()
 
     # Create an instance of the parmest estimator
     pest = parmest.Estimator(exp_list, obj_function=SSE)

diff --git a/pyomo/contrib/parmest/examples/rooney_biegler/parameter_estimation_example.py b/pyomo/contrib/parmest/examples/rooney_biegler/parameter_estimation_example.py
@@ -39,7 +39,7 @@ def SSE(model):
 
     # View one model
     # exp0_model = exp_list[0].get_labeled_model()
-    # print(exp0_model.pprint())
+    # exp0_model.pprint()
 
     # Create an instance of the parmest estimator
     pest = parmest.Estimator(exp_list, obj_function=SSE)

diff --git a/pyomo/contrib/parmest/examples/rooney_biegler/rooney_biegler.py b/pyomo/contrib/parmest/examples/rooney_biegler/rooney_biegler.py
@@ -61,8 +61,8 @@ def label_model(self):
         m = self.model
 
         m.experiment_outputs = pyo.Suffix(direction=pyo.Suffix.LOCAL)
-        m.experiment_outputs.update([(m.hour, self.data['hour'])])
-        m.experiment_outputs.update([(m.y, self.data['y'])])
+        m.experiment_outputs.update([(m.hour, self.data['hour']),
+                                     (m.y, self.data['y'])])
 
         m.unknown_parameters = pyo.Suffix(direction=pyo.Suffix.LOCAL)
         m.unknown_parameters.update(

diff --git a/pyomo/contrib/parmest/examples/rooney_biegler/rooney_biegler_with_constraint.py b/pyomo/contrib/parmest/examples/rooney_biegler/rooney_biegler_with_constraint.py
@@ -65,8 +65,8 @@ def label_model(self):
         m = self.model
 
         m.experiment_outputs = pyo.Suffix(direction=pyo.Suffix.LOCAL)
-        m.experiment_outputs.update([(m.hour, self.data['hour'])])
-        m.experiment_outputs.update([(m.y, self.data['y'])])
+        m.experiment_outputs.update([(m.hour, self.data['hour']),
+                                     (m.y, self.data['y'])])
 
         m.unknown_parameters = pyo.Suffix(direction=pyo.Suffix.LOCAL)
         m.unknown_parameters.update(

diff --git a/pyomo/contrib/parmest/examples/semibatch/parameter_estimation_example.py b/pyomo/contrib/parmest/examples/semibatch/parameter_estimation_example.py
@@ -33,7 +33,7 @@ def main():
 
     # View one model
     # exp0_model = exp_list[0].get_labeled_model()
-    # print(exp0_model.pprint())
+    # exp0_model.pprint()
 
     # Note, the model already includes a 'SecondStageCost' expression
     # for sum of squared error that will be used in parameter estimation

diff --git a/pyomo/contrib/parmest/examples/semibatch/scenario_example.py b/pyomo/contrib/parmest/examples/semibatch/scenario_example.py
@@ -34,7 +34,7 @@ def main():
 
     # View one model
     # exp0_model = exp_list[0].get_labeled_model()
-    # print(exp0_model.pprint())
+    # exp0_model.pprint()
 
     pest = parmest.Estimator(exp_list)
 

diff --git a/pyomo/contrib/parmest/tests/test_parmest.py b/pyomo/contrib/parmest/tests/test_parmest.py
@@ -427,8 +427,8 @@ def label_model(self):
                 m = self.model
 
                 m.experiment_outputs = pyo.Suffix(direction=pyo.Suffix.LOCAL)
-                m.experiment_outputs.update([(m.hour, self.data["hour"])])
-                m.experiment_outputs.update([(m.y, self.data["y"])])
+                m.experiment_outputs.update([(m.hour, self.data["hour"]),
+                                             (m.y, self.data["y"])])
 
                 m.unknown_parameters = pyo.Suffix(direction=pyo.Suffix.LOCAL)
                 m.unknown_parameters.update((k, pyo.ComponentUID(k)) for k in [m.theta])
@@ -506,8 +506,8 @@ def label_model(self):
                 m = self.model
 
                 m.experiment_outputs = pyo.Suffix(direction=pyo.Suffix.LOCAL)
-                m.experiment_outputs.update([(m.hour, self.data["hour"])])
-                m.experiment_outputs.update([(m.y, self.data["y"])])
+                m.experiment_outputs.update([(m.hour, self.data["hour"]),
+                                             (m.y, self.data["y"])])
 
                 m.unknown_parameters = pyo.Suffix(direction=pyo.Suffix.LOCAL)
                 m.unknown_parameters.update((k, pyo.ComponentUID(k)) for k in [m.theta])