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.

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

Improve processing of composite tags #297

Merged
merged 3 commits into from
Jan 25, 2025
Merged

Improve processing of composite tags #297

merged 3 commits into from
Jan 25, 2025

Conversation

olejandro
Copy link
Member

No description provided.

Copy link

github-actions bot commented Jan 24, 2025

Regression test results on commit abf3c98

       Benchmark    Time (s)                 GDX Diff     Accuracy       Correct    Additional
----------------  ----------  -----------------------  -----------  ------------  ------------
   DemoS_001-all   3.4   4.1            OK         OK  100.0 100.0    118    118      3      3
   DemoS_002-all   3.9   4.4            OK         OK  100.0 100.0    344    344      3      3
   DemoS_003-all   4.4   4.9            OK         OK  100.0 100.0    633    633      6      6
       DemoS_004   4.6   5.2            OK         OK  100.0 100.0    662    662     12     12
      DemoS_004a   4.5   6.0            OK         OK  100.0 100.0    665    665     12     12
      DemoS_004b   4.6   5.5            OK         OK  100.0 100.0    665    665     12     12
   DemoS_004-all   4.7   5.6            OK         OK  100.0 100.0    667    667     12     12
   DemoS_005-all   5.1   5.6            13         13   99.7  99.7   1160   1160     12     12
   DemoS_006-all   6.5   7.2            13         13   99.7  99.7   1258   1258     12     12
   DemoS_007-all   7.7   8.9            13         13   99.8  99.8   2155   2155     12     12
DemoS_007-all-1r   5.9   7.6            11         11   99.8  99.8   1179   1179     12     12
   DemoS_008-all  10.4  12.3            13         13   99.9  99.9   5333   5333     18     18
   DemoS_009-all  11.2  12.6            26         26   99.9  99.9   5807   5807     29     29
   DemoS_010-all  11.5  12.4           822        822   88.4  88.4   6139   6139     29     29
   DemoS_011-all  11.6  12.2           854        854   88.0  88.0   6150   6150     29     29
   DemoS_012-all  12.2  12.2           901        901   88.2  88.2   6306   6306     53     53
DemoS_special-t1   5.8   5.9  Error runn… Error runn…   92.5  92.5   2110   2110     48     48
    TIMES-IE-all  35.3  35.7          3211       3211   97.5  97.5  42384  42384   2826   2826
    TIMES-IE-NoM  31.8  31.6           363        363   99.3  99.3  40528  40528    632    632
    TIMES-IE-MCB  31.9  33.5          1186       1186   97.6  97.6  41991  41991    632    632
    TIMES-NZ-KEA  63.5  63.8          4004       4004   98.2  98.2  76362  76362    472    472
    TIMES-NZ-TUI  50.1  51.4          4038       4038   98.2  98.2  75988  75988    488    488
 (__main__:MainThread:pid-5906 "/home/runner/work/xl2times/xl2times/xl2times/utils/run_benchmarks.py:373")
2025-01-24 04:11:09.863 | INFO     : Total runtime: 348.52s (main: 330.49s) (__main__:MainThread:pid-5906 "/home/runner/work/xl2times/xl2times/xl2times/utils/run_benchmarks.py:397")
2025-01-24 04:11:09.863 | INFO     : Change in runtime (negative == faster): +18.03s (+5.5%) (__main__:MainThread:pid-5906 "/home/runner/work/xl2times/xl2times/xl2times/utils/run_benchmarks.py:398")
2025-01-24 04:11:09.863 | INFO     : Change in correct rows (higher == better): +0 (+0.0%) (__main__:MainThread:pid-5906 "/home/runner/work/xl2times/xl2times/xl2times/utils/run_benchmarks.py:405")
2025-01-24 04:11:09.863 | INFO     : Change in additional rows: +0 (+0.0%) (__main__:MainThread:pid-5906 "/home/runner/work/xl2times/xl2times/xl2times/utils/run_benchmarks.py:412")
2025-01-24 04:11:09.863 | SUCCESS  : No regressions. You're awesome! (__main__:MainThread:pid-5906 "/home/runner/work/xl2times/xl2times/xl2times/utils/run_benchmarks.py:426")

This comment will be updated when new commits are added to the PR.

@olejandro olejandro marked this pull request as ready for review January 24, 2025 04:13
@@ -615,7 +615,7 @@ def process_user_constraint_tables(
"""
legal_values = {
"attribute": {attr for attr in config.all_attributes if attr.startswith("uc")},
"region": model.internal_regions,
"region": model.internal_regions.union({"allregions".upper()}),
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Haha why not just "ALLREGIONS"? :)
(No need to change it though)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not to forget that those elements should be uppercase 😂

@olejandro olejandro merged commit 9550a44 into main Jan 25, 2025
2 checks passed
@olejandro olejandro deleted the olex/composite-tag branch January 25, 2025 11:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants