Repository navigation

Feature/v3/invest multi period - #452

Closed

FBumann wants to merge 388 commits into

mainfrom

feature/v3/invest-multi-period

Closed

Feature/v3/invest multi period#452
FBumann wants to merge 388 commits into
mainfrom
feature/v3/invest-multi-period

This pull request is big! We're only showing the most recent 250 commits

Commits on Jun 28, 2025
- Change Transmission to have a "balanced" attribute. Change Tests accordingly
  FBumann
  committed
  15fd124
- Improve index validations
  FBumann
  committed
  d0b231d
Commits on Jun 29, 2025
- rename method in tests
  FBumann
  committed
  4ebe6a5
- Update DataConverter
  FBumann
  committed
  6b56dac
- Add DataFrame Support back
  FBumann
  committed
  a7ec994
- Add copy() to DataConverter
  FBumann
  committed
  2a75ed3
- Update fit_to_model_coords to take a list of coords
  FBumann
  committed
  dae9f01
- Make the DataConverter more universal by accepting a list of coords/dims
  FBumann
  committed
  ba195ff
- Update DataConverter for n-d arrays
  FBumann
  committed
  605f034
- Update DataConverter for n-d arrays
  FBumann
  committed
  6560006
- Add extra tests for 3-dims
  FBumann
  committed
  78132ef
Commits on Jun 30, 2025
- Add FLowSystemDimension Type
  FBumann
  committed
  a53c116
- Revert some logic about the fit_to_model coords
  FBumann
  committed
  2cb551b
- Adjust FLowSystem IO for scenarios
  FBumann
  committed
  d7be766
- BUGFIX: Raise Exception instead of logging
  FBumann
  committed
  e60dd07
- Change usage of TimeSeriesData
  FBumann
  committed
  bd2f1b8
- Adjust logic to handle non scalars
  FBumann
  committed
  a7da9d2
- Adjust logic to _resolve_dataarray_reference into separate method
  FBumann
  committed
  b8f0e22
- Update IO of FlowSystem
  FBumann
  committed
  7123b6b
Commits on Jul 2, 2025
- Improve get_coords()
  FBumann
  committed
  fa5475d
- Adjust FlowSystem init for correct IO
  FBumann
  committed
  80cb161
- Add scenario to sel and isel methods, and dont normalize scenario weights
  FBumann
  committed
  81ad3ba
- Improve scenario_weights_handling
  FBumann
  committed
  691a45e
- Add warning for not scaled weights
  FBumann
  committed
  3931ac5
- Update test_scenarios.py
  FBumann
  committed
  75a45e1
- Improve util method
  FBumann
  committed
  2882147
- Add objective to solution dataset.
  FBumann
  committed
  50491ff
- Update handling of scenario_weights update tests
  FBumann
  committed
  4f3a798
- Ruff check. Fix type hints
  FBumann
  committed
  314aef9
Commits on Jul 3, 2025
- Fix type hints and improve None handling
  FBumann
  committed
  0302947
- Fix coords in AggregatedCalculation
  FBumann
  committed
  40c437a
- Improve Error Messages of DataConversion
  FBumann
  committed
  8d2d208
- Allow multi dim data conversion and broadcasting by length
  FBumann
  committed
  9c0c95f
- Improve DataConverter to handle multi-dim arrays
  FBumann
  committed
  d568ad6
Commits on Jul 5, 2025
- Rename methods and remove unused code
  FBumann
  committed
  ffc196a
- Improve DataConverter by better splitting handling per datatype. Series only matches index (for one dim). Numpy matches shape
  FBumann
  committed
  6142f44
- Add test for error handling
  FBumann
  committed
  cec7367
- Update scenario example
  FBumann
  committed
  eba1ec4
Commits on Jul 7, 2025
- Fix Handling of TimeSeriesData
  FBumann
  committed
  5f97bf3
- Improve DataConverter
  FBumann
  committed
  9351083
Commits on Jul 15, 2025
- Fix resampling of the FlowSystem
  FBumann
  committed
  99e6b19
- Improve Warning Message
  FBumann
  committed
  4981a9c
- Add example that leverages resampling
  FBumann
  committed
  516f45b
Commits on Jul 16, 2025
- Add example that leverages resampling adn fixing of Investments
  FBumann
  committed
  ef0acfc
