Demand eq #27
Merged
Demand eq #27
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -32,7 +32,8 @@ class NOInst(Institution): | |||
| doc="A list of commodities that the institution will manage.", | |||
| tooltip="List of commodities in the institution.", | |||
| uilabel="Commodities", | |||
| uitype="oneOrMore" | |||
| uitype="oneOrMore" | |||
| ) | |||
|
|
|||
There was a problem hiding this comment.
What happened here? Was this always missing a closing parenthesis ?
There was a problem hiding this comment.
Yeah I pulled from ergs/develop and it was missing a parenthesis
There was a problem hiding this comment.
weird
Thanks for fixing it !
Demand eq
gwenchee
reviewed
Sep 4, 2018
d3ploy/no_inst.py
Outdated
| self.commodity_demand[commod] = defaultdict(float) | ||
| self.fac_supply[commod] = {} | ||
| self.commod_to_fac[commod] = [] | ||
| self.fresh = False | ||
|
|
||
| def tock(self) |
There was a problem hiding this comment.
You're missing a colon here
|
Could you change the |
jbae11
referenced
this pull request
in jbae11/d3ploy
Sep 5, 2018
Merge pull request #27 from jbae11/demand_eq
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Makes the changes from
initial_demand+growth_ratetodemand_eq.Now the user can define the demand equation of the driving commodity instead of being restricted to the
(1+r)^(t)format