Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
fa59017
Add comments and simplify sector.next
tsmbland Oct 2, 2024
697ff3f
Simplify agent module, more comments
tsmbland Oct 3, 2024
b47c811
Simplify retirment profile code
tsmbland Oct 3, 2024
a86e07f
Simplify merge_assets
tsmbland Oct 3, 2024
3e51311
Revert change to merge_assets
tsmbland Oct 4, 2024
941a5a6
Delete unused factory
tsmbland Oct 4, 2024
9d2cac9
More comments added to code
tsmbland Oct 4, 2024
e386da1
Revert some changes to fix tests
tsmbland Oct 4, 2024
018ca5c
Fix tests
tsmbland Oct 4, 2024
4fd2e79
Small fix to another test
tsmbland Oct 4, 2024
51a5273
Delete legacy sector
tsmbland Oct 4, 2024
1518034
Delete tests and documentation
tsmbland Oct 4, 2024
3b0cb49
Remove more redundant code
tsmbland Oct 4, 2024
3a05344
Delete new_to_old_timeslice function
tsmbland Oct 4, 2024
9360ad1
Merge branch 'refactor' into legacy
tsmbland Oct 14, 2024
cc9d237
Fix test
tsmbland Oct 14, 2024
acdcbf8
Merge branch 'refactor' into legacy
tsmbland Oct 14, 2024
d054a3b
A few more tiny changes (e.g. typing)
tsmbland Oct 17, 2024
0c84ba9
Remove inline comment
tsmbland Oct 17, 2024
65313de
Merge branch 'v1.3' into refactor
tsmbland Oct 21, 2024
4ce54e6
Merge branch 'refactor' into legacy
tsmbland Oct 21, 2024
8d06e85
Merge branch 'v1.3' into refactor
tsmbland Oct 25, 2024
5c5fc45
Merge branch 'refactor' into legacy
tsmbland Oct 25, 2024
6975787
Merge branch 'broadcast_errors2' into refactor
tsmbland Oct 25, 2024
2e601ea
Merge branch 'v1.2.2' into refactor
tsmbland Oct 25, 2024
423fafe
Merge branch 'main' into refactor
tsmbland Oct 28, 2024
c270dfa
Merge branch 'main' into refactor
tsmbland Oct 28, 2024
b521d93
Merge branch 'refactor' into legacy
tsmbland Oct 28, 2024
2adde92
Small changes to tidy up
tsmbland Oct 28, 2024
e770c2e
Merge branch 'refactor' of https://github.com/EnergySystemsModellingL…
tsmbland Oct 28, 2024
7f3370a
Be more explicit in _inner_split
tsmbland Oct 29, 2024
789b093
Apply suggestions from code review
tsmbland Oct 30, 2024
557efd8
Switch copy to deepcopy
tsmbland Oct 30, 2024
0a2ba49
Initial go at refactoring the constraints module
tsmbland Oct 31, 2024
9cb8cdf
Fix max_capacity constraint
tsmbland Oct 31, 2024
673e07d
Add checks in constraints decorator
tsmbland Nov 1, 2024
9b8409e
Update tests
tsmbland Nov 1, 2024
8e82486
Merge branch 'refactor' into legacy
tsmbland Nov 1, 2024
43e2042
Delete more legacy code
tsmbland Nov 1, 2024
a44ff41
Merge branch 'legacy' of https://github.com/EnergySystemsModellingLab…
tsmbland Nov 1, 2024
cca5480
Merge branch 'legacy' into constraints
tsmbland Nov 4, 2024
f6e1280
Allow regression tests to pass
tsmbland Nov 4, 2024
e1d66cc
Merge branch 'v1.3' into constraints
tsmbland Nov 5, 2024
b149514
Merge branch 'v1.3' into constraints
tsmbland Nov 12, 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
13 changes: 7 additions & 6 deletions src/muse/agents/agent.py
Original file line number Diff line number Diff line change
Expand Up @@ -323,14 +323,15 @@ def next(
).values
search = search.sel(asset=condtechs)

# Get technology parameters for the current year
techs = self.filter_input(technologies, year=current_year)

# Calculate constraints
constraints = self.constraints(
search.demand,
self.assets,
search.search_space,
market,
technologies,
year=current_year,
demand=search.demand,
search_space=search.search_space,
capacity=market.capacity,
technologies=techs,
)

# Calculate investments
Expand Down
Loading
Loading