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 @@ ...@@ -288,7 +288,7 @@
"x": 442.86124348844345, "x": 442.86124348844345,
"y": -113.10256157821419, "y": -113.10256157821419,
"specification": "Backbone", "specification": "Backbone",
"execute_in_work": false, "execute_in_work": true,
"cmd_line_args": [] "cmd_line_args": []
}, },
"Backbone vara": { "Backbone vara": {
......
...@@ -7,10 +7,9 @@ ...@@ -7,10 +7,9 @@
"settings": { "settings": {
"availability": "availability", "availability": "availability",
"boundarytypes": "param_gnBoundaryTypes", "boundarytypes": "param_gnBoundaryTypes",
"commodity": "commodity",
"constraint": "constraint", "constraint": "constraint",
"effLevel": "effLevel", "effLevel": "effLevel",
"effLevel__group__unit": "effLevelGroupUnit", "effLevel__effSelector__unit": "effLevelGroupUnit",
"effSelector": "effSelector", "effSelector": "effSelector",
"emission": "emission", "emission": "emission",
"f": "f", "f": "f",
...@@ -36,13 +35,13 @@ ...@@ -36,13 +35,13 @@
"group__restype__up_down": "group__restype__up_down", "group__restype__up_down": "group__restype__up_down",
"group__restype__up_down__group": "group__restype__up_down__group", "group__restype__up_down__group": "group__restype__up_down__group",
"group__unit": "group__unit", "group__unit": "group__unit",
"input_output": "input_output", "io": "io",
"node": "node", "node": "node",
"node__emission": "node__emission", "node__emission": "node__emission",
"param_unit_ts": "param_unit_ts", "param_unit_ts": "param_unit_ts",
"policy": "policy", "policy": "policy",
"restype": "restype", "restype": "restype",
"restype__direction": "restypeDirection", "restype__up_down": "restypeDirection",
"restype_inertia": "restype_inertia", "restype_inertia": "restype_inertia",
"restype_released_for_realization": "restypeReleasedForRealization", "restype_released_for_realization": "restypeReleasedForRealization",
"s": "s", "s": "s",
......
This diff is collapsed.
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
{ {
"map_type": "RelationshipClass", "map_type": "RelationshipClass",
"position": "table_name", "position": "table_name",
"filter_re": "restype_inertia|restypeReleasedForRealization|^commodity$|^unit_fail$" "filter_re": "restype_inertia|restypeReleasedForRealization|^unit_fail$"
}, },
{ {
"map_type": "RelationshipClassObjectClass", "map_type": "RelationshipClassObjectClass",
...@@ -1253,7 +1253,11 @@ ...@@ -1253,7 +1253,11 @@
{ {
"map_type": "RelationshipClass", "map_type": "RelationshipClass",
"position": "hidden", "position": "hidden",
"filter_re": "^grid__node$" "filter_re": "^grid__node__boundary$"
},
{
"map_type": "RelationshipClassObjectClass",
"position": "hidden"
}, },
{ {
"map_type": "RelationshipClassObjectClass", "map_type": "RelationshipClassObjectClass",
...@@ -1265,7 +1269,7 @@ ...@@ -1265,7 +1269,7 @@
}, },
{ {
"map_type": "ParameterDefinition", "map_type": "ParameterDefinition",
"position": 2, "position": 3,
"header": "*" "header": "*"
}, },
{ {
...@@ -1287,6 +1291,11 @@ ...@@ -1287,6 +1291,11 @@
"position": 1, "position": 1,
"header": "*" "header": "*"
}, },
{
"map_type": "RelationshipObject",
"position": 2,
"header": "*"
},
{ {
"map_type": "Alternative", "map_type": "Alternative",
"position": "hidden" "position": "hidden"
...@@ -1294,19 +1303,10 @@ ...@@ -1294,19 +1303,10 @@
{ {
"map_type": "ParameterValueType", "map_type": "ParameterValueType",
"position": "hidden", "position": "hidden",
"filter_re": "1d_map" "filter_re": "single_value"
},
{
"map_type": "IndexName",
"position": "hidden"
},
{
"map_type": "ParameterValueIndex",
"position": 3,
"header": "*"
}, },
{ {
"map_type": "ExpandedValue", "map_type": "ParameterValue",
"position": 4 "position": 4
} }
], ],
...@@ -1578,7 +1578,7 @@ ...@@ -1578,7 +1578,7 @@
{ {
"map_type": "RelationshipClass", "map_type": "RelationshipClass",
"position": "hidden", "position": "hidden",
"filter_re": "^group__unit$" "filter_re": "^uGroup$"
}, },
{ {
"map_type": "RelationshipClassObjectClass", "map_type": "RelationshipClassObjectClass",
...@@ -1604,12 +1604,12 @@ ...@@ -1604,12 +1604,12 @@
}, },
{ {
"map_type": "RelationshipObject", "map_type": "RelationshipObject",
"position": 0, "position": 2,
"header": "*" "header": "*"
}, },
{ {
"map_type": "RelationshipObject", "map_type": "RelationshipObject",
"position": 2, "position": 0,
"header": "*" "header": "*"
}, },
{ {
...@@ -1874,7 +1874,7 @@ ...@@ -1874,7 +1874,7 @@
"use_fixed_table_name": true "use_fixed_table_name": true
}, },
"ts_priceChange": { "ts_priceChange": {
"type": "relationship_parameter_values", "type": "object_parameter_values",
"mapping": [ "mapping": [
{ {
"map_type": "FixedValue", "map_type": "FixedValue",
...@@ -1882,13 +1882,9 @@ ...@@ -1882,13 +1882,9 @@
"value": "ts_priceChange" "value": "ts_priceChange"
}, },
{ {
"map_type": "RelationshipClass", "map_type": "ObjectClass",
"position": "hidden", "position": "hidden",
"filter_re": "^commodity$" "filter_re": "^node$"
},
{
"map_type": "RelationshipClassObjectClass",
"position": "hidden"
}, },
{ {
"map_type": "ParameterDefinition", "map_type": "ParameterDefinition",
...@@ -1900,11 +1896,7 @@ ...@@ -1900,11 +1896,7 @@
"ignorable": true "ignorable": true
}, },
{ {
"map_type": "Relationship", "map_type": "Object",
"position": "hidden"
},
{
"map_type": "RelationshipObject",
"position": 0, "position": 0,
"header": "*" "header": "*"
}, },
...@@ -2028,7 +2020,11 @@ ...@@ -2028,7 +2020,11 @@
{ {
"map_type": "RelationshipClass", "map_type": "RelationshipClass",
"position": "hidden", "position": "hidden",
"filter_re": "^grid__node$" "filter_re": "^grid__node__boundary$"
},
{
"map_type": "RelationshipClassObjectClass",
"position": "hidden"
}, },
{ {
"map_type": "RelationshipClassObjectClass", "map_type": "RelationshipClassObjectClass",
...@@ -2040,8 +2036,7 @@ ...@@ -2040,8 +2036,7 @@
}, },
{ {
"map_type": "ParameterDefinition", "map_type": "ParameterDefinition",
"position": 2, "position": "hidden",
"filter_re": "^((?!(influx|storageValue|boundSamples|slack)).)*$",
"header": "*" "header": "*"
}, },
{ {
...@@ -2064,22 +2059,18 @@ ...@@ -2064,22 +2059,18 @@
"header": "*" "header": "*"
}, },
{ {
"map_type": "Alternative", "map_type": "RelationshipObject",
"position": "hidden" "position": 2,
}, "header": "*"
{
"map_type": "ParameterValueType",
"position": "hidden",
"filter_re": "3d_map"
}, },
{ {
"map_type": "IndexName", "map_type": "Alternative",
"position": "hidden" "position": "hidden"
}, },
{ {
"map_type": "ParameterValueIndex", "map_type": "ParameterValueType",
"position": "hidden", "position": "hidden",
"header": "*" "filter_re": "2d_map"
}, },
{ {
"map_type": "IndexName", "map_type": "IndexName",
...@@ -2298,7 +2289,7 @@ ...@@ -2298,7 +2289,7 @@
{ {
"map_type": "ParameterDefinition", "map_type": "ParameterDefinition",
"position": "hidden", "position": "hidden",
"filter_re": "^(eff|op)", "filter_re": "^efficiency$",
"header": "*" "header": "*"
}, },
{ {
...@@ -2653,187 +2644,6 @@ ...@@ -2653,187 +2644,6 @@
"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_gnBoundaryPropertiesForStates2": {
"type": "relationship_parameter_values",
"mapping": [
{
"map_type": "FixedValue",
"position": "table_name",
"value": "p_gnBoundaryPropertiesForStates"
},
{
"map_type": "RelationshipClass",
"position": "hidden",
"filter_re": "^grid__node$"
},
{
"map_type": "RelationshipClassObjectClass",
"position": "hidden"
},
{
"map_type": "RelationshipClassObjectClass",
"position": "hidden"
},
{
"map_type": "ParameterDefinition",
"position": "hidden",
"filter_re": "^slack$"
},
{
"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": "Alternative",
"position": "hidden"
},
{
"map_type": "ParameterValueType",
"position": "hidden",
"filter_re": "2d_map"
},
{
"map_type": "IndexName",
"position": "hidden"
},
{
"map_type": "ParameterValueIndex",
"position": 2,
"header": "*"
},
{
"map_type": "IndexName",
"position": "hidden"
},
{
"map_type": "ParameterValueIndex",
"position": 3,
"header": "*"
},
{
"map_type": "ExpandedValue",
"position": 4
}
],
"enabled": true,
"always_export_header": true,
"group_fn": "no_group",
"use_fixed_table_name": true
},
"ts_node2": {
"type": "relationship_parameter_values",
"mapping": [
{
"map_type": "FixedValue",
"position": "table_name",
"value": "ts_node"
},
{
"map_type": "RelationshipClass",
"position": "hidden",
"filter_re": "^grid__node$"
},
{
"map_type": "RelationshipClassObjectClass",
"position": "hidden"
},
{
"map_type": "RelationshipClassObjectClass",
"position": "hidden"
},
{
"map_type": "ParameterDefinition",
"position": "hidden",
"filter_re": "^slack$"
},
{
"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": "Alternative",
"position": "hidden"
},
{
"map_type": "ParameterValueType",
"position": "hidden",
"filter_re": "4d_map"
},
{
"map_type": "IndexName",
"position": "hidden"
},
{
"map_type": "ParameterValueIndex",
"position": "hidden"
},
{
"map_type": "IndexName",
"position": "hidden"
},
{
"map_type": "ParameterValueIndex",
"position": 2,
"header": "*"
},
{
"map_type": "IndexName",
"position": "hidden"
},
{
"map_type": "ParameterValueIndex",
"position": 3,
"header": "*"
},
{
"map_type": "IndexName",
"position": "hidden"
},
{
"map_type": "ParameterValueIndex",
"position": 4,
"header": "*"
},
{
"map_type": "ExpandedValue",
"position": 5
}
],
"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