-
Notifications
You must be signed in to change notification settings - Fork 9
Feature/aggregate rework v2 #540
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
Draft
FBumann
wants to merge
196
commits into
main
Choose a base branch
from
feature/aggregate-rework-v2
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from 143 commits
Commits
Show all changes
196 commits
Select commit
Hold shift + click to select a range
8ac58f5
Temp
FBumann e579a11
Add n_segments
FBumann 16cffe1
Update CHANGELOG.md
FBumann 139dc89
Use deep copy
FBumann 60dd670
Add notebook for clustering
FBumann 8c03f64
Update notebook
FBumann 9fdc53d
Fix multi period and multi scenario clsutering
FBumann a9a442d
Improve
FBumann b29460b
Exclude solution when clustering
FBumann 44aa5db
Use pre-buildt flow_system
FBumann fe87396
Improve notebook
FBumann 584e907
Added new system to notebook defaults
FBumann f47ef38
Use realistic flow system in notebooks
FBumann b0c9166
Merge branch 'feature/flow-system-first' into feature/better-tsam-int…
FBumann 1bfdc56
add segmentation to notebooks
FBumann 6aebd18
fix cluster_multi_dimensional_data
FBumann c0c7c45
fix notebooks to only create flow_system if needed
FBumann db3e37e
Fix inter-cluster segmentation
FBumann bcf7136
Improve notebook to use more segments
FBumann 6b5a638
Improve notebook to use more segments
FBumann e20775f
Fix Data_DIR in notebooks
FBumann 6fdd684
Group constraints and varaibles form clustering together
FBumann 76af019
Only equalize SOME variables
FBumann b7c5d60
Always fix binaries for better pre-solve
FBumann 737f354
Group constraints and varaibles form clustering together
FBumann 79db532
Improve readybility of clustering equations
FBumann 2f38e7c
Add IO for clustering
FBumann 96e0826
Add IO for clustering
FBumann e8ab4b8
Add IO for clustering
FBumann c74c5e7
Improve clustering
FBumann 933c878
Improve clustering organization
FBumann f96d9f2
Improve clustering organization
FBumann 2eb0ee4
Improve clustering organization
FBumann 5f114f5
Improve clustering organization
FBumann 529ef50
Improve clustering organization
FBumann f253832
Add external tsam support with data aggregation
FBumann ae37039
Add external tsam support with data aggregation
FBumann 088bf4d
fix: Multi period clustering: Each period now gets its own clustering…
FBumann 189b7d0
Temp
FBumann f92311a
Add expand_solution()
FBumann 68be8f5
fix
FBumann 4102148
Add notebook
FBumann 0eac20a
fix
FBumann 85a73cb
Improve wording
FBumann e727652
Temp
FBumann 1827578
Temp
FBumann f33d31b
Weight Concepts (Final Naming)
FBumann 7050db3
Temp
FBumann 4673bc5
Temp
FBumann b2e71d7
Fix script for docs
FBumann 05dd8da
Update notebook
FBumann 4341cec
Fix clsuter weight applying
FBumann 87fd661
Fix storage initial=final issue in clustering
FBumann 2dc39e4
Improve notebooks
FBumann 3c0e986
clsuter reduce does remoce regular cyclic storage behaviour
FBumann f2272d0
Fix cluster weightings when expanding and in statistics_accessor.py
FBumann c7155e8
Improve cluster weighting
FBumann 7126207
1. Each period gets its own cluster weights based on its clustering
FBumann acff2b1
Improve code
FBumann 85c2d7e
Add new aggregation module
FBumann 78639df
Improve terminology
FBumann 97befe1
Remove legacy clustering
FBumann b987bfd
Update CHANGELOG.md
FBumann bbebb96
Update notebooks
FBumann e8afe18
Update notebooks
FBumann 00e7508
Update notebooks and fix storage inital=equal
FBumann 0badd14
Update notebooks and fix storage inital=equal
FBumann aa20391
Remove old clustering code
FBumann cf54be5
Remove old clustering code
FBumann 71d010a
Remove old clustering code
FBumann bfc81d2
Update notebooks
FBumann a56d1f8
Update notebooks
FBumann 1faaaf0
⎿ ☒ Rename cluster_reduce() to cluster() in transform_accessor.py
FBumann 3b88722
⏺ Summary
FBumann f653269
terminology unification is complete. All references have been renamed:
FBumann 6cb06b1
Made cluster_order and timestep_mapping multi-dimensional to store p…
FBumann 3e55faa
fix
FBumann d0f37cf
Update notebooks
FBumann d4bbcfe
simplified:
FBumann 83a4603
Improve notebook
FBumann 04a8030
Improve plotting
FBumann 486929a
Improve plotting
FBumann 4d6dcc0
Improve repr
FBumann 33dd89b
Simplify notebook
FBumann 8177c2e
Update API
FBumann 126cbf4
Update API
FBumann 88248db
Update API
FBumann e0f28a8
Update API
FBumann 56b1ae2
Update API
FBumann 5319077
Update notebooks
FBumann 259e02b
Update plotting
FBumann cf512bc
Parameter Naming (Aligned with StatisticsPlotAccessor)
FBumann 94fba48
Update low api method
FBumann d7e7faf
Update heatmap t accept animation frame
FBumann 11a6304
Simplify compare method in clustering
FBumann a810878
Simplify compare method in clustering
FBumann 6dc1979
Simplify compare method in clustering
FBumann f1ceac5
Simplify compare method in clustering
FBumann be103b8
improve API
FBumann ccec025
Add intra_cluster_mask to clustering for storage linking
FBumann f56f23e
Add intra_cluster_mask to clustering for storage linking
FBumann e49ed1b
Temp
FBumann 2b084b3
Revert "Temp"
FBumann 8fae0f0
fix intra_cluster_mask
FBumann d202b18
Change to cluster_start_mask
FBumann 9d95ae0
Fix storage cluster decoupling
FBumann 6b030c7
Switch cluster start indexing
FBumann b4dd428
Improve cluster indexing in Storage
FBumann ecb2c9d
Improve cluster indexing in Storage
FBumann 355a205
Add more storag options when clustering
FBumann 3c0203a
Add more storag options when clustering
FBumann 1612599
Add more storag options when clustering
FBumann d6b82b5
Add more storag options when clustering
FBumann 97ba243
Add more storag options when clustering
FBumann 1b62c2c
Fix storage masking
FBumann 8d026b5
Fix semantics: aggregation-> clsutering
FBumann ac6e58a
Add seasonal storage example
FBumann 44e1832
Update notebook to show off storage modes
FBumann a59ef62
⏺ All changes complete. Here's a summary:
FBumann 1c0e678
Update the notebooks
FBumann a6e5bd4
Update parameter name
FBumann a84543b
FIx clustered Storage
FBumann a8db4d7
FIx clustered Storage
FBumann c0ddab3
FIx clustered Storage
FBumann 325534e
The refactoring is complete. Here's a summary of what was done:
FBumann 2a36a64
The inter-cluster linking in StorageModel has been refactored to be …
FBumann 0142272
Temp
FBumann b334699
Temp
FBumann db6e89a
Set start SOC in intercluster model when non cyclic
FBumann 55fb607
Simplify cyclic constraint
FBumann d610da7
Improve Storage Model
FBumann 5a2f08e
Add plan
FBumann c099b0b
Update plan
FBumann c048496
Update plan
FBumann d126511
Update plan
FBumann 8f9bae8
Update plan
FBumann aa9653b
Update plan
FBumann 06ad42b
Update plan I've completed the infrastructure for true (cluster, tim…
FBumann 934c97d
Temp
FBumann 949c903
Temp
FBumann 923cd47
Temp
FBumann c18a126
Temp
FBumann 11d90e9
Temp
FBumann 4c7aeca
Temp
FBumann 322d3c1
Temp
FBumann 611c752
Temp
FBumann f232e0b
nitpicks and fixes
FBumann e200441
Temp
FBumann 19f149f
Temp
FBumann 82ac4c2
Temp
FBumann d1baccb
Temp
FBumann 78ab16c
Temp
FBumann 97a3440
Temp
FBumann 5e4a856
Temp
FBumann d91c7e4
Better plotting defaults
FBumann 3e07bca
timesteps (96) and timesteps_extra (97) correctly match the 2D (clust…
FBumann e5c3cf3
Revert storage energy balance reorder
FBumann d78179b
⏺ Both clustered and non-clustered FlowSystems work correctly.
FBumann 8815eaa
minor simplifications
FBumann 5df515f
Add options for states in cluster mode
FBumann fcf2269
Revert "Add options for states in cluster mode"
FBumann 820fe6a
Update tests
FBumann 12950f6
Fix expand_solution()
FBumann f4ef741
Fix Storage
FBumann 937f4e2
Recombine charge state in intercluster mode
FBumann 116415a
Fix storage model
FBumann 358af3c
Summary of Changes
FBumann b8540ed
Feature/better data for notebooks (#542)
FBumann d488e85
Fix notebook
FBumann 14abf85
add catchwarning and fix example system
FBumann dcea667
improve notebook
FBumann 7014689
Improve docs, changelog and add tests
FBumann 974df60
Merge remote-tracking branch 'origin/feature/aggregate-rework-v2' int…
FBumann 702803a
Fix plotting animation handling
FBumann ab9a519
fix: cluster handling in temporal shares
FBumann 300ea33
Change logging in clustering
FBumann 9a8cd27
Fix imports and warnings
FBumann 8e80478
Merge remote-tracking branch 'origin/feature/aggregate-rework-v2' int…
FBumann 3ba9730
Fix netcdf warnings
FBumann 325f4eb
Fix notebooks to not save to netcdf
FBumann 282594c
Warning Handling Refactored
FBumann b178598
Feature: Clustering IO, single selection, and weights API improvement…
FBumann 93e7152
Feature: fxplot Plotting Accessor (#548)
FBumann bf6962c
ci: Speedup Notebook execution (#551)
FBumann d4dd58b
Simplify notebooks
FBumann 7b74846
Created helper module: docs/notebooks/data/tutorial_data.py
FBumann b1fa086
Removed animation_frame from the method signature, docstring, and up…
FBumann 5f37003
Add missing notebooks to docs
FBumann 184513e
Fix ci
FBumann 0439d10
Fix ci
FBumann cfe8b9c
Add tutorial_data.py
FBumann c9bd406
Retrigger ci
FBumann 7dcacfd
Merge branch 'main' into feature/aggregate-rework-v2
FBumann c94f6da
Clustering Parameter Refinements & Unified Slot Assignment (#552)
FBumann 4f1d827
Add tutorial data back to ntoebooks
FBumann 5ea8651
Feature/comparison (#550)
FBumann File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🧩 Analysis chain
🏁 Script executed:
Repository: flixOpt/flixopt
Length of output: 249
Fix module name in CHANGELOG.md to match actual exports.
The changelog documents
flixopt.aggregationas the new module, but the actual code exportsflixopt.clustering(see flixopt/init.py:16). Update the changelog to reference the correct module name.🤖 Prompt for AI Agents