Overhaul PyROS Preprocessor Subroutine and Subproblem Objects #3341
Conversation
|
That's it for updates post #3382. |
| m.con1 = Constraint(expr=m.x1 * m.u1 ** (0.5) - m.x2 * m.u1 <= 2) | ||
| m.con2 = Constraint(expr=m.x1**2 - m.x2**2 * m.u1 == m.x3) |
There was a problem hiding this comment.
A suggestion that won't hold up this PR - it looks like you have a similar (if not exactly the same) model across multiple test suites. It is more maintainable to define a "model-creation" function that you can call so you don't have duplicate code.
| m.con1 = Constraint(expr=m.x1 * m.u1 ** (0.5) - m.x2 * m.u1 <= 2) | ||
| m.con2 = Constraint(expr=m.x1**2 - m.x2**2 * m.u1 == m.x3) | ||
|
|
There was a problem hiding this comment.
(An example of the repeat I mentioned above)
|
|
||
|
|
||
| import logging | ||
| import unittest |
There was a problem hiding this comment.
As a general note across all the tests - you probably want to do:
import pyomo.common.unittest as unittest
We have a lot of extra capabilities in addition to the standard unittest offerings that are Pyomo-specific and generally helpful.
|
|
||
| import logging | ||
| import textwrap | ||
| import unittest |
There was a problem hiding this comment.
As a general note across all the tests - you probably want to do:
import pyomo.common.unittest as unittest
We have a lot of extra capabilities in addition to the standard unittest offerings that are Pyomo-specific and generally helpful.
|
|
||
| import logging | ||
| import time | ||
| import unittest |
There was a problem hiding this comment.
As a general note across all the tests - you probably want to do:
import pyomo.common.unittest as unittest
We have a lot of extra capabilities in addition to the standard unittest offerings that are Pyomo-specific and generally helpful.
| param_var_data_list : list of VarData | ||
| Variable data objects representing the main uncertain | ||
| parameters. | ||
| conlist : ConstraintList |
There was a problem hiding this comment.
The nit-pickiest of nit-picks: con_list (because you use underscores in param_var_data_list and auxiliary_var_list)
Fixes #2964.
Summary/Motivation:
Driven by recent algorithmic developments of the PyROS preprocessor, this PR implements sweeping changes to the PyROS preprocessor subroutine and subproblem formulations/object structures.
Changes proposed in this PR:
Update PyROS as follows:
UncertaintySetclass and pre-implemented subclasses to facilitate changes to the subproblemsUncertaintySet.set_as_constraintto make auxiliary uncertain parameters easier to trackCardinalitySetandFactorModelSetclassesFactorModelSetinstances to those for whichpsi_matis full column rankIntersectionSetcore.expr.compare.assertExpressionsEqual) for more precise model testingpoint_in_set,set_as_constraintTODO
ParameterizedQuadraticRepnand corresponding expression walker #3324 merged) useParameterizedQuadraticRepnVisitorin lieu ofgenerate_standard_repnLegal Acknowledgement
By contributing to this software project, I have read the contribution guide and agree to the following terms and conditions for my contribution: