Skip to content
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

Extend flattener to allow multiple sets #1768

Merged
merged 48 commits into from
Jan 27, 2021
Merged

Extend flattener to allow multiple sets #1768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
9954229
function to create a slice for a particular set
Robbybp Dec 2, 2020
ea53e7a
function for generating sliced components
Robbybp Dec 2, 2020
3494653
function to get flattened components
Robbybp Dec 2, 2020
30cbc19
bug fix for higher-dimen, non-product sets
Robbybp Dec 2, 2020
92fdb51
add test with Constraint.Skip
Robbybp Dec 2, 2020
543e1b1
cross product sets in a single function call
Robbybp Dec 2, 2020
903c05a
Catch errors when attempting to iterate over entire index set
Robbybp Dec 2, 2020
c13a87e
comments
Robbybp Dec 8, 2020
e844ec0
comments, mostly
Robbybp Dec 15, 2020
349bb77
tests for new flattener
Robbybp Dec 15, 2020
89e6961
catch invalid component after call
Robbybp Dec 15, 2020
f38eaab
extract first entry of len-1 index for compatibility with flatten==False
Robbybp Dec 15, 2020
bf47abd
test with multi-dim sets when flatten==False
Robbybp Dec 15, 2020
92bd30f
beginning test for flattening along a 2-d set
Robbybp Dec 16, 2020
391855a
a few lines for debugging
Robbybp Dec 18, 2020
afa91de
Merge branch 'master' of https://github.com/Pyomo/pyomo into flatten-…
Robbybp Dec 18, 2020
6b30f95
lines for debugging
Robbybp Dec 20, 2020
f1b4686
comments
Robbybp Dec 20, 2020
a1bfa4a
typo
Robbybp Dec 20, 2020
2a6ea20
tests that flatten over multi-dimensional sets
Robbybp Dec 20, 2020
986e774
comment about an edge case
Robbybp Dec 20, 2020
6eef67d
remove commented code
Robbybp Dec 31, 2020
1d9fed6
add index_map argument that does nothing yet
Robbybp Dec 31, 2020
8b7f828
use indices that were specified to descend into blocks
Robbybp Dec 31, 2020
1ba53d8
use supplied indices when all sets must be sliced
Robbybp Jan 1, 2021
91a45e4
tests that use supplied indices
Robbybp Jan 1, 2021
7564598
checkout changes from other branch
Robbybp Jan 2, 2021
f8722ff
remove test for KeyError with blocks
Robbybp Jan 2, 2021
2cb6b18
remove comments and comment out unused `except KeyError`
Robbybp Jan 2, 2021
7694ba1
remove done todos
Robbybp Jan 2, 2021
d9f18b1
add test for flattening three sets
Robbybp Jan 3, 2021
11e14f8
allow indices argument in flatten_dae_components
Robbybp Jan 3, 2021
bbdde0b
remove index_stack argument
Robbybp Jan 3, 2021
3cf3f42
docstrings
Robbybp Jan 3, 2021
248c0c1
remove unused code
Robbybp Jan 3, 2021
f00e1be
docstring
Robbybp Jan 3, 2021
157291c
remove new code not needed by this branch
Robbybp Jan 3, 2021
b43e67f
Merge branch 'master' of https://github.com/Pyomo/pyomo into flatten-…
Robbybp Jan 4, 2021
79805fc
Merge branch 'master' into flatten-multiple
blnicho Jan 15, 2021
c7db719
Merge branch 'master' into flatten-multiple
jsiirola Jan 19, 2021
cef6bfe
Python 2.7 compatibility fixes
jsiirola Jan 19, 2021
467e745
Merge branch 'master' into flatten-multiple
jsiirola Jan 19, 2021
c4fb599
Merge branch 'master' of https://github.com/Pyomo/pyomo into flatten-…
Robbybp Jan 22, 2021
0f20f27
Merge branch 'flatten-multiple' of https://github.com/Robbybp/pyomo i…
Robbybp Jan 26, 2021
2314548
updating docstrings and comments per review
Robbybp Jan 26, 2021
0507a52
reference issue for slicing higher dimen sets with flatten==False
Robbybp Jan 26, 2021
bcd22e6
more descriptive model names
Robbybp Jan 26, 2021
7c26253
rename _slice to slice_
Robbybp Jan 26, 2021
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
Loading