Commit 00872932 authored by Niina Helistö's avatar Niina Helistö
Browse files

Updating spinetoolbox project: reserve demand

- Storing constant and timeseries form reserve demand in the same parameter
parent 402c28b2
...@@ -769,7 +769,7 @@ ...@@ -769,7 +769,7 @@
], ],
"p_groupReserves": [ "p_groupReserves": [
{ {
"Mapping 1": { "other parameters": {
"mapping": [ "mapping": [
{ {
"map_type": "RelationshipClass", "map_type": "RelationshipClass",
...@@ -810,7 +810,73 @@ ...@@ -810,7 +810,73 @@
}, },
{ {
"map_type": "ParameterDefinition", "map_type": "ParameterDefinition",
"position": 2 "position": 2,
"filter_re": "^((?!(^up$|^down$)).)*$"
},
{
"map_type": "Alternative",
"position": "hidden"
},
{
"map_type": "ParameterValueMetadata",
"position": "hidden"
},
{
"map_type": "ParameterValue",
"position": 3
}
]
}
},
{
"reserve demand": {
"mapping": [
{
"map_type": "RelationshipClass",
"position": "hidden",
"value": "group__restype__up_down"
},
{
"map_type": "RelationshipClassObjectClass",
"position": "hidden",
"value": "group"
},
{
"map_type": "RelationshipClassObjectClass",
"position": "hidden",
"value": "restype"
},
{
"map_type": "RelationshipClassObjectClass",
"position": "hidden",
"value": "up_down"
},
{
"map_type": "Relationship",
"position": "hidden",
"value": "relationship"
},
{
"map_type": "RelationshipObject",
"position": 0
},
{
"map_type": "RelationshipObject",
"position": 1
},
{
"map_type": "RelationshipObject",
"position": 2,
"filter_re": "^up$|^down$"
},
{
"map_type": "RelationshipMetadata",
"position": "hidden"
},
{
"map_type": "ParameterDefinition",
"position": "hidden",
"value": "reserveDemand"
}, },
{ {
"map_type": "Alternative", "map_type": "Alternative",
...@@ -1229,7 +1295,7 @@ ...@@ -1229,7 +1295,7 @@
{ {
"map_type": "RelationshipClass", "map_type": "RelationshipClass",
"position": "hidden", "position": "hidden",
"value": "restype__up_down__group", "value": "group__restype__up_down",
"skip_columns": [ "skip_columns": [
0, 0,
1, 1,
...@@ -1241,17 +1307,17 @@ ...@@ -1241,17 +1307,17 @@
{ {
"map_type": "RelationshipClassObjectClass", "map_type": "RelationshipClassObjectClass",
"position": "hidden", "position": "hidden",
"value": "restype" "value": "group"
}, },
{ {
"map_type": "RelationshipClassObjectClass", "map_type": "RelationshipClassObjectClass",
"position": "hidden", "position": "hidden",
"value": "up_down" "value": "restype"
}, },
{ {
"map_type": "RelationshipClassObjectClass", "map_type": "RelationshipClassObjectClass",
"position": "hidden", "position": "hidden",
"value": "group" "value": "up_down"
}, },
{ {
"map_type": "Relationship", "map_type": "Relationship",
...@@ -1260,15 +1326,15 @@ ...@@ -1260,15 +1326,15 @@
}, },
{ {
"map_type": "RelationshipObject", "map_type": "RelationshipObject",
"position": 0 "position": 2
}, },
{ {
"map_type": "RelationshipObject", "map_type": "RelationshipObject",
"position": 1 "position": 0
}, },
{ {
"map_type": "RelationshipObject", "map_type": "RelationshipObject",
"position": 2 "position": 1
}, },
{ {
"map_type": "RelationshipMetadata", "map_type": "RelationshipMetadata",
...@@ -3203,8 +3269,11 @@ ...@@ -3203,8 +3269,11 @@
"uss_bound": {} "uss_bound": {}
}, },
"table_types": { "table_types": {
"unit_fail": { "p_groupReserves": {
"0": "string" "0": "string",
"1": "string",
"2": "string",
"3": "string"
} }
}, },
"table_row_types": {}, "table_row_types": {},
......
...@@ -830,6 +830,7 @@ ...@@ -830,6 +830,7 @@
{ {
"map_type": "ParameterDefinition", "map_type": "ParameterDefinition",
"position": 3, "position": 3,
"filter_re": "^((?!(reserveDemand)).)*$",
"header": "*" "header": "*"
}, },
{ {
...@@ -1688,7 +1689,7 @@ ...@@ -1688,7 +1689,7 @@
{ {
"map_type": "RelationshipClass", "map_type": "RelationshipClass",
"position": "hidden", "position": "hidden",
"filter_re": "^restype__up_down__group$" "filter_re": "^group__restype__up_down$"
}, },
{ {
"map_type": "RelationshipClassObjectClass", "map_type": "RelationshipClassObjectClass",
...@@ -1704,7 +1705,8 @@ ...@@ -1704,7 +1705,8 @@
}, },
{ {
"map_type": "ParameterDefinition", "map_type": "ParameterDefinition",
"position": "hidden" "position": "hidden",
"filter_re": "^reserveDemand$"
}, },
{ {
"map_type": "ParameterValueList", "map_type": "ParameterValueList",
...@@ -1717,17 +1719,17 @@ ...@@ -1717,17 +1719,17 @@
}, },
{ {
"map_type": "RelationshipObject", "map_type": "RelationshipObject",
"position": 0, "position": 2,
"header": "*" "header": "*"
}, },
{ {
"map_type": "RelationshipObject", "map_type": "RelationshipObject",
"position": 1, "position": 0,
"header": "*" "header": "*"
}, },
{ {
"map_type": "RelationshipObject", "map_type": "RelationshipObject",
"position": 2, "position": 1,
"header": "*" "header": "*"
}, },
{ {
...@@ -1736,7 +1738,8 @@ ...@@ -1736,7 +1738,8 @@
}, },
{ {
"map_type": "ParameterValueType", "map_type": "ParameterValueType",
"position": "hidden" "position": "hidden",
"filter_re": "2d_map"
}, },
{ {
"map_type": "IndexName", "map_type": "IndexName",
...@@ -2758,6 +2761,79 @@ ...@@ -2758,6 +2761,79 @@
"always_export_header": true, "always_export_header": true,
"group_fn": "no_group", "group_fn": "no_group",
"use_fixed_table_name": true "use_fixed_table_name": true
},
"p_groupReserves2": {
"type": "relationship_parameter_values",
"mapping": [
{
"map_type": "FixedValue",
"position": "table_name",
"value": "p_groupReserves"
},
{
"map_type": "RelationshipClass",
"position": "hidden",
"filter_re": "^group__restype__up_down$"
},
{
"map_type": "RelationshipClassObjectClass",
"position": "hidden"
},
{
"map_type": "RelationshipClassObjectClass",
"position": "hidden"
},
{
"map_type": "RelationshipClassObjectClass",
"position": "hidden"
},
{
"map_type": "ParameterDefinition",
"position": "hidden",
"filter_re": "^reserveDemand$"
},
{
"map_type": "ParameterValueList",
"position": "hidden",
"ignorable": true
},
{
"map_type": "Relationship",
"position": "hidden"
},
{
"map_type": "RelationshipObject",
"position": 0,
"header": "*"
},
{
"map_type": "RelationshipObject",
"position": 1,
"header": "*"
},
{
"map_type": "RelationshipObject",
"position": 2,
"header": "*"
},
{
"map_type": "Alternative",
"position": "hidden"
},
{
"map_type": "ParameterValueType",
"position": "hidden",
"filter_re": "single_value"
},
{
"map_type": "ParameterValue",
"position": 3
}
],
"enabled": true,
"always_export_header": true,
"group_fn": "no_group",
"use_fixed_table_name": true
} }
} }
} }
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment