Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
3dcef78
Basic implementation for averaging marginal costs
tsmbland Mar 12, 2026
6e3559d
Better use of GroupAccum and more comments
tsmbland Mar 12, 2026
f34e295
Helper for expanding prices
tsmbland Mar 12, 2026
02263bd
Get clippy to pass
tsmbland Mar 12, 2026
fd2eb58
Add tests for GroupAccum
tsmbland Mar 12, 2026
08bec99
Merge branch 'main' into buffered_prices
tsmbland Mar 12, 2026
2b6df89
Update src/simulation/prices.rs
tsmbland Mar 12, 2026
ae59c1d
Revert "Get clippy to pass"
tsmbland Mar 13, 2026
6b5f51a
Avoid repeatedly calculating annual activities
tsmbland Mar 13, 2026
a22610a
Merge branch 'main' into buffered_prices
tsmbland Mar 16, 2026
e2fdb03
Better use of indexmaps
tsmbland Mar 16, 2026
0be85fd
Add generic accumulator trait
tsmbland Mar 16, 2026
9971562
Tidy up and simplify
tsmbland Mar 16, 2026
4dccb93
Add new strategies
tsmbland Mar 16, 2026
eb2a286
Delete new strategies (for now)
tsmbland Mar 16, 2026
dbd888b
Tests and tidy ups
tsmbland Mar 17, 2026
7eb6a28
Make expand_selection_prices safer
tsmbland Mar 17, 2026
5b26fac
Use WeightedAverageAccumulator in WeightedAverageBackupAccumulator
tsmbland Mar 17, 2026
2e177d5
Implement easy suggestions
tsmbland Mar 18, 2026
7c2e460
Add prices to existing maps rather than creating new maps
tsmbland Mar 18, 2026
68ba61b
Make extend_selection_prices a method of CommodityPrices
tsmbland Mar 18, 2026
d9698da
Use try_insert from input module
tsmbland Mar 18, 2026
e49dbd7
Fix typo
tsmbland Mar 18, 2026
076f311
Spelling
tsmbland Mar 18, 2026
dd75c66
Spelling
tsmbland Mar 18, 2026
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
8 changes: 0 additions & 8 deletions src/simulation/optimisation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -263,14 +263,6 @@ impl Solution<'_> {
.map(|((asset, time_slice), &value)| (asset, time_slice, Activity(value)))
}

/// Iterate over the keys for activity for each existing asset
pub fn iter_activity_keys_for_existing(
&self,
) -> impl Iterator<Item = (&AssetRef, &TimeSliceID)> {
self.iter_activity_for_existing()
.map(|(asset, time_slice, _activity)| (asset, time_slice))
}

/// Activity for each candidate asset
pub fn iter_activity_for_candidates(
&self,
Expand Down
Loading
Loading