Skip to content

Bugfixes in ParmEst and DoE #3512

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Mar 12, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions pyomo/contrib/doe/doe.py
Original file line number Diff line number Diff line change
Expand Up @@ -551,6 +551,9 @@ def _sequential_FIM(self, model=None):
"Model from experiment did not solve appropriately. Make sure the model is well-posed."
)

# Reset value of parameter to default value before computing finite difference perturbation
param.set_value(model.unknown_parameters[param])

# Extract the measurement values for the scenario and append
measurement_vals.append(
[pyo.value(k) for k, v in model.experiment_outputs.items()]
Expand Down Expand Up @@ -2140,7 +2143,7 @@ def get_unknown_parameter_values(self, model=None):
if not hasattr(model, "unknown_parameters"):
if not hasattr(model, "scenario_blocks"):
raise RuntimeError(
"Model provided does not have expected structure. Please make sure model is built properly before calling `get_experiment_input_values`"
"Model provided does not have expected structure. Please make sure model is built properly before calling `get_unknown_parameter_values`"
)

theta_vals = [
Expand Down Expand Up @@ -2174,15 +2177,15 @@ def get_experiment_output_values(self, model=None):
if not hasattr(model, "experiment_outputs"):
if not hasattr(model, "scenario_blocks"):
raise RuntimeError(
"Model provided does not have expected structure. Please make sure model is built properly before calling `get_experiment_input_values`"
"Model provided does not have expected structure. Please make sure model is built properly before calling `get_experiment_output_values`"
)

y_hat_vals = [
pyo.value(k)
for k, v in model.scenario_blocks[0].measurement_error.items()
for k, v in model.scenario_blocks[0].experiment_outputs.items()
]
else:
y_hat_vals = [pyo.value(k) for k, v in model.measurement_error.items()]
y_hat_vals = [pyo.value(k) for k, v in model.experiment_outputs.items()]

return y_hat_vals

Expand Down Expand Up @@ -2210,7 +2213,7 @@ def get_measurement_error_values(self, model=None):
if not hasattr(model, "measurement_error"):
if not hasattr(model, "scenario_blocks"):
raise RuntimeError(
"Model provided does not have expected structure. Please make sure model is built properly before calling `get_experiment_input_values`"
"Model provided does not have expected structure. Please make sure model is built properly before calling `get_measurement_error_values`"
)

sigma_vals = [
Expand Down
6 changes: 3 additions & 3 deletions pyomo/contrib/doe/tests/test_doe_errors.py
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@ def test_reactor_check_get_exp_outputs_without_model(self):

with self.assertRaisesRegex(
RuntimeError,
"Model provided does not have expected structure. Please make sure model is built properly before calling `get_experiment_input_values`",
"Model provided does not have expected structure. Please make sure model is built properly before calling `get_experiment_output_values`",
):
doe_obj.get_experiment_output_values()

Expand All @@ -517,7 +517,7 @@ def test_reactor_check_get_unknown_params_without_model(self):

with self.assertRaisesRegex(
RuntimeError,
"Model provided does not have expected structure. Please make sure model is built properly before calling `get_experiment_input_values`",
"Model provided does not have expected structure. Please make sure model is built properly before calling `get_unknown_parameter_values`",
):
doe_obj.get_unknown_parameter_values()

Expand All @@ -536,7 +536,7 @@ def test_reactor_check_get_meas_error_without_model(self):

with self.assertRaisesRegex(
RuntimeError,
"Model provided does not have expected structure. Please make sure model is built properly before calling `get_experiment_input_values`",
"Model provided does not have expected structure. Please make sure model is built properly before calling `get_measurement_error_values`",
):
doe_obj.get_measurement_error_values()

Expand Down
5 changes: 4 additions & 1 deletion pyomo/contrib/parmest/parmest.py
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,10 @@ def __init__(
for experiment in self.exp_list:
model = experiment.get_labeled_model()
theta_names.extend([k.name for k, v in model.unknown_parameters.items()])
self.estimator_theta_names = list(set(theta_names))
# Utilize list(dict.fromkeys(theta_names)) to preserve parameter
# order compared with list(set(theta_names)), which had
# nondeterministic ordering of parameters
self.estimator_theta_names = list(dict.fromkeys(theta_names))

self._second_stage_cost_exp = "SecondStageCost"
# boolean to indicate if model is initialized using a square solve
Expand Down
Loading