Skip to content

Commit 539d62d

Browse files
kaklisekaklise
committed
simplified use of suffix update and removed extra prints
1 parent c7f3634 commit 539d62d

18 files changed

+47
-48
lines changed

‎pyomo/contrib/parmest/examples/reaction_kinetics/simple_reaction_parmest_example.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,9 @@ def label_model(self):
8989
m = self.model
9090

9191
m.experiment_outputs = pyo.Suffix(direction=pyo.Suffix.LOCAL)
92-
m.experiment_outputs.update([(m.x1, self.data['x1'])])
93-
m.experiment_outputs.update([(m.x2, self.data['x2'])])
94-
m.experiment_outputs.update([(m.y, self.data['y'])])
92+
m.experiment_outputs.update([(m.x1, self.data['x1']),
93+
(m.x2, self.data['x2']),
94+
(m.y, self.data['y'])])
9595

9696
return m
9797

@@ -156,7 +156,7 @@ def main():
156156

157157
# View one model
158158
# exp0_model = exp_list[0].get_labeled_model()
159-
# print(exp0_model.pprint())
159+
# exp0_model.pprint()
160160

161161
# =======================================================================
162162
# Parameter estimation without covariance estimate

‎pyomo/contrib/parmest/examples/reactor_design/bootstrap_example.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def main():
3131

3232
# View one model
3333
# exp0_model = exp_list[0].get_labeled_model()
34-
# print(exp0_model.pprint())
34+
# exp0_model.pprint()
3535

3636
pest = parmest.Estimator(exp_list, obj_function='SSE')
3737

‎pyomo/contrib/parmest/examples/reactor_design/confidence_region_example.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# ___________________________________________________________________________
22
#
33
# Pyomo: Python Optimization Modeling Objects
4-
# Copyright (c) 2008-2022
4+
# Copyright (c) 2008-2024
55
# National Technology and Engineering Solutions of Sandia, LLC
66
# Under the terms of Contract DE-NA0003525 with National Technology and
77
# Engineering Solutions of Sandia, LLC, the U.S. Government retains certain
@@ -31,7 +31,7 @@ def main():
3131

3232
# View one model
3333
# exp0_model = exp_list[0].get_labeled_model()
34-
# print(exp0_model.pprint())
34+
# exp0_model.pprint()
3535

3636
pest = parmest.Estimator(exp_list, obj_function='SSE')
3737

‎pyomo/contrib/parmest/examples/reactor_design/datarec_example.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,17 @@ def label_model(self):
4040

4141
# experiment outputs
4242
m.experiment_outputs = pyo.Suffix(direction=pyo.Suffix.LOCAL)
43-
m.experiment_outputs.update([(m.ca, self.data_i['ca'])])
44-
m.experiment_outputs.update([(m.cb, self.data_i['cb'])])
45-
m.experiment_outputs.update([(m.cc, self.data_i['cc'])])
46-
m.experiment_outputs.update([(m.cd, self.data_i['cd'])])
43+
m.experiment_outputs.update([(m.ca, self.data_i['ca']),
44+
(m.cb, self.data_i['cb']),
45+
(m.cc, self.data_i['cc']),
46+
(m.cd, self.data_i['cd'])])
4747

4848
# experiment standard deviations
4949
m.experiment_outputs_std = pyo.Suffix(direction=pyo.Suffix.LOCAL)
50-
m.experiment_outputs_std.update([(m.ca, self.data_std['ca'])])
51-
m.experiment_outputs_std.update([(m.cb, self.data_std['cb'])])
52-
m.experiment_outputs_std.update([(m.cc, self.data_std['cc'])])
53-
m.experiment_outputs_std.update([(m.cd, self.data_std['cd'])])
50+
m.experiment_outputs_std.update([(m.ca, self.data_std['ca']),
51+
(m.cb, self.data_std['cb']),
52+
(m.cc, self.data_std['cc']),
53+
(m.cd, self.data_std['cd'])])
5454

5555
# no unknowns (theta names)
5656
m.unknown_parameters = pyo.Suffix(direction=pyo.Suffix.LOCAL)
@@ -71,10 +71,10 @@ def label_model(self):
7171

7272
# add experiment standard deviations
7373
m.experiment_outputs_std = pyo.Suffix(direction=pyo.Suffix.LOCAL)
74-
m.experiment_outputs_std.update([(m.ca, self.data_std['ca'])])
75-
m.experiment_outputs_std.update([(m.cb, self.data_std['cb'])])
76-
m.experiment_outputs_std.update([(m.cc, self.data_std['cc'])])
77-
m.experiment_outputs_std.update([(m.cd, self.data_std['cd'])])
74+
m.experiment_outputs_std.update([(m.ca, self.data_std['ca']),
75+
(m.cb, self.data_std['cb']),
76+
(m.cc, self.data_std['cc']),
77+
(m.cd, self.data_std['cd'])])
7878

7979
return m
8080

‎pyomo/contrib/parmest/examples/reactor_design/leaveNout_example.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def main():
3838

3939
# View one model
4040
# exp0_model = exp_list[0].get_labeled_model()
41-
# print(exp0_model.pprint())
41+
# exp0_model.pprint()
4242

4343
pest = parmest.Estimator(exp_list, obj_function='SSE')
4444

‎pyomo/contrib/parmest/examples/reactor_design/likelihood_ratio_example.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def main():
3232

3333
# View one model
3434
# exp0_model = exp_list[0].get_labeled_model()
35-
# print(exp0_model.pprint())
35+
# exp0_model.pprint()
3636

3737
pest = parmest.Estimator(exp_list, obj_function='SSE')
3838

‎pyomo/contrib/parmest/examples/reactor_design/multisensor_data_example.py

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,11 @@ def label_model(self):
4141
m = self.model
4242

4343
m.experiment_outputs = pyo.Suffix(direction=pyo.Suffix.LOCAL)
44-
m.experiment_outputs.update(
45-
[(m.ca, [self.data_i['ca1'], self.data_i['ca2'], self.data_i['ca3']])]
46-
)
47-
m.experiment_outputs.update([(m.cb, [self.data_i['cb']])])
48-
m.experiment_outputs.update([(m.cc, [self.data_i['cc1'], self.data_i['cc2']])])
49-
m.experiment_outputs.update([(m.cd, [self.data_i['cd']])])
44+
m.experiment_outputs.update([
45+
(m.ca, [self.data_i['ca1'], self.data_i['ca2'], self.data_i['ca3']]),
46+
(m.cb, [self.data_i['cb']]),
47+
(m.cc, [self.data_i['cc1'], self.data_i['cc2']]),
48+
(m.cd, [self.data_i['cd']])])
5049

5150
m.unknown_parameters = pyo.Suffix(direction=pyo.Suffix.LOCAL)
5251
m.unknown_parameters.update(
@@ -80,8 +79,8 @@ def SSE_multisensor(model):
8079

8180
# View one model
8281
# exp0_model = exp_list[0].get_labeled_model()
83-
# print(exp0_model.pprint())
84-
# print(SSE_multisensor(exp0_model))
82+
# exp0_model.pprint()
83+
# SSE_multisensor(exp0_model)
8584

8685
pest = parmest.Estimator(exp_list, obj_function=SSE_multisensor)
8786
obj, theta = pest.theta_est()

‎pyomo/contrib/parmest/examples/reactor_design/parameter_estimation_example.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def main():
3131

3232
# View one model
3333
# exp0_model = exp_list[0].get_labeled_model()
34-
# print(exp0_model.pprint())
34+
# exp0_model.pprint()
3535

3636
pest = parmest.Estimator(exp_list, obj_function='SSE')
3737

‎pyomo/contrib/parmest/examples/reactor_design/reactor_design.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,10 @@ def label_model(self):
107107
m = self.model
108108

109109
m.experiment_outputs = pyo.Suffix(direction=pyo.Suffix.LOCAL)
110-
m.experiment_outputs.update([(m.ca, self.data_i['ca'])])
111-
m.experiment_outputs.update([(m.cb, self.data_i['cb'])])
112-
m.experiment_outputs.update([(m.cc, self.data_i['cc'])])
113-
m.experiment_outputs.update([(m.cd, self.data_i['cd'])])
110+
m.experiment_outputs.update([(m.ca, self.data_i['ca']),
111+
(m.cb, self.data_i['cb']),
112+
(m.cc, self.data_i['cc']),
113+
(m.cd, self.data_i['cd'])])
114114

115115
m.unknown_parameters = pyo.Suffix(direction=pyo.Suffix.LOCAL)
116116
m.unknown_parameters.update(

‎pyomo/contrib/parmest/examples/reactor_design/timeseries_data_example.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def SSE_timeseries(model):
6868

6969
# View one model & SSE
7070
# exp0_model = exp_list[0].get_labeled_model()
71-
# print(exp0_model.pprint())
71+
# exp0_model.pprint()
7272
# print(SSE_timeseries(exp0_model))
7373

7474
pest = parmest.Estimator(exp_list, obj_function=SSE_timeseries)

0 commit comments

Comments
 (0)