Updated code #14
Merged
Updated code #14
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
willu47
approved these changes
Jun 9, 2023
| @@ -57,7 +57,6 @@ | |||
|
|
|||
| inputFile = "Test_case_Input.xlsx" # Update with actual filename | |||
There was a problem hiding this comment.
Don't hard code file names into the code - use a command-line argument instead and provide access via an import statement and function call.
| @@ -398,17 +397,20 @@ def saveResultsToExcel(dataframe, fileDir, fileName): | |||
| DaySplit = createParameter(df, 'DaySplit') | |||
There was a problem hiding this comment.
You could iterate over a list of parameters and store the resulting initialised parameters in a dict rather than individual variables.
| @@ -625,11 +642,15 @@ def saveResultsToExcel(dataframe, fileDir, fileName): | |||
| StorageLevelYearFinish = createVariable('StorageLevelYearFinish', variables) | |||
There was a problem hiding this comment.
Again, create a function which iterates over the list of variables.
| @@ -777,7 +796,7 @@ def saveResultsToExcel(dataframe, fileDir, fileName): | |||
| model += Demand.get(ci(rfly)) == RateOfDemand.get(ci(rfly)) * YearSplit.get(ci(rfly[2:4])), "" | |||
|
|
|||
| # EBa11_EnergyBalanceEachTS5 | |||
| model += Production.get(ci(rfly)) >= Demand.get(ci(rfly)) + Use.get(ci(rfly)) + pulp.lpSum([Trade.get(ci([rfly[0], rr, *rfly[1:4]])) * TradeRoute.get(ci([rfly[0], rr, rfly[1], rfly[3]]), dflt.get('TradeRoute')) for rr in REGION2]), "" | |||
| model += Production.get(ci(rfly)) >= Demand.get(ci(rfly)) + Use.get(ci(rfly)) + (GIS_Losses.get(ci([*rfly[0:2]]), dflt.get('GIS_Losses')) * (8760 / int(max(TIMESLICE)))) + pulp.lpSum([Trade.get(ci([rfly[0], rr, *rfly[1:4]])) * TradeRoute.get(ci([rfly[0], rr, rfly[1], rfly[3]]), dflt.get('TradeRoute')) for rr in REGION2]), "" | |||
| @@ -873,42 +888,45 @@ def saveResultsToExcel(dataframe, fileDir, fileName): | |||
| # SI4_UndiscountedCapitalInvestmentStorage | |||
| model += CapitalInvestmentStorage.get(ci(rsy)) == CapitalCostStorage.get(ci(rsy), dflt.get('CapitalCostStorage')) * NewStorageCapacity.get(ci(rsy)), "" | |||
| # SI5_DiscountingCapitalInvestmentStorage | |||
| model += DiscountedCapitalInvestmentStorage.get(ci(rsy)) == CapitalInvestmentStorage.get(ci(rsy)) * (1/ ((1+DiscountRate.get(rsy[0], dflt.get('DiscountRate')))**(int(rsy[2]) - int(min(YEAR))))), "" | |||
| model += DiscountedCapitalInvestmentStorage.get(ci(rsy)) == CapitalInvestmentStorage.get(ci(rsy)) * (1/ ((1+DiscountRateSto.get(ci(rsy[0:2]), dflt.get('DiscountRateSto')))**(int(rsy[2]) - int(min(YEAR))))), "" | |||
There was a problem hiding this comment.
COuld make more readable with something like:
index = combined_index(rsy[0:2]) # extract region and storage from index
model += DiscountedCapitalInvestmentStorage.get(ci(rsy)) == \
CapitalInvestmentStorage.get(ci(rsy)) \
* (1/ ((1+DiscountRateSto.get(index), \
* dflt.get('DiscountRateSto')))**(int(rsy[2]) - int(min(YEAR))))), ""
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.
Some updates to the code