Commit 402c28b2 authored by Niina Helistö's avatar Niina Helistö
Browse files

Updating spinetoolbox project: alternatives and unit efficiency

- Deleting constant alternative names from importer mappings
- Importing timeseries form of unit efficiency data into a separate parameter efficiency_ts and similar update to the exporter
parent e33e00d9
...@@ -172,8 +172,7 @@ ...@@ -172,8 +172,7 @@
}, },
{ {
"map_type": "Alternative", "map_type": "Alternative",
"position": "hidden", "position": "hidden"
"value": "Base"
}, },
{ {
"map_type": "ParameterValueMetadata", "map_type": "ParameterValueMetadata",
...@@ -358,8 +357,7 @@ ...@@ -358,8 +357,7 @@
}, },
{ {
"map_type": "Alternative", "map_type": "Alternative",
"position": "hidden", "position": "hidden"
"value": "Base"
}, },
{ {
"map_type": "ParameterValueMetadata", "map_type": "ParameterValueMetadata",
...@@ -431,8 +429,7 @@ ...@@ -431,8 +429,7 @@
}, },
{ {
"map_type": "Alternative", "map_type": "Alternative",
"position": "hidden", "position": "hidden"
"value": "Base"
}, },
{ {
"map_type": "ParameterValueMetadata", "map_type": "ParameterValueMetadata",
...@@ -510,8 +507,7 @@ ...@@ -510,8 +507,7 @@
}, },
{ {
"map_type": "Alternative", "map_type": "Alternative",
"position": "hidden", "position": "hidden"
"value": "Base"
}, },
{ {
"map_type": "ParameterValueMetadata", "map_type": "ParameterValueMetadata",
...@@ -597,8 +593,7 @@ ...@@ -597,8 +593,7 @@
}, },
{ {
"map_type": "Alternative", "map_type": "Alternative",
"position": "hidden", "position": "hidden"
"value": "Base"
}, },
{ {
"map_type": "ParameterValueMetadata", "map_type": "ParameterValueMetadata",
...@@ -641,8 +636,7 @@ ...@@ -641,8 +636,7 @@
}, },
{ {
"map_type": "Alternative", "map_type": "Alternative",
"position": "hidden", "position": "hidden"
"value": "Base"
}, },
{ {
"map_type": "ParameterValueMetadata", "map_type": "ParameterValueMetadata",
...@@ -678,8 +672,7 @@ ...@@ -678,8 +672,7 @@
}, },
{ {
"map_type": "Alternative", "map_type": "Alternative",
"position": "hidden", "position": "hidden"
"value": "Base"
}, },
{ {
"map_type": "ParameterValueMetadata", "map_type": "ParameterValueMetadata",
...@@ -727,12 +720,11 @@ ...@@ -727,12 +720,11 @@
{ {
"map_type": "ParameterDefinition", "map_type": "ParameterDefinition",
"position": "hidden", "position": "hidden",
"value": "efficiency" "value": "efficiency_ts"
}, },
{ {
"map_type": "Alternative", "map_type": "Alternative",
"position": "hidden", "position": "hidden"
"value": "Base_ts"
}, },
{ {
"map_type": "ParameterValueMetadata", "map_type": "ParameterValueMetadata",
...@@ -822,8 +814,7 @@ ...@@ -822,8 +814,7 @@
}, },
{ {
"map_type": "Alternative", "map_type": "Alternative",
"position": "hidden", "position": "hidden"
"value": "Base"
}, },
{ {
"map_type": "ParameterValueMetadata", "map_type": "ParameterValueMetadata",
...@@ -888,8 +879,7 @@ ...@@ -888,8 +879,7 @@
}, },
{ {
"map_type": "Alternative", "map_type": "Alternative",
"position": "hidden", "position": "hidden"
"value": "Base"
}, },
{ {
"map_type": "ParameterValueMetadata", "map_type": "ParameterValueMetadata",
...@@ -963,8 +953,7 @@ ...@@ -963,8 +953,7 @@
}, },
{ {
"map_type": "Alternative", "map_type": "Alternative",
"position": "hidden", "position": "hidden"
"value": "Base"
}, },
{ {
"map_type": "ParameterValueMetadata", "map_type": "ParameterValueMetadata",
...@@ -1045,8 +1034,7 @@ ...@@ -1045,8 +1034,7 @@
}, },
{ {
"map_type": "Alternative", "map_type": "Alternative",
"position": "hidden", "position": "hidden"
"value": "Base"
}, },
{ {
"map_type": "ParameterValueMetadata", "map_type": "ParameterValueMetadata",
...@@ -1120,8 +1108,7 @@ ...@@ -1120,8 +1108,7 @@
}, },
{ {
"map_type": "Alternative", "map_type": "Alternative",
"position": "hidden", "position": "hidden"
"value": "Base"
}, },
{ {
"map_type": "ParameterValueMetadata", "map_type": "ParameterValueMetadata",
...@@ -1221,8 +1208,7 @@ ...@@ -1221,8 +1208,7 @@
}, },
{ {
"map_type": "Alternative", "map_type": "Alternative",
"position": "hidden", "position": "hidden"
"value": "Base"
}, },
{ {
"map_type": "ParameterValueMetadata", "map_type": "ParameterValueMetadata",
...@@ -1295,8 +1281,7 @@ ...@@ -1295,8 +1281,7 @@
}, },
{ {
"map_type": "Alternative", "map_type": "Alternative",
"position": "hidden", "position": "hidden"
"value": "Base"
}, },
{ {
"map_type": "ParameterValueMetadata", "map_type": "ParameterValueMetadata",
...@@ -1392,8 +1377,7 @@ ...@@ -1392,8 +1377,7 @@
}, },
{ {
"map_type": "Alternative", "map_type": "Alternative",
"position": "hidden", "position": "hidden"
"value": "Base"
}, },
{ {
"map_type": "ParameterValueMetadata", "map_type": "ParameterValueMetadata",
...@@ -1492,8 +1476,7 @@ ...@@ -1492,8 +1476,7 @@
}, },
{ {
"map_type": "Alternative", "map_type": "Alternative",
"position": "hidden", "position": "hidden"
"value": "Base"
}, },
{ {
"map_type": "ParameterValueMetadata", "map_type": "ParameterValueMetadata",
...@@ -1562,8 +1545,7 @@ ...@@ -1562,8 +1545,7 @@
}, },
{ {
"map_type": "Alternative", "map_type": "Alternative",
"position": "hidden", "position": "hidden"
"value": "Base"
}, },
{ {
"map_type": "ParameterValueMetadata", "map_type": "ParameterValueMetadata",
...@@ -1646,8 +1628,7 @@ ...@@ -1646,8 +1628,7 @@
}, },
{ {
"map_type": "Alternative", "map_type": "Alternative",
"position": "hidden", "position": "hidden"
"value": "Base"
}, },
{ {
"map_type": "ParameterValueMetadata", "map_type": "ParameterValueMetadata",
...@@ -1713,8 +1694,7 @@ ...@@ -1713,8 +1694,7 @@
}, },
{ {
"map_type": "Alternative", "map_type": "Alternative",
"position": "hidden", "position": "hidden"
"value": "Base"
}, },
{ {
"map_type": "ParameterValueMetadata", "map_type": "ParameterValueMetadata",
...@@ -1801,8 +1781,7 @@ ...@@ -1801,8 +1781,7 @@
}, },
{ {
"map_type": "Alternative", "map_type": "Alternative",
"position": "hidden", "position": "hidden"
"value": "Base"
}, },
{ {
"map_type": "ParameterValueMetadata", "map_type": "ParameterValueMetadata",
...@@ -1899,8 +1878,7 @@ ...@@ -1899,8 +1878,7 @@
}, },
{ {
"map_type": "Alternative", "map_type": "Alternative",
"position": "hidden", "position": "hidden"
"value": "Base_ts"
}, },
{ {
"map_type": "ParameterValueMetadata", "map_type": "ParameterValueMetadata",
...@@ -1960,8 +1938,7 @@ ...@@ -1960,8 +1938,7 @@
}, },
{ {
"map_type": "Alternative", "map_type": "Alternative",
"position": "hidden", "position": "hidden"
"value": "Base"
}, },
{ {
"map_type": "ParameterValueMetadata", "map_type": "ParameterValueMetadata",
...@@ -2061,8 +2038,7 @@ ...@@ -2061,8 +2038,7 @@
}, },
{ {
"map_type": "Alternative", "map_type": "Alternative",
"position": "hidden", "position": "hidden"
"value": "Base"
}, },
{ {
"map_type": "ParameterValueMetadata", "map_type": "ParameterValueMetadata",
...@@ -2121,8 +2097,7 @@ ...@@ -2121,8 +2097,7 @@
}, },
{ {
"map_type": "Alternative", "map_type": "Alternative",
"position": "hidden", "position": "hidden"
"value": "Base"
}, },
{ {
"map_type": "ParameterValueMetadata", "map_type": "ParameterValueMetadata",
...@@ -2182,8 +2157,7 @@ ...@@ -2182,8 +2157,7 @@
}, },
{ {
"map_type": "Alternative", "map_type": "Alternative",
"position": "hidden", "position": "hidden"
"value": "Base"
}, },
{ {
"map_type": "ParameterValueMetadata", "map_type": "ParameterValueMetadata",
...@@ -2306,8 +2280,7 @@ ...@@ -2306,8 +2280,7 @@
}, },
{ {
"map_type": "Alternative", "map_type": "Alternative",
"position": "hidden", "position": "hidden"
"value": "Base"
}, },
{ {
"map_type": "ParameterValueMetadata", "map_type": "ParameterValueMetadata",
...@@ -2346,8 +2319,7 @@ ...@@ -2346,8 +2319,7 @@
}, },
{ {
"map_type": "Alternative", "map_type": "Alternative",
"position": "hidden", "position": "hidden"
"value": "Base"
}, },
{ {
"map_type": "ParameterValueMetadata", "map_type": "ParameterValueMetadata",
...@@ -2387,8 +2359,7 @@ ...@@ -2387,8 +2359,7 @@
}, },
{ {
"map_type": "Alternative", "map_type": "Alternative",
"position": "hidden", "position": "hidden"
"value": "Base"
}, },
{ {
"map_type": "ParameterValueMetadata", "map_type": "ParameterValueMetadata",
...@@ -2438,8 +2409,7 @@ ...@@ -2438,8 +2409,7 @@
}, },
{ {
"map_type": "Alternative", "map_type": "Alternative",
"position": "hidden", "position": "hidden"
"value": "Base"
}, },
{ {
"map_type": "ParameterValueMetadata", "map_type": "ParameterValueMetadata",
...@@ -2510,8 +2480,7 @@ ...@@ -2510,8 +2480,7 @@
}, },
{ {
"map_type": "Alternative", "map_type": "Alternative",
"position": "hidden", "position": "hidden"
"value": "Base_ts"
}, },
{ {
"map_type": "ParameterValueMetadata", "map_type": "ParameterValueMetadata",
...@@ -2570,8 +2539,7 @@ ...@@ -2570,8 +2539,7 @@
}, },
{ {
"map_type": "Alternative", "map_type": "Alternative",
"position": "hidden", "position": "hidden"
"value": "Base"
}, },
{ {
"map_type": "ParameterValueMetadata", "map_type": "ParameterValueMetadata",
...@@ -2643,8 +2611,7 @@ ...@@ -2643,8 +2611,7 @@
}, },
{ {
"map_type": "Alternative", "map_type": "Alternative",
"position": "hidden", "position": "hidden"
"value": "Base"
}, },
{ {
"map_type": "ParameterValueMetadata", "map_type": "ParameterValueMetadata",
...@@ -2700,8 +2667,7 @@ ...@@ -2700,8 +2667,7 @@
}, },
{ {
"map_type": "Alternative", "map_type": "Alternative",
"position": "hidden", "position": "hidden"
"value": "Base"
}, },
{ {
"map_type": "ParameterValueMetadata", "map_type": "ParameterValueMetadata",
...@@ -2757,8 +2723,7 @@ ...@@ -2757,8 +2723,7 @@
}, },
{ {
"map_type": "Alternative", "map_type": "Alternative",
"position": "hidden", "position": "hidden"
"value": "Base"
}, },
{ {
"map_type": "ParameterValueMetadata", "map_type": "ParameterValueMetadata",
...@@ -2796,8 +2761,7 @@ ...@@ -2796,8 +2761,7 @@
}, },
{ {
"map_type": "Alternative", "map_type": "Alternative",
"position": "hidden", "position": "hidden"
"value": "Base"
}, },
{ {
"map_type": "ParameterValueMetadata", "map_type": "ParameterValueMetadata",
...@@ -2878,8 +2842,7 @@ ...@@ -2878,8 +2842,7 @@
}, },
{ {
"map_type": "Alternative", "map_type": "Alternative",
"position": "hidden", "position": "hidden"
"value": "Base"
}, },
{ {
"map_type": "ParameterValueMetadata", "map_type": "ParameterValueMetadata",
...@@ -3112,8 +3075,7 @@ ...@@ -3112,8 +3075,7 @@
}, },
{ {
"map_type": "Alternative", "map_type": "Alternative",
"position": "hidden", "position": "hidden"
"value": "Base"
}, },
{ {
"map_type": "ParameterValueMetadata", "map_type": "ParameterValueMetadata",
...@@ -3243,17 +3205,6 @@ ...@@ -3243,17 +3205,6 @@
"table_types": { "table_types": {
"unit_fail": { "unit_fail": {
"0": "string" "0": "string"
},
"p_unit": {
"0": "string",
"1": "string",
"2": "string"
},
"restypeReleasedForRealization": {
"0": "string"
},
"restype_inertia": {
"0": "string"
} }
}, },
"table_row_types": {}, "table_row_types": {},
......
...@@ -1619,7 +1619,7 @@ ...@@ -1619,7 +1619,7 @@
{ {
"map_type": "ParameterDefinition", "map_type": "ParameterDefinition",
"position": "hidden", "position": "hidden",
"filter_re": "^efficiency$" "filter_re": "^efficiency_ts$"
}, },
{ {
"map_type": "ParameterValueList", "map_type": "ParameterValueList",
......
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