Skip to content

Commit 9288739

Browse files
committed
Minor string formatting in parmest.py and test_parmest.py
1 parent e6c9f6c commit 9288739

2 files changed

Lines changed: 15 additions & 8 deletions

File tree

‎pyomo/contrib/parmest/parmest.py‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,13 @@ def _build_meas_error_covariance(model, estimated_var=None):
161161
"""
162162
Builds the full measurement-error covariance matrix
163163
164+
Note: The code does not automatically build the full covariance matrix
165+
It only places whatever covariances the user explicitly supplies
166+
The leading-diagonal elements can be constructed automatically or
167+
from user-supplied values
168+
Therefore, for correlation in time, shared timepoints, or other types of
169+
correlation, the user must provide all the desired covariance terms
170+
164171
Parameters
165172
----------
166173
model : ConcreteModel

‎pyomo/contrib/parmest/tests/test_parmest.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1464,11 +1464,11 @@ def test_incorrect_error_covariance_exception(self):
14641464

14651465
obj3, theta3 = pest3.theta_est()
14661466
with pytest.raises(
1467-
KeyError,
1468-
match='One or more experiment outputs are not defined in the '
1469-
'"measurement_error" attribute. All the variables defined '
1470-
'in "experiment_outputs" must be defined as keys in '
1471-
'"measurement_error".',
1467+
KeyError,
1468+
match='One or more experiment outputs are not defined in the '
1469+
'"measurement_error" attribute. All the variables defined '
1470+
'in "experiment_outputs" must be defined as keys in '
1471+
'"measurement_error".',
14721472
):
14731473
pest3.cov_est()
14741474

@@ -1478,9 +1478,9 @@ def test_incorrect_error_covariance_exception(self):
14781478
with pytest.raises(
14791479
KeyError,
14801480
match='One or more experiment outputs are not defined in the '
1481-
'"measurement_error" attribute. All the variables defined '
1482-
'in "experiment_outputs" must be defined as keys in '
1483-
'"measurement_error".',
1481+
'"measurement_error" attribute. All the variables defined '
1482+
'in "experiment_outputs" must be defined as keys in '
1483+
'"measurement_error".',
14841484
):
14851485
obj4, theta4 = pest4.theta_est()
14861486

0 commit comments

Comments
 (0)