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

Add a new benchmark #294

Merged
merged 26 commits into from
Jan 23, 2025
Merged

Add a new benchmark #294

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
8f56054
Add a benchmark from Antti
olejandro Jan 20, 2025
713b8b8
Merge branch 'main' into olex/add-a-benchmark
olejandro Jan 21, 2025
5722a4a
Don't add all index columns when processing fi_t
olejandro Jan 21, 2025
fbcf405
Roll back to populating all index columns with None
olejandro Jan 21, 2025
87e6f8d
Fill out tslvl in process_processes
olejandro Jan 21, 2025
5440f2c
Get DemoS working again
olejandro Jan 22, 2025
61b17e1
Move handling of END to apply_final_fixup
olejandro Jan 22, 2025
7435dc2
Do not create index columns in process_flexible_import_table
olejandro Jan 22, 2025
1c380df
Resolve regression
olejandro Jan 22, 2025
c115c15
Improve processing of fi_t
olejandro Jan 22, 2025
9aa5985
Fix demos05 regression
olejandro Jan 22, 2025
987c18d
Don't create all possible index columns for tfm tables
olejandro Jan 22, 2025
f16cdf9
Fix more regressions
olejandro Jan 22, 2025
a3ae438
Refactor the code to simplify the logic
olejandro Jan 22, 2025
92b5a95
Remove invalid values from model processes and commodities
olejandro Jan 23, 2025
f21bad5
Remove debug print
olejandro Jan 23, 2025
6a330e0
Correct info for tag variants
olejandro Jan 23, 2025
7bf250a
Fix regressions on DemoS01-04
olejandro Jan 23, 2025
a0bb85a
Don't create all index columns for uc_t
olejandro Jan 23, 2025
d1e2776
Fix regression on Demos 5 and 6
olejandro Jan 23, 2025
5edb5df
Separate tilde resolving code into a separate function
olejandro Jan 23, 2025
e9a8e9f
More clean up
olejandro Jan 23, 2025
150900f
Merge branch 'olex/add-a-benchmark' of github.com:etsap-TIMES/xl2time…
olejandro Jan 23, 2025
f9dd276
Correct dd_folder name
olejandro Jan 23, 2025
22465e9
Undo the merge
olejandro Jan 23, 2025
15244fd
Correct dd_folder name
olejandro Jan 23, 2025
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
9 changes: 9 additions & 0 deletions benchmarks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,15 @@ benchmarks:
- "uc_growth"
- "uc_nuc_maxcap"
include_dummy_imports: true
- name: DemoS_special-t1
input_folder: DemoS_special_t1
dd_folder: DemoS_special-t1
dd_files:
- "base"
- "testechs"
- "syssettings"
- "trade_param"
- "demproj_dtcar"
- name: TIMES-IE-all
input_folder: TIM
regions: "IE"
Expand Down
4 changes: 2 additions & 2 deletions setup-benchmarks.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ set -eo pipefail

# Commit SHA for each repository:
REF_TIMES_model="b488fb07f0899ee8b7e710c230b1a9414fa06f7d"
REF_demos_xlsx="34a2a5c044cc0bbea1357de50db2f5f02d575181"
REF_demos_dd="2848a8a8e2fdcf0cdf7f83eefbdd563b0bb74e86"
REF_demos_xlsx="6daaa6ab2fa9bf4428417eef8172836aee7a9290"
REF_demos_dd="e744f53cb16a4ec230c21583f9404d8cfac9eb50"
REF_tim_xlsx="e820d8002adc6b1526a3bffcc439219b28d0eed5"
REF_tim_gams="cfe2628dbb5974b99c8a5664a9358849324e31ac"
REF_TIMES_NZ="4170d720e1c5cb0e31537a3168188169209ceb4d"
Expand Down
Loading