- Add flag to Calculation if its modeled
  FBumann
  committed
  706c1ec
- Make flag for connected_and_transformed FLowSystem public
  FBumann
  committed
  a4cdb43
- Make Calcualtion Methods return themselfes to make them chainable
  FBumann
  committed
  148a852
- Improve example
  FBumann
  committed
  61755f9
- Improve Unreleased CHANGELOG.md
  FBumann
  committed
  66f6a86
- Add year coord to FlowSystem
  FBumann
  committed
  a757e7f
- Improve dimension handling
  FBumann
  committed
  941d93f
- Change plotting to use an indexer instead
  FBumann
  committed
  745e885
- Change plotting to use an indexer instead
  FBumann
  committed
  c9bae2a
- Use tuples to set dimensions in Models
  FBumann
  committed
  d1b5509
- Bugfix in validation logic and test
  FBumann
  committed
  c7568dd
- Improve Errors
  FBumann
  committed
  fc62634
- Improve weights handling and rescaling if None
  FBumann
  committed
  e320b9f
- Fix typehint
  FBumann
  committed
  33a22aa
- Update Broadcasting in Storage Bounds and improve type hints
  FBumann
  committed
  904211f
- Make .get_model_coords() return an actual xr.Coordinates Object
  FBumann
  committed
  3c6c08b
Commits on Jul 17, 2025
- Improve get_coords()
  FBumann
  committed
  22a1cef
- Rename SystemModel to FlowSystemModel
  FBumann
  committed
  44dbefc
Commits on Jul 18, 2025
- First steps
  FBumann
  committed
  f82556a
- Improve Feature Patterns
  FBumann
  committed
  33460a0
- Improve acess to variables via short names
  FBumann
  committed
  ff70674
- Improve
  FBumann
  committed
  fa5e30a
- Add naming options to big_m_binary_bounds()
  FBumann
  committed
  a3511f9
- Fix and improve FLowModeling with Investment
  FBumann
  committed
  404dc03
- Improve
  FBumann
  committed
  1ad74ce
- Tyring to improve the Methods for bounding variables in different scenarios
  FBumann
  committed
  d1408a4
- Improve BoundingPatterns
  FBumann
  committed
  ab000ca
- Improve BoundingPatterns
  FBumann
  committed
  2afc24e
- Improve BoundingPatterns
  FBumann
  committed
  b248f58
- Fix duration Modeling
  FBumann
  committed
  d34445c
- Fix On + Size
  FBumann
  committed
  bde07b4
Commits on Jul 19, 2025
- Fix InvestmentModel
  FBumann
  committed
  5861b28
- Fix Models
  FBumann
  committed
  7809ee4
- Update constraint names in test
  FBumann
  committed
  2bbdb44
- Fix OnOffModel for multiple Flows
  FBumann
  committed
  2a01abe
- Update constraint names in tests
  FBumann
  committed
  1f1ebb7
- Simplify
  FBumann
  committed
  c7b351f
- Improve handling of vars/cons and models
  FBumann
  committed
  5d9b591
Commits on Jul 20, 2025
- Revising the basic structure of a class Model
  FBumann
  committed
  5c56b63
- Revising the basic structure of a class Model
  FBumann
  committed
  9d242b6
Commits on Jul 21, 2025
- Simplify and focus more on own Model class
  FBumann
  committed
  0997843
- Update tests
  FBumann
  committed
  1d6ef97
- Improve state computation in ModelingUtilities
  FBumann
  committed
  972cb90
- Improve handling of previous flowrates
  FBumann
  committed
  29bec8c
- Imropove repr and submodel acess
  FBumann
  committed
  370ac94
- Update access pattern in tests
  FBumann
  committed
  0f89ff0
- Fix PiecewiseEffects and StorageModel
  FBumann
  committed
  4781cff
- Fix StorageModel and Remove PreventSimultaniousUseModel
  FBumann
  committed
  333ab83
- Fix Aggregation and SegmentedCalculation
  FBumann
  committed
  9702303
- Update tests
  FBumann
  committed
  91bd461
- Loosen precision in tests
  FBumann
  committed
  94314c3
- Update test_on_hours_computation.py and some types
  FBumann
  committed
  50cc2cb
- Rename class Model to Submodel
  FBumann
  committed
  e52f800
- rename sub_model to submodel everywhere
  FBumann
  committed
  9281256
- rename self.model to self.submodel everywhere
  FBumann
  committed
  9001c6a
- Rename .model with .submodel if its only a submodel
  FBumann
  committed
  286a8b7
- Rename .sub_models with .submodels
  FBumann
  committed
  ae1752b
Commits on Jul 22, 2025
- Improve repr
  FBumann
  committed
  1822384
- Improve repr
  FBumann
  committed
  2aa9d4b
- Include def do_modeling() into __init__() of models
  FBumann
  committed
  5ca9707
- Make properties private
  FBumann
  committed
  7e04399
- Improve Inheritance of Models
  FBumann
  committed
  4f95ebc
- Merge branch 'main' into v3.0.0/main
  FBumann
  committed
  f73fe99
- V3.0.0/plotting (#285)
  FBumann
  authored
  2d9c920
- ruff check
  FBumann
  committed
  5fd05e3
- Improve typehints
  FBumann
  committed
  20a1964
- Update CHANGELOG.md
  FBumann
  committed
  9b05f8f
- Bugfix from renaming to .submodel
  FBumann
  committed
  4d7fd29
Commits on Jul 23, 2025
- Bugfix from renaming to .submodel
  FBumann
  committed
  3626517
- Improve indexer in results plotting
  FBumann
  committed
  50fbb67
- rename register_submodel() to .add_submodels() adn add SUbmodels collection class
  FBumann
  committed
  9368985
- Add nice repr to FlowSystemModel and Submodel
  FBumann
  committed
  e4ec410
- Bugfix .variables and .constraints
  FBumann
  committed
  66283cb
- Add type checks to modeling.py
  FBumann
  committed
  a84dfad
- Improve assertion in tests
  FBumann
  committed
  d2182aa
- Improve docstrings and register ElementModels directly in FlowSystemModel
  FBumann
  committed
  75c05ee
- Improve __repr__()
  FBumann
  committed
  66a6ff1
- ruff check
  FBumann
  committed
  e2e1f13
- Use new method to compare sets in tests
  FBumann
  committed
  62b18b6
- ruff check
  FBumann
  committed
  5f0b503
- Update Contribute.md, some dependencies and add pre-commit
  FBumann
  committed
  15a08e9
- Pre commit hook
  FBumann
  committed
  97de53c
- Run Pre-Commit Hook for the first time
  FBumann
  committed
  25f726e
- Fix link in README.md
  FBumann
  committed
  1716607
- Update Effect name in tests to be 'costs' instead of 'Costs' Everywhere
  FBumann
  committed
  b4a9236
- Improve some of the modeling and coord handling
  FBumann
  committed
  b7734f8
- Add tests with years and scenarios
  FBumann
  committed
  e06692b
- Update tests to run with multiple coords
  FBumann
  committed
  cf0186c
Commits on Jul 24, 2025
- Fix Effects dataset computation in case of empty effects
  FBumann
  committed
  5510297
- Update Test for multiple dims
  FBumann
  committed
  b694dbe
Commits on Jul 28, 2025
- Fix test with multiple dims
  FBumann
  committed
  262e8b4
- Fix test with multiple dims
  FBumann
  committed
  2a469f1
- New test
  FBumann
  committed
  159bcb3
- New test for previous flow_rates
  FBumann
  committed
  e764a13
- Merge pull request #286 from flixOpt/v3.0.0/testing
  FBumann
  authored
  20f74f3
Commits on Jul 29, 2025
- Add Model for YearAwareInvestments
  FBumann
  committed
  2c1c750
- Add FlowSystem.years_per_year attribute and "years_of_last_year" parameter to FlowSystem()
  FBumann
  committed
  70979fb
- Add YearAwareInvestmentModel
  FBumann
  committed
  c9c4ddf
- Add new Interface
  FBumann
  committed
  85ec956
- Improve YearAwareInvestmentModel
  FBumann
  committed
  18146c2
Commits on Jul 30, 2025
- Rename and improve
  FBumann
  committed
  015aa1d
- Move piecewise_effects
  FBumann
  committed
  e6da5ad
- COmbine TImingInvestment into a single interface
  FBumann
  committed
  aafe95b
- Add model tests for investment
  FBumann
  committed
  9316d8a
Commits on Jul 31, 2025
- Add size_changes variables
  FBumann
  committed
  5ecb3c9
- Add size_changes variables
  FBumann
  committed
  b1c9b71
- Improve InvestmentModel
  FBumann
  committed
  3c98553
Commits on Aug 4, 2025
- Improve InvestmentModel
  FBumann
  committed
  5688c8f
- Rename parameters
  FBumann
  committed
  84c8f15
- remove old code
  FBumann
  committed
  566bcdf
- Add a duration_in_years to the InvestTimingParameters
  FBumann
  committed
  c334515
Commits on Aug 5, 2025
- Improve handling of fixed_duration
  FBumann
  committed
  98216e2
- Improve validation and make Investment/divestment optional by default
  FBumann
  committed
  7b45a19
- Rename some vars and improve previous handling
  FBumann
  committed
  b919c0a
- Add validation for previous size
  FBumann
  committed
  8e21165
- Change fit_to_model_coords to work with a Collection of dims
  FBumann
  committed
  c2ce728
- Improve fit_to_model_coords
  FBumann
  committed
  02c1f31
- Improve test
  FBumann
  committed
  5f85887
Commits on Aug 6, 2025
- Update transform_data()
  FBumann
  committed
  815b8bf
Commits on Aug 7, 2025
- Add new "year of investment" coord to FlowSystem
  FBumann
  committed
  1ffe27f
- Add 'year_of_investment' dimension to FlowSystem
  FBumann
  committed
  3632965
- Improve InvestmentTiming
  FBumann
  committed
  9d78314
- Improve InvestmentTiming
  FBumann
  committed
  ca6fb06
- Add specific_effect back
  FBumann
  committed
  abbe534
- add effects_by_investment_year back
  FBumann
  committed
  6f550dd
- Add year_of_investment to FLowSystem.sel()
  FBumann
  committed
  b618578
- Improve Interface
  FBumann
  committed
  4ff3e31
- Handle selection of years properly again
  FBumann
  committed
  98b6072
- Temp
  FBumann
  committed
  fa4c107
Commits on Aug 13, 2025
- Make ModelingPrimitives.consecutive_duration_tracking() dim-agnostic
  FBumann
  committed
  f29dcde
- Use new lifetime variable and constraining methods
  FBumann
  committed
  d7574d8
- Improve Plausibility check
  FBumann
  committed
  1e61937
- Improve InvestmentTImingParameters
  FBumann
  committed
  da3f29f
- Improve weights
  FBumann
  committed
  331ed06
- Adjust test
  FBumann
  committed
  16c7481
- Remove old classes
  FBumann
  committed
  e9e5e04
- V3.0.0/main fit to model coords improve (#295)
  FBumann
  authored
  1474af6
Commits on Sep 2, 2025
- Merge branch 'v3.0.0/main' into v3.0.0/invest
  FBumann
  committed
  d81a150
- ruff format
  FBumann
  committed
  3f03d22
Commits on Sep 13, 2025
- V3.0.0/main (#284)
  FBumann
  authored
  7467d2b
- Merge remote-tracking branch 'origin/v3.0.0/invest' into dev
  FBumann
  committed
  299f629
Commits on Sep 22, 2025
- Update pyproject.toml
  FBumann
  committed
  09949ea
- new ruff check
  FBumann
  committed
  334f183
Commits on Sep 23, 2025
- Merge main
  FBumann
  committed
  579b894
- Merge branch 'main' into dev
  FBumann
  committed
  c76fb29
- Merge branch 'main' into dev
  FBumann
  committed
  cc3dbd4
- Update CHANGELOG.md
  FBumann
  committed
  b326abc
- Fix Error message
  FBumann
  committed
  3b68281
- Revert changes
  FBumann
  committed
  af4a297
- Revert changes
  FBumann
  committed
  b9cf441
- Revert changes
  FBumann
  committed
  42e4f59
- Update type hints
  FBumann
  committed
  e1dcfb8
Commits on Oct 31, 2025
- Merge from main
  FBumann
  committed
  3fd56b5
- Merge remote-tracking branch 'origin/main' into feature/v3/invest-multi-period
  FBumann
  committed
  363f9b6
- Merge from main
  FBumann
  committed
  d24c3eb
- Temp 1
  FBumann
  committed
  451b6d4
Commits on Nov 1, 2025
- Only allow fixed lifetime for now
  FBumann
  committed
  6beebb6
- Rename parameters of InvestParameters
  FBumann
  committed
  560b5ff
- Rename parameters of InvestParameters
  FBumann
  committed
  d62a9c1
- Rename parameters of InvestParameters
  FBumann
  committed
  ac7be9d
- Rename InvestParameters to Sizing Parameters
  FBumann
  committed
  422d9c1
- Rename piecewise_effects_of_investment to piecewise_effects_per_size
  FBumann
  committed
  15896b9
- Remove linked_periods
  FBumann
  committed
  0d0e301
- Update
  FBumann
  committed
  1510a5b
- Update
  FBumann
  committed
  c1da66f
- Update
  FBumann
  committed
  3584d3c
- Update
  FBumann
  committed
  553d784
- Improve _SizeModel
  FBumann
  committed
  b9cf855
- Improve _SizeModel
  FBumann
  committed
  4b6eaab
- Rename to InvestmentModel
  FBumann
  committed
  b131781
- Reuse code
  FBumann
  committed
  34bad2a
- Rename initial_level to previous_level and use it
  FBumann
  committed
  3c305d7
- Remove old InvestmentTiming class
  FBumann
  committed
  8e48c0b
- Fix old year dim
  FBumann
  committed
  a0c3e31
- Fix in Storage
  FBumann
  committed
  193581e
- Re-add old InvestParameters
  FBumann
  committed
  63707a5
- Merge remote-tracking branch 'origin/main' into feature/v3/invest-multi-period-v2
  FBumann
  committed
  7d5392a
- Typo Bugfix
  FBumann
  committed
  ca3d88e
- Add proper handling of mandatory size for all cases: all, some, no period(s)
  FBumann
  committed
  e7fe67b
- Bugfix
  FBumann
  committed
  3c65db9
- Bugfix
  FBumann
  committed
  36fae3b
Commits on Nov 2, 2025
- Rename fixed_lifetime to lifetime
  FBumann
  committed
  2bddd5a
- Fix type hints
  FBumann
  committed
  52c1f8a
- Small bugfixes
  FBumann
  committed
  ae14baf
- Small bugfixes
  FBumann
  committed
  3db741d
- Fix inherritance issues
  FBumann
  committed
  24618d9
- Fix missing availlable variable
  FBumann
  committed
  f8ac1eb
Commits on Nov 3, 2025
- Track lifetime
  FBumann
  committed
  7f28d62
- Temp
  FBumann
  committed
  190ae49
- Temp
  FBumann
  committed
  e9b5287
- Revert "Temp"
  FBumann
  committed
  45c3fad
- Revert "Temp"
  FBumann
  committed
  e465a62
- Add constraints for lifetime with warnings
  FBumann
  committed
  3d2e52b
- Improve warning massage
  FBumann
  committed
  c1d501e
- Improve warning message
  FBumann
  committed
  85e7cc7
- Fix
  FBumann
  committed
  3a8bebd
- Fix
  FBumann
  committed
  e95f651
- Fix
  FBumann
  committed
  2bd61d5
- Fix
  FBumann
  committed
  75cb42a
- Use ffill instead of bfill
  FBumann
  committed
  603f54f
- Revert "Use ffill instead of bfill"
  FBumann
  committed
  37cebdd
- Update
  FBumann
  committed
  c9caf96
- Fix
  FBumann
  committed
  b50b0e5
- Fix
  FBumann
  committed
  1a9c5a7
- Fix
  FBumann
  committed
  c750fdc
Commits on Nov 4, 2025
- Fix for scenarios
  FBumann
  committed
  43561ed

Commits

Commits on Jun 28, 2025

Commits on Jun 29, 2025

Commits on Jun 30, 2025

Commits on Jul 2, 2025

Commits on Jul 3, 2025

Commits on Jul 5, 2025

Commits on Jul 7, 2025

Commits on Jul 15, 2025

Commits on Jul 16, 2025

Commits on Jul 17, 2025

Commits on Jul 18, 2025

Commits on Jul 19, 2025

Commits on Jul 20, 2025

Commits on Jul 21, 2025

Commits on Jul 22, 2025

Commits on Jul 23, 2025