Skip to content

Make component data public classes #3221

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.

Sign up for GitHub

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 66 commits into from
Apr 25, 2024
Merged

Make component data public classes #3221

Show file tree
Hide file tree
Changes from 55 commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
a0b9a92
Renamed _ArcData -> ArcData
jsiirola Mar 20, 2024
2f3e940
Renamed _BlockData -> BlockData
jsiirola Mar 20, 2024
c59f91b
Renamed _BooleanVarData -> BooleanVarData
jsiirola Mar 20, 2024
0c72d9f
Renamed _ComplementarityData -> ComplementarityData
jsiirola Mar 20, 2024
e3fe316
Renamed _ConnectorData -> ConnectorData
jsiirola Mar 20, 2024
d4b72d2
Renamed _ConstraintData -> ConstraintData
jsiirola Mar 20, 2024
61c91d0
Renamed _DisjunctData -> DisjunctData
jsiirola Mar 20, 2024
47a7e26
Renamed _DisjunctionData -> DisjunctionData
jsiirola Mar 20, 2024
4320bc1
Renamed _ExpressionData -> ExpressionData
jsiirola Mar 20, 2024
8619230
Renamed _FiniteRangeSetData -> FiniteRangeSetData
jsiirola Mar 20, 2024
4ea182d
Renamed _FiniteSetData -> FiniteSetData
jsiirola Mar 20, 2024
3a86baa
Renamed _GeneralBooleanVarData -> GeneralBooleanVarData
jsiirola Mar 20, 2024
80c064a
Renamed _GeneralConstraintData -> GeneralConstraintData
jsiirola Mar 20, 2024
da96ac3
Renamed _GeneralExpressionData -> GeneralExpressionData
jsiirola Mar 20, 2024
cd5db66
Renamed _GeneralLogicalConstraintData -> GeneralLogicalConstraintData
jsiirola Mar 20, 2024
6e9d84c
Renamed _GeneralObjectiveData -> GeneralObjectiveData
jsiirola Mar 20, 2024
aa79e1b
Renamed _GeneralVarData -> GeneralVarData
jsiirola Mar 20, 2024
edd83c0
Renamed _InfiniteRangeSetData -> InfiniteRangeSetData
jsiirola Mar 20, 2024
b5c9dba
Renamed _InsertionOrderSetData -> InsertionOrderSetData
jsiirola Mar 20, 2024
d4d522a
Renamed _LogicalConstraintData -> LogicalConstraintData
jsiirola Mar 20, 2024
c37fc4f
Renamed _ObjectiveData -> ObjectiveData
jsiirola Mar 20, 2024
4127432
Renamed _OrderedSetData -> OrderedSetData
jsiirola Mar 20, 2024
ec3f121
Renamed _ParamData -> ParamData
jsiirola Mar 20, 2024
8c968e3
Renamed _PiecewiseData -> PiecewiseData
jsiirola Mar 20, 2024
590e21f
Renamed _PortData -> PortData
jsiirola Mar 20, 2024
199ee00
Renamed _SetData -> SetData
jsiirola Mar 20, 2024
43c7c40
Renamed _SortedSetData -> SortedSetData
jsiirola Mar 20, 2024
63152a0
Renamed _SOSConstraintData -> SOSConstraintData
jsiirola Mar 20, 2024
430f982
Renamed _SuffixData -> SuffixData
jsiirola Mar 20, 2024
f810600
Renamed _VarData -> VarData
jsiirola Mar 21, 2024
0e994fa
Revert "Renamed _SuffixData -> SuffixData"
jsiirola Mar 21, 2024
b1a7b30
Update ComponentData imports, provide deprecation paths
jsiirola Mar 21, 2024
1e5b54e
Mrege GeneralVarData into VarData class
jsiirola Mar 21, 2024
cf7ff53
Update references from GeneralVarData to VarData
jsiirola Mar 21, 2024
458c84e
Merge GeneralBooleanVarData into BooelanVarData class
jsiirola Mar 21, 2024
015a4f8
Update references from GeneralBooleanVarData to BooelanVarData
jsiirola Mar 21, 2024
0cbfcb7
Restore deprecation path for GeneralVarData
jsiirola Mar 21, 2024
adfe72b
Merge GeneralLogicalConstraintData into LogicalConstratintData
jsiirola Mar 21, 2024
a27b879
Merge GeneralObjectiveData into ObjectiveData
jsiirola Mar 21, 2024
13c11e5
Update references from GeneralObjectiveData to ObjectiveData
jsiirola Mar 21, 2024
787eaf0
Rename _ExpressionData, _GeneralExpressionDataImpl -> NamedExpression…
jsiirola Mar 21, 2024
74b7918
Update *ExpressionData* referencces
jsiirola Mar 21, 2024
47bb04f
Add missing method from GeneralLogicalConstraintData merge
jsiirola Mar 21, 2024
d26a83f
NFC: fix typo
jsiirola Mar 21, 2024
db7b6b2
Update ComponentData references in APPSI
jsiirola Mar 21, 2024
5b48eb2
Merge GeneralConstraintData into ConstraintData
jsiirola Mar 21, 2024
97ad3c0
Update references from GeneralConstraintData to ConstraintData
jsiirola Mar 21, 2024
ef522d9
Fix base class
jsiirola Mar 21, 2024
a573244
Rename _ComponentBase -> ComponentBase
jsiirola Mar 23, 2024
b75a974
Remove _SetDataBase
jsiirola Mar 23, 2024
4d8e1c3
Move from isinstance to ctype for verifying component type
jsiirola Mar 31, 2024
d4da849
Merge branch 'main' into make-comp-data-public
jsiirola Mar 31, 2024
9d4b913
NFC: apply black
jsiirola Apr 1, 2024
072b11b
Merge branch 'main' into make-comp-data-public
jsiirola Apr 2, 2024
9a06271
Merge branch 'main' into make-comp-data-public
jsiirola Apr 4, 2024
eadd1fa
Merge branch 'main' into make-comp-data-public
jsiirola Apr 10, 2024
88535d4
Remove remaining references to '_.*Data' classes
jsiirola Apr 10, 2024
b235295
calculate_variable_from_constraint: add check for indexed constraint
jsiirola Apr 10, 2024
76cd746
NFC: Update docstring to fix typo and copy/paste errors
jsiirola Apr 10, 2024
232be20
Remove duplicate imports
jsiirola Apr 18, 2024
354cadf
Revert accidental test name change
jsiirola Apr 18, 2024
37915b4
Fix docstring, add Objectives as known type to FBBT
jsiirola Apr 18, 2024
e35d537
Fix docstring
jsiirola Apr 18, 2024
102223f
NFC: clarify NamedExpressionData docstring
jsiirola Apr 22, 2024
ac9d8ed
Merge branch 'main' into make-comp-data-public
jsiirola Apr 25, 2024
41f5630
Merge branch 'main' into make-comp-data-public
blnicho Apr 25, 2024
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
4 changes: 2 additions & 2 deletions pyomo/common/tests/test_timing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
Any,
TransformationFactory,
)
from pyomo.core.base.var import _VarData
from pyomo.core.base.var import VarData


class _pseudo_component(Var):
Expand All @@ -62,7 +62,7 @@ def test_raw_construction_timer(self):
)
v = Var()
v.construct()
a = ConstructionTimer(_VarData(v))
a = ConstructionTimer(VarData(v))
self.assertRegex(
str(a),
r"ConstructionTimer object for Var ScalarVar\[NOTSET\]; "
Expand Down
Loading