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

Jump to bottom

Add limit setter #25

Draft
wants to merge 7 commits into
base: master
Choose a base branch
from
Draft

Add limit setter #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e468391
Add fcas requirements to class parameters
mlee94 Oct 25, 2023
e51f6fb
Add limit setter logic to SpotMarket class
mlee94 Oct 25, 2023
26e5a63
Fix import limit setting error
mlee94 Dec 7, 2023
535814a
Better conditional logic
mlee94 Dec 7, 2023
dbe3e50
rename functions
mlee94 Dec 7, 2023
c15e5e4
Add FCAS limit setter
mlee94 Dec 7, 2023
570e44e
Fix bug that prevents joining on DISPATCHINTERCONNECTORRES
mlee94 Dec 7, 2023
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
14 changes: 9 additions & 5 deletions nempy/historical_inputs/interconnectors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,8 +306,10 @@ def _format_interconnector_definitions(INTERCONNECTOR, INTERCONNECTORCONSTRAINT)
"""
interconnector_directions = INTERCONNECTOR.loc[:, ['INTERCONNECTORID', 'REGIONFROM', 'REGIONTO']]
interconnector_directions.columns = ['interconnector', 'from_region', 'to_region']
interconnector_paramaters = INTERCONNECTORCONSTRAINT.loc[:, ['INTERCONNECTORID', 'IMPORTLIMIT', 'EXPORTLIMIT']]
interconnector_paramaters.columns = ['interconnector', 'min', 'max']
interconnector_paramaters = (
INTERCONNECTORCONSTRAINT.loc[:, ['INTERCONNECTORID', 'IMPORTLIMIT', 'EXPORTLIMIT', 'FCASSUPPORTUNAVAILABLE']]
)
interconnector_paramaters.columns = ['interconnector', 'min', 'max', 'fcas_support_unavailable']
interconnector_paramaters['min'] = -1 * interconnector_paramaters['min']
interconnectors = pd.merge(interconnector_directions, interconnector_paramaters, 'inner', on='interconnector')
return interconnectors
Expand Down Expand Up @@ -349,13 +351,15 @@ def _format_mnsp_transmission_loss_factors(MNSP_INTERCONNECTOR, INTERCONNECTORCO
"""
INTERCONNECTORCONSTRAINT = INTERCONNECTORCONSTRAINT[INTERCONNECTORCONSTRAINT['ICTYPE'] == 'MNSP']
MNSP_INTERCONNECTOR = pd.merge(MNSP_INTERCONNECTOR, INTERCONNECTORCONSTRAINT, on=['INTERCONNECTORID'])
MNSP_INTERCONNECTOR = MNSP_INTERCONNECTOR.loc[:, ['INTERCONNECTORID', 'LINKID', 'FROM_REGION_TLF', 'TO_REGION_TLF',
'FROMREGION', 'TOREGION', 'LHSFACTOR', 'MAXCAPACITY']]
MNSP_INTERCONNECTOR = (
MNSP_INTERCONNECTOR.loc[:, ['INTERCONNECTORID', 'LINKID', 'FROM_REGION_TLF', 'TO_REGION_TLF',
'FROMREGION', 'TOREGION', 'LHSFACTOR', 'MAXCAPACITY', 'FCASSUPPORTUNAVAILABLE']]
)

mnsp_transmission_loss_factors = MNSP_INTERCONNECTOR.rename(columns={
'INTERCONNECTORID': 'interconnector', 'LINKID': 'link', 'FROM_REGION_TLF': 'from_region_loss_factor',
'TO_REGION_TLF': 'to_region_loss_factor', 'FROMREGION': 'from_region', 'TOREGION': 'to_region',
'LHSFACTOR': 'generic_constraint_factor', 'MAXCAPACITY': 'max'
'LHSFACTOR': 'generic_constraint_factor', 'MAXCAPACITY': 'max', 'FCASSUPPORTUNAVAILABLE': 'fcas_support_unavailable',
})
mnsp_transmission_loss_factors['min'] = 0.0
return mnsp_transmission_loss_factors
Expand Down
18 changes: 11 additions & 7 deletions nempy/historical_inputs/mms_db.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,9 +168,10 @@ def __init__(self, connection):
table_name='INTERCONNECTOR', table_columns=['INTERCONNECTORID', 'REGIONFROM', 'REGIONTO'],
table_primary_keys=['INTERCONNECTORID'], con=self.con)
self.INTERCONNECTORCONSTRAINT = InputsByEffectiveDateVersionNoAndDispatchInterconnector(
table_name='INTERCONNECTORCONSTRAINT', table_columns=['INTERCONNECTORID', 'EFFECTIVEDATE', 'VERSIONNO',
'FROMREGIONLOSSSHARE', 'LOSSCONSTANT', 'ICTYPE',
'LOSSFLOWCOEFFICIENT', 'IMPORTLIMIT', 'EXPORTLIMIT'],
table_name='INTERCONNECTORCONSTRAINT', table_columns=[
'INTERCONNECTORID', 'EFFECTIVEDATE', 'VERSIONNO', 'FROMREGIONLOSSSHARE', 'LOSSCONSTANT', 'ICTYPE',
'LOSSFLOWCOEFFICIENT', 'IMPORTLIMIT', 'EXPORTLIMIT', 'FCASSUPPORTUNAVAILABLE',
],
table_primary_keys=['INTERCONNECTORID', 'EFFECTIVEDATE', 'VERSIONNO'], con=self.con)
self.LOSSMODEL = InputsByEffectiveDateVersionNoAndDispatchInterconnector(
table_name='LOSSMODEL', table_columns=['INTERCONNECTORID', 'EFFECTIVEDATE', 'VERSIONNO', 'LOSSSEGMENT',
Expand All @@ -181,8 +182,10 @@ def __init__(self, connection):
'DEMANDCOEFFICIENT'],
table_primary_keys=['INTERCONNECTORID', 'EFFECTIVEDATE', 'VERSIONNO'], con=self.con)
self.DISPATCHINTERCONNECTORRES = InputsBySettlementDate(
table_name='DISPATCHINTERCONNECTORRES', table_columns=['INTERCONNECTORID', 'SETTLEMENTDATE', 'MWFLOW',
'MWLOSSES'],
table_name='DISPATCHINTERCONNECTORRES', table_columns=[
'INTERCONNECTORID', 'SETTLEMENTDATE', 'MWFLOW', 'MWLOSSES', 'EXPORTLIMIT', 'IMPORTLIMIT',
'EXPORTGENCONID', 'IMPORTGENCONID', 'FCASEXPORTLIMIT', 'FCASIMPORTLIMIT',
],
table_primary_keys=['INTERCONNECTORID', 'SETTLEMENTDATE'], con=self.con)
self.MNSP_INTERCONNECTOR = InputsByEffectiveDateVersionNo(
table_name='MNSP_INTERCONNECTOR', table_columns=['INTERCONNECTORID', 'LINKID', 'EFFECTIVEDATE', 'VERSIONNO',
Expand Down Expand Up @@ -455,7 +458,8 @@ def __init__(self, table_name, table_columns, table_primary_keys, con):
'RAISE60SECROP': 'REAL', 'RAISE5MINROP': 'REAL', 'RAISEREGROP': 'REAL', 'LOWER6SECROP': 'REAL',
'LOWER60SECROP': 'REAL', 'LOWER5MINROP': 'REAL', 'LOWERREGROP': 'REAL', 'FROM_REGION_TLF': 'REAL',
'TO_REGION_TLF': 'REAL', 'ICTYPE': 'TEXT', 'LINKID': 'TEXT', 'FROMREGION': 'TEXT', 'TOREGION': 'TEXT',
'REGISTEREDCAPACITY': 'REAL', 'LHSFACTOR': 'FACTOR', 'ROP': 'REAL'
'REGISTEREDCAPACITY': 'REAL', 'LHSFACTOR': 'FACTOR', 'ROP': 'REAL', 'FCASSUPPORTUNAVAILABLE': 'REAL',
'FCASEXPORTLIMIT': 'REAL', 'FCASIMPORTLIMIT': 'REAL', 'EXPORTGENCONID': 'TEXT', 'IMPORTGENCONID': 'TEXT',
}

def create_table_in_sqlite_db(self):
Expand Down Expand Up @@ -1279,7 +1283,7 @@ def get_data(self, date_time):
# Inner join the most recent data with the interconnectors used in the actual interval of interest.
query = """SELECT {cols}
FROM temp4
INNER JOIN (SELECT *
INNER JOIN (SELECT INTERCONNECTORID
FROM DISPATCHINTERCONNECTORRES
WHERE SETTLEMENTDATE == '{datetime}')
USING (INTERCONNECTORID);"""
Expand Down
Loading