Generic share constraint bounds #95

gidden · 2018-08-07T09:39:11Z

Here's the start of a test @danielhuppmann

Please confirm that this PR has done the following:

Tests Added
Documentation Added
Description in RELEASE_NOTES.md Added

Adding to RELEASE_NOTES.md

Please add a single line in the release notes similar to the following:

- (#XX)[http://link-to-pr.com] Added feature which does something

stickler-ci · 2018-08-07T09:39:22Z

tests/test_scenario_features.py

+    ---------------
+
+    Seattle canning_plant production (original: 350) is limited to 50% of all
+    transport_from_san-diego (original: 550). Expected outcome: some increase of


E501 line too long (80 > 79 characters)

gidden · 2018-08-07T10:00:17Z

note this can also use mode='all' for the transport technology

danielhuppmann · 2018-08-07T10:05:48Z

can we split up the tests into multiple files and call them test_feature_{}.py, like test_feature_addon.py? These tests are getting quite lenghty... Also, running the add-on test first is not ideal - should first test core features, then the MESSAGE-specific features...

gidden · 2018-08-07T12:03:47Z

Yes, as you wish. In principle, the order of tests should not matter (they should be independent of order). Please feel free to implement as you see fit.

gidden · 2018-08-07T12:06:13Z

rebased on most recent hackathon prs. should be good to go at your convenience @danielhuppmann

stickler-ci · 2018-08-07T14:35:41Z

message_ix/core.py

+                    'kwargs': dict(
+                        idx_sets=['shares', 'node', 'node', 'type_tec', 'mode',
+                                  'commodity', 'level', 'year', 'time'],
+                        idx_names=['shares', 'node', 'node_loc', 'type_tec', 'mode',


E501 line too long (84 > 79 characters)

stickler-ci · 2018-08-07T14:35:41Z

message_ix/core.py

+                    'kwargs': dict(
+                        idx_sets=['shares', 'node', 'node', 'type_tec', 'mode',
+                                  'commodity', 'level', 'year', 'time'],
+                        idx_names=['shares', 'node', 'node_loc', 'type_tec', 'mode',


E501 line too long (84 > 79 characters)

gidden · 2018-08-07T15:28:18Z

@danielhuppmann, I took a shot at implementing the first upper bound constraint. I have tests which pass and confirm it works in principle. I'm sure it's ugly, but I think it covers the broad strokes of our discussion today.

@OFR-IIASA, this should be ready for testing if you want to go for it. mode == 'all' is supported.

stickler-ci · 2018-08-09T13:26:28Z

message_ix/core.py

-                                  'type_tec'],
-                        idx_names=['shares', 'commodity', 'level',
-                                   'type_tec_share', 'type_tec_total'])
+#                        idx_sets=['shares', 'node', 'node', 'type_tec', 'mode',


E122 continuation line missing indentation or outdented
E501 line too long (80 > 79 characters)

stickler-ci · 2018-08-09T13:26:28Z

message_ix/core.py

-                        idx_names=['shares', 'commodity', 'level',
-                                   'type_tec_share', 'type_tec_total'])
+#                        idx_sets=['shares', 'node', 'node', 'type_tec', 'mode',
+#                                  'commodity', 'level', 'year', 'time'],


E122 continuation line missing indentation or outdented

stickler-ci · 2018-08-09T13:26:28Z

message_ix/core.py

-                                   'type_tec_share', 'type_tec_total'])
+#                        idx_sets=['shares', 'node', 'node', 'type_tec', 'mode',
+#                                  'commodity', 'level', 'year', 'time'],
+                        idx_sets=['shares', 'node', 'node', 'type_tec', 


W291 trailing whitespace

stickler-ci · 2018-08-09T13:26:28Z

message_ix/core.py

+#                        idx_sets=['shares', 'node', 'node', 'type_tec', 'mode',
+#                                  'commodity', 'level', 'year', 'time'],
+                        idx_sets=['shares', 'node', 'node', 'type_tec', 
+                                  'mode', 'commodity', 'level'], 


W291 trailing whitespace

stickler-ci · 2018-08-09T13:26:28Z

message_ix/core.py

+#                                  'commodity', 'level', 'year', 'time'],
+                        idx_sets=['shares', 'node', 'node', 'type_tec', 
+                                  'mode', 'commodity', 'level'], 
+                        idx_names=['shares', 'node_share', 'node', 'type_tec', 


W291 trailing whitespace

stickler-ci · 2018-08-09T13:26:28Z

message_ix/core.py

+                        idx_sets=['shares', 'node', 'node', 'type_tec', 
+                                  'mode', 'commodity', 'level'], 
+                        idx_names=['shares', 'node_share', 'node', 'type_tec', 
+                                   'mode', 'commodity', 'level']) 


W291 trailing whitespace

stickler-ci · 2018-08-09T13:26:28Z

message_ix/core.py

+                (s.init_set, {
+                    'args': ('map_shares_commodity_total',),
+                    'kwargs': dict(
+                        idx_sets=['shares', 'node', 'node', 'type_tec', 


W291 trailing whitespace

stickler-ci · 2018-08-09T13:26:29Z

message_ix/core.py

+                    'args': ('map_shares_commodity_total',),
+                    'kwargs': dict(
+                        idx_sets=['shares', 'node', 'node', 'type_tec', 
+                                  'mode', 'commodity', 'level'], 


W291 trailing whitespace

stickler-ci · 2018-08-09T13:26:29Z

message_ix/core.py

+                    'kwargs': dict(
+                        idx_sets=['shares', 'node', 'node', 'type_tec', 
+                                  'mode', 'commodity', 'level'], 
+                        idx_names=['shares', 'node_share', 'node', 'type_tec', 


W291 trailing whitespace

stickler-ci · 2018-08-09T13:26:29Z

message_ix/core.py

+                        idx_sets=['shares', 'node', 'node', 'type_tec', 
+                                  'mode', 'commodity', 'level'], 
+                        idx_names=['shares', 'node_share', 'node', 'type_tec', 
+                                   'mode', 'commodity', 'level']) 


W291 trailing whitespace

gidden · 2018-08-09T13:26:42Z

Great PR @danielhuppmann, should we be good to go after docs are included?

gidden · 2018-08-09T13:27:00Z

and after stickler is appeased? =P

gidden · 2018-08-09T13:27:13Z

want me to make this PR based on an upstream branch so you can commit directly?

add LaTeX docstrings for generic commodity-share constraints

gidden changed the base branch from master to hackathon-prs August 7, 2018 09:39

stickler-ci reviewed Aug 7, 2018

View reviewed changes

gidden mentioned this pull request Aug 7, 2018

WIP - initial thoughts on generic share constraint #93

Closed

3 tasks

gidden force-pushed the newgen branch from d6263db to eb9d3b2 Compare August 7, 2018 12:05

gidden force-pushed the newgen branch from eb9d3b2 to 2b60380 Compare August 7, 2018 14:35

stickler-ci reviewed Aug 7, 2018

View reviewed changes

stickler-ci reviewed Aug 9, 2018

View reviewed changes

gidden force-pushed the newgen branch from 79adc34 to 48d3edd Compare August 10, 2018 06:26

refactoring to joint "generic" and "commodity" share constraints

b25458e

add LaTeX docstrings for generic commodity-share constraints

gidden force-pushed the newgen branch from 9880487 to b25458e Compare August 22, 2018 10:54

gidden merged commit dda2ff5 into iiasa:hackathon-prs Aug 22, 2018

gidden mentioned this pull request Aug 22, 2018

Hackathon prs #91

Merged

gidden added a commit that referenced this pull request Aug 29, 2018

refactoring to joint "generic" and "commodity" share constraints (#95)

2e37bde

add LaTeX docstrings for generic commodity-share constraints

gidden added a commit that referenced this pull request Aug 30, 2018

refactoring to joint "generic" and "commodity" share constraints (#95)

32c1806

add LaTeX docstrings for generic commodity-share constraints

gidden added a commit that referenced this pull request Sep 17, 2018

refactoring to joint "generic" and "commodity" share constraints (#95)

36b79d2

add LaTeX docstrings for generic commodity-share constraints

gidden added a commit that referenced this pull request Nov 14, 2018

refactoring to joint "generic" and "commodity" share constraints (#95)

64daadf

add LaTeX docstrings for generic commodity-share constraints

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Generic share constraint bounds #95

Generic share constraint bounds #95

gidden commented Aug 7, 2018

stickler-ci Aug 7, 2018

gidden commented Aug 7, 2018

danielhuppmann commented Aug 7, 2018

gidden commented Aug 7, 2018

gidden commented Aug 7, 2018

stickler-ci Aug 7, 2018

stickler-ci Aug 7, 2018

gidden commented Aug 7, 2018

stickler-ci Aug 9, 2018

stickler-ci Aug 9, 2018

stickler-ci Aug 9, 2018

stickler-ci Aug 9, 2018

stickler-ci Aug 9, 2018

stickler-ci Aug 9, 2018

stickler-ci Aug 9, 2018

stickler-ci Aug 9, 2018

stickler-ci Aug 9, 2018

stickler-ci Aug 9, 2018

gidden commented Aug 9, 2018

gidden commented Aug 9, 2018

gidden commented Aug 9, 2018

Generic share constraint bounds #95

Generic share constraint bounds #95

Conversation

gidden commented Aug 7, 2018

Please confirm that this PR has done the following:

Adding to RELEASE_NOTES.md

Choose a reason for hiding this comment

gidden commented Aug 7, 2018

danielhuppmann commented Aug 7, 2018

gidden commented Aug 7, 2018

gidden commented Aug 7, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gidden commented Aug 7, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gidden commented Aug 9, 2018

gidden commented Aug 9, 2018

gidden commented Aug 9, 2018