Skip to content

fix: adopt v5.5 result metadata and register missing result groups (#392) #405

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

Closed
parthdagia05 wants to merge 1 commit into from
Closed

fix: adopt v5.5 result metadata and register missing result groups (#392) #405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 22 additions & 13 deletions WebAPP/Classes/Const.Class.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,11 @@ export const GROUPNAMES = {
}

export const RESULTGROUPNAMES = {
"R" :"Region",
"RT" :"Region, technology",
"RYT" :"Region, year, technology",
"RYC" :"Region, year, commodity",
"RYCn" :"Region, year, constraint",
"RYE" :"Region, year, emission",
"RYS" :"Region, year, storage",
"RYTM" :"Region, year, technology, mode of operation",
Expand Down Expand Up @@ -158,25 +161,31 @@ export const PARAMCOLORS = {
"RYCTs": "greenLight"
}

export const RESULTPARAMORDER = [
"RT" ,
"RYT" ,
"RYE" ,
export const RESULTPARAMORDER = [
"R" ,
"RT" ,
"RYT" ,
"RYC" ,
"RYCn" ,
"RYE" ,
"RYS" ,
"RYTM" ,
"RYTC" ,
"RYTE" ,
"RYTTs" ,
"RYCTs" ,
"RYTEM" ,
"RYTCTs" ,
"RYTMTs" ,
"RYTCMTs"
"RYTM" ,
"RYTC" ,
"RYTE" ,
"RYTTs" ,
"RYCTs" ,
"RYTEM" ,
"RYTCTs" ,
"RYTMTs" ,
"RYTCMTs"
];

export const RESULTPARAMCOLORS = {
"R": "orange",
"RT": "blue",
"RYT": "blueLight",
"RYC": "grey",
"RYCn": "pink",
"RYE": "yellow",
"RYS": "red",
"RYTM": "pink",
Expand Down
128 changes: 85 additions & 43 deletions WebAPP/DataStorage/Variables.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"unitRule": {
"cat": [
{
"var": ""
"var": "number"
}
]
}
Expand Down Expand Up @@ -117,7 +117,11 @@
"value": "Number Of New Technology Units",
"name": "NumberOfNewTechnologyUnits",
"unitRule": {
"cat": []
"cat": [
{
"var": "number"
}
]
}
},
{
Expand Down Expand Up @@ -154,21 +158,10 @@
"unitRule": {
"cat": [
{
"var": "CapUnitId"
}
]
}
}
],
"RYC": [
{
"id": "EB_d",
"value": "Shadow price - Annual Commodity Balance",
"name": "EBb4_EnergyBalanceEachYear4_ICR",
"unitRule": {
"cat": [
"var": "milion"
},
{
"var": "CapUnitId"
"var": "Currency"
}
]
}
Expand All @@ -182,33 +175,16 @@
"unitRule": {
"cat": [
{
"var": "EmiUnit"
}
]
}
}
],
"RYCn": [
{
"id": "UDCI_d",
"value": "Shadow price - UDC Inequality",
"name": "UDC1_UserDefinedConstraintInequality",
"unitRule": {
"cat": [
"var": "milion"
},
{
"var": ""
}
]
}
},
{
"id": "UDCE_d",
"value": "Shadow price - UDC Equality",
"name": "UDC2_UserDefinedConstraintEquality",
"unitRule": {
"cat": [
"var": "Currency"
},
{
"var": ""
"var": "divide"
},
{
"var": "EmiUnit"
}
]
}
Expand Down Expand Up @@ -251,7 +227,6 @@
]
}
},

{
"id": "SVS",
"value": "Salvage Value Storage",
Expand Down Expand Up @@ -283,6 +258,55 @@
}
}
],
"RYC": [
{
"id": "EB_d",
"value": "Shadow price - Energy Balance",
"name": "EBb4_EnergyBalanceEachYear4_ICR",
"unitRule": {
"cat": [
{
"var": "milion"
},
{
"var": "Currency"
},
{
"var": "divide"
},
{
"var": "EmiUnit"
}
]
}
}
],
"RYCn": [
{
"id": "UDCI_d",
"value": "Shadow price - UDC Inequality",
"name": "UDC1_UserDefinedConstraintInequality",
"unitRule": {
"cat": [
{
"var": "number"
}
]
}
},
{
"id": "UDCE_d",
"value": "Shadow price - UDC Equality",
"name": "UDC2_UserDefinedConstraintEquality",
"unitRule": {
"cat": [
{
"var": "number"
}
]
}
}
],
"RYTM": [
{
"id": "TATABM",
Expand Down Expand Up @@ -386,6 +410,12 @@
"cat": [
{
"var": "ActUnitId"
},
{
"var": "divide"
},
{
"var": "years"
}
]
}
Expand All @@ -412,6 +442,12 @@
"cat": [
{
"var": "CommUnit"
},
{
"var": "divide"
},
{
"var": "years"
}
]
}
Expand All @@ -424,6 +460,12 @@
"cat": [
{
"var": "CommUnit"
},
{
"var": "divide"
},
{
"var": "years"
}
]
}
Expand All @@ -441,4 +483,4 @@
}
}
]
}
}
Loading