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

Updating spinetoolbox project

- Adding other efficiency curve related parameters for units in the `efficiency` Map
- Renaming input_output object class to io
- Renaming restype__direction relationship class to restype__up_down
- Renaming effLevel__group__unit relationship class to effLevel__effSelector__unit
- Moving boundary data from grid__node to grid__node__boundary
- Including p_groupPolicyUnit data in unit__group instead of creating a new group__unit relationship class
- Deleting commodity mappings
- Including ts_priceChange data in node
parent 6b98eb5b
......@@ -288,7 +288,7 @@
"x": 442.86124348844345,
"y": -113.10256157821419,
"specification": "Backbone",
"execute_in_work": false,
"execute_in_work": true,
"cmd_line_args": []
},
"Backbone vara": {
......
......@@ -7,10 +7,9 @@
"settings": {
"availability": "availability",
"boundarytypes": "param_gnBoundaryTypes",
"commodity": "commodity",
"constraint": "constraint",
"effLevel": "effLevel",
"effLevel__group__unit": "effLevelGroupUnit",
"effLevel__effSelector__unit": "effLevelGroupUnit",
"effSelector": "effSelector",
"emission": "emission",
"f": "f",
......@@ -36,13 +35,13 @@
"group__restype__up_down": "group__restype__up_down",
"group__restype__up_down__group": "group__restype__up_down__group",
"group__unit": "group__unit",
"input_output": "input_output",
"io": "io",
"node": "node",
"node__emission": "node__emission",
"param_unit_ts": "param_unit_ts",
"policy": "policy",
"restype": "restype",
"restype__direction": "restypeDirection",
"restype__up_down": "restypeDirection",
"restype_inertia": "restype_inertia",
"restype_released_for_realization": "restypeReleasedForRealization",
"s": "s",
......
......@@ -179,37 +179,6 @@
}
}
],
"commodity": [
{
"Mapping 1": {
"mapping": [
{
"map_type": "RelationshipClass",
"position": "hidden",
"value": "commodity"
},
{
"map_type": "RelationshipClassObjectClass",
"position": "hidden",
"value": "node"
},
{
"map_type": "Relationship",
"position": "hidden",
"value": "relationship"
},
{
"map_type": "RelationshipObject",
"position": 0
},
{
"map_type": "RelationshipMetadata",
"position": "hidden"
}
]
}
}
],
"unitUnitEffLevel": [
{
"Mapping 1": {
......@@ -266,7 +235,7 @@
{
"map_type": "RelationshipClass",
"position": "hidden",
"value": "effLevel__group__unit"
"value": "effLevel__effSelector__unit"
},
{
"map_type": "RelationshipClassObjectClass",
......@@ -495,7 +464,7 @@
{
"map_type": "RelationshipClassObjectClass",
"position": "hidden",
"value": "input_output"
"value": "io"
},
{
"map_type": "Relationship",
......@@ -582,7 +551,7 @@
{
"map_type": "RelationshipClassObjectClass",
"position": "hidden",
"value": "slack"
"value": "boundary"
},
{
"map_type": "Relationship",
......@@ -659,7 +628,7 @@
{
"map_type": "ParameterDefinition",
"position": 1,
"filter_re": "^(?!(eff|op))"
"filter_re": "^(?!(eff|op|section|hr))"
},
{
"map_type": "Alternative",
......@@ -719,7 +688,7 @@
{
"map_type": "ParameterValueIndex",
"position": 1,
"filter_re": "eff|op"
"filter_re": "eff|op|section|hr"
},
{
"map_type": "ExpandedValue",
......@@ -1360,7 +1329,7 @@
{
"map_type": "RelationshipClass",
"position": "hidden",
"value": "grid__node",
"value": "grid__node__boundary",
"skip_columns": [
0,
1,
......@@ -1379,83 +1348,10 @@
"position": "hidden",
"value": "node"
},
{
"map_type": "Relationship",
"position": "hidden",
"value": "relationship"
},
{
"map_type": "RelationshipObject",
"position": 0,
"import_objects": true
},
{
"map_type": "RelationshipObject",
"position": 1,
"import_objects": true
},
{
"map_type": "RelationshipMetadata",
"position": "hidden"
},
{
"map_type": "ParameterDefinition",
"position": 2,
"filter_re": "^((?!(Slack)).)*$"
},
{
"map_type": "Alternative",
"position": "hidden",
"value": "Base"
},
{
"map_type": "ParameterValueMetadata",
"position": "hidden"
},
{
"map_type": "ParameterValueType",
"position": "hidden",
"value": "map"
},
{
"map_type": "IndexName",
"position": "hidden"
},
{
"map_type": "ParameterValueIndex",
"position": 3
},
{
"map_type": "ExpandedValue",
"position": 4
}
]
}
},
{
"Mapping 2": {
"mapping": [
{
"map_type": "RelationshipClass",
"position": "hidden",
"value": "grid__node",
"skip_columns": [
0,
1,
2,
3,
4
]
},
{
"map_type": "RelationshipClassObjectClass",
"position": "hidden",
"value": "grid"
},
{
"map_type": "RelationshipClassObjectClass",
"position": "hidden",
"value": "node"
"value": "boundary"
},
{
"map_type": "Relationship",
......@@ -1472,14 +1368,18 @@
"position": 1,
"import_objects": true
},
{
"map_type": "RelationshipObject",
"position": 2,
"import_objects": true
},
{
"map_type": "RelationshipMetadata",
"position": "hidden"
},
{
"map_type": "ParameterDefinition",
"position": "hidden",
"value": "slack"
"position": 3
},
{
"map_type": "Alternative",
......@@ -1491,29 +1391,7 @@
"position": "hidden"
},
{
"map_type": "ParameterValueType",
"position": "hidden",
"value": "map"
},
{
"map_type": "IndexName",
"position": "hidden"
},
{
"map_type": "ParameterValueIndex",
"position": 2,
"filter_re": "Slack"
},
{
"map_type": "IndexName",
"position": "hidden"
},
{
"map_type": "ParameterValueIndex",
"position": 3
},
{
"map_type": "ExpandedValue",
"map_type": "ParameterValue",
"position": 4
}
]
......@@ -1957,7 +1835,7 @@
{
"map_type": "RelationshipClass",
"position": "hidden",
"value": "grid__node",
"value": "grid__node__boundary",
"skip_columns": [
0,
1,
......@@ -1976,100 +1854,10 @@
"position": "hidden",
"value": "node"
},
{
"map_type": "Relationship",
"position": "hidden",
"value": "relationship"
},
{
"map_type": "RelationshipObject",
"position": 0,
"import_objects": true
},
{
"map_type": "RelationshipObject",
"position": 1,
"import_objects": true
},
{
"map_type": "RelationshipMetadata",
"position": "hidden"
},
{
"map_type": "ParameterDefinition",
"position": 2,
"filter_re": "^((?!(Slack)).)*$"
},
{
"map_type": "Alternative",
"position": "hidden",
"value": "Base_ts"
},
{
"map_type": "ParameterValueMetadata",
"position": "hidden"
},
{
"map_type": "ParameterValueType",
"position": "hidden",
"value": "map"
},
{
"map_type": "IndexName",
"position": "hidden"
},
{
"map_type": "ParameterValueIndex",
"position": "hidden",
"value": "timeseries"
},
{
"map_type": "IndexName",
"position": "hidden"
},
{
"map_type": "ParameterValueIndex",
"position": 3
},
{
"map_type": "IndexName",
"position": "hidden"
},
{
"map_type": "ParameterValueIndex",
"position": 4
},
{
"map_type": "ExpandedValue",
"position": 5
}
]
}
},
{
"Mapping 2": {
"mapping": [
{
"map_type": "RelationshipClass",
"position": "hidden",
"value": "grid__node",
"skip_columns": [
0,
1,
2,
3,
4
]
},
{
"map_type": "RelationshipClassObjectClass",
"position": "hidden",
"value": "grid"
},
{
"map_type": "RelationshipClassObjectClass",
"position": "hidden",
"value": "node"
"value": "boundary"
},
{
"map_type": "Relationship",
......@@ -2086,6 +1874,11 @@
"position": 1,
"import_objects": true
},
{
"map_type": "RelationshipObject",
"position": 2,
"import_objects": true
},
{
"map_type": "RelationshipMetadata",
"position": "hidden"
......@@ -2093,7 +1886,7 @@
{
"map_type": "ParameterDefinition",
"position": "hidden",
"value": "slack"
"value": "timeseries"
},
{
"map_type": "Alternative",
......@@ -2113,24 +1906,6 @@
"map_type": "IndexName",
"position": "hidden"
},
{
"map_type": "ParameterValueIndex",
"position": "hidden",
"value": "timeseries"
},
{
"map_type": "IndexName",
"position": "hidden"
},
{
"map_type": "ParameterValueIndex",
"position": 2,
"filter_re": "Slack"
},
{
"map_type": "IndexName",
"position": "hidden"
},
{
"map_type": "ParameterValueIndex",
"position": 3
......@@ -2463,7 +2238,7 @@
{
"map_type": "RelationshipClass",
"position": "hidden",
"value": "restype__direction"
"value": "restype__up_down"
},
{
"map_type": "RelationshipClassObjectClass",
......@@ -2976,26 +2751,16 @@
"Mapping 1": {
"mapping": [
{
"map_type": "RelationshipClass",
"position": "hidden",
"value": "commodity"
},
{
"map_type": "RelationshipClassObjectClass",
"map_type": "ObjectClass",
"position": "hidden",
"value": "node"
},
{
"map_type": "Relationship",
"position": "hidden",
"value": "relationship"
},
{
"map_type": "RelationshipObject",
"map_type": "Object",
"position": 0
},
{
"map_type": "RelationshipMetadata",
"map_type": "ObjectMetadata",
"position": "hidden"
},
{
......@@ -3286,17 +3051,17 @@
{
"map_type": "RelationshipClass",
"position": "hidden",
"value": "group__unit"
"value": "unit__group"
},
{
"map_type": "RelationshipClassObjectClass",
"position": "hidden",
"value": "group"
"value": "unit"
},
{
"map_type": "RelationshipClassObjectClass",
"position": "hidden",
"value": "unit"
"value": "group"
},
{
"map_type": "Relationship",
......@@ -3305,11 +3070,11 @@
},
{
"map_type": "RelationshipObject",
"position": 0
"position": 2
},
{
"map_type": "RelationshipObject",
"position": 2
"position": 0
},
{
"map_type": "RelationshipMetadata",
......@@ -3345,7 +3110,6 @@
"unit",
"unitUnittype",
"unit_fail",
"commodity",
"unitUnitEffLevel",
"effLevelGroupUnit",
"group",
......@@ -3402,7 +3166,6 @@
"unit": {},
"unitUnittype": {},
"unit_fail": {},
"commodity": {},
"unitUnitEffLevel": {},
"effLevelGroupUnit": {},
"group": {},
......@@ -3452,9 +3215,6 @@
"uss_bound": {}
},
"table_types": {
"restype": {
"0": "string"
},
"ts_node": {
"0": "string",
"1": "string",
......
......@@ -29,7 +29,7 @@
{
"map_type": "RelationshipClass",
"position": "table_name",
"filter_re": "restype_inertia|restypeReleasedForRealization|^commodity$|^unit_fail$"
"filter_re": "restype_inertia|restypeReleasedForRealization|^unit_fail$"
},
{
"map_type": "RelationshipClassObjectClass",
......@@ -1253,7 +1253,11 @@
{
"map_type": "RelationshipClass",
"position": "hidden",
"filter_re": "^grid__node$"
"filter_re": "^grid__node__boundary$"
},
{
"map_type": "RelationshipClassObjectClass",
"position": "hidden"
},
{
"map_type": "RelationshipClassObjectClass",
......@@ -1265,7 +1269,7 @@
},
{
"map_type": "ParameterDefinition",
"position": 2,
"position": 3,
"header": "*"
},
{
......@@ -1287,6 +1291,11 @@
"position": 1,
"header": "*"
},
{
"map_type": "RelationshipObject",
"position": 2,
"header": "*"
},
{
"map_type": "Alternative",
"position": "hidden"
......@@ -1294,19 +1303,10 @@
{
"map_type": "ParameterValueType",
"position": "hidden",
"filter_re": "1d_map"
},
{
"map_type": "IndexName",
"position": "hidden"
},
{
"map_type": "ParameterValueIndex",
"position": 3,
"header": "*"
"filter_re": "single_value"
},
{
"map_type": "ExpandedValue",
"map_type": "ParameterValue",
"position": 4
}
],
......@@ -1578,7 +1578,7 @@
{
"map_type": "RelationshipClass",
"position": "hidden",
"filter_re": "^group__unit$"
"filter_re": "^uGroup$"
},
{
"map_type": "RelationshipClassObjectClass",
......@@ -1604,12 +1604,12 @@
},
{
"map_type": "RelationshipObject",
"position": 0,
"position": 2,
"header": "*"
},
{
"map_type": "RelationshipObject",
"position": 2,
"position": 0,
"header": "*"
},
{
......@@ -1874,7 +1874,7 @@
"use_fixed_table_name": true
},
"ts_priceChange": {
"type": "relationship_parameter_values",
"type": "object_parameter_values",
"mapping": [
{
"map_type": "FixedValue",
......@@ -1882,13 +1882,9 @@
"value": "ts_priceChange"
},
{
"map_type": "RelationshipClass",
"map_type": "ObjectClass",
"position": "hidden",
"filter_re": "^commodity$"
},
{