Skip to content
GitLab
Commit 7b718161 authored by Niina Helistö's avatar Niina Helistö
Browse files

Updating the spinetoolbox project. 

Import
- not importing f objects anymore, f is now used as an index
- deleting all 'ts_...' relationship imports, including timeseries parameters in other relationships instead, using Base_ts alternative
- importing node boundaries as mappings

Transformer
- not renaming parameters anymore

Export
- updating the exporter according to the importer changes
- exploiting the new feature to export multiple mappings to the same GDX "table"
- filtering value types when exporting constants and timeseries/mappings

The alternatives should be used differently.
parent b33f198b
Expand all Hide whitespace changes
Inline Side-by-side
.spinetoolbox/items/bb_parameters/filter_config.json
View file @ 7b718161
{"type": "parameter_renamer", "name_map": {"ts_grid__node__boundary__f": {"boundaryValue": "ts_node"}, "ts_flow__node__f": {"capacityFactor": "ts_cf"}, "unit__constraint__node": {"coefficient": "p_unitConstraintNode"}, "unit__constraint": {"constant": "p_unitConstraint"}, "s": {"discountFactor": "p_s_discountFactor"}, "node__emission": {"emission_content": "p_nEmission"}, "gnu__restype__up_down__restype": {"forwardReserve": "p_gnuRes2Res"}, "ts_grid__node__f": {"influx": "ts_influx"}, "ts_commodity": {"priceChange": "ts_priceChange"}, "ts_restype__up_down__group__f": {"reserveDemand": "ts_reserveDemand"}, "grid__node": {"storageValue": "p_storageValue"}}}
\ No newline at end of file
{"type": "parameter_renamer", "name_map": {}}
\ No newline at end of file
.spinetoolbox/project.json
View file @ 7b718161
......@@ -112,7 +112,14 @@
"to": [
"BB_sets",
"left"
]
],
"resource_filters": {
"db_url@BB_data": {
"scenario_filter": [
1
]
}
}
},
{
"from": [
......@@ -232,7 +239,7 @@
"type": "Data Store",
"description": "",
"x": -106.38126700713067,
"y": -132.3081377176571,
"y": -132.69828018438696,
"url": {
"dialect": "sqlite",
"username": "",
......@@ -251,7 +258,7 @@
"type": "Data Connection",
"description": "",
"x": -300.4477396385093,
"y": 90.30688516169224,
"y": 89.91674269496238,
"references": [
{
"type": "path",
......@@ -264,7 +271,7 @@
"type": "Data Connection",
"description": "",
"x": 192.64471365960787,
"y": -36.74427665804626,
"y": -37.134419124776116,
"references": [
{
"type": "path",
......@@ -292,21 +299,21 @@
"type": "Data Connection",
"description": "",
"x": -144.99988274364932,
"y": 164.25641901597137,
"y": 163.86627654924152,
"references": []
},
"BB_config_files_vara": {
"type": "Data Connection",
"description": "",
"x": 132.74637152587613,
"y": 48.86918838194053,
"y": 48.479045915210676,
"references": []
},
"Backbone": {
"type": "Tool",
"description": "",
"x": 442.86124348844345,
"y": -112.71241911148434,
"y": -113.10256157821419,
"specification": "Backbone",
"execute_in_work": false,
"cmd_line_args": []
......@@ -315,7 +322,7 @@
"type": "Tool",
"description": "",
"x": 349.4121144699393,
"y": 41.430899898495525,
"y": 41.04075743176567,
"specification": "Backbone",
"execute_in_work": false,
"cmd_line_args": [
......@@ -333,7 +340,7 @@
"type": "Tool",
"description": "",
"x": -445.3612434884435,
"y": -136.83042664578178,
"y": -137.22056911251164,
"specification": "BB_base_sets",
"execute_in_work": false,
"cmd_line_args": []
......@@ -341,8 +348,8 @@
"Convert": {
"type": "Importer",
"description": "",
"x": -192.45378093519278,
"y": -22.086840259669486,
"x": -193.73406586865244,
"y": -22.476982726399342,
"specification": "BB1.4_to_SpineDB",
"cancel_on_error": true,
"file_selection": [
......@@ -356,17 +363,17 @@
"type": "Importer",
"description": "",
"x": -287.8415342698604,
"y": -130.0835313652039,
"y": -130.47367383193375,
"specification": "Import_Bacbkone_base_sets_to_SpineDB",
"cancel_on_error": true,
"file_selection": [
[
"Backbone_base_sets_to_gdx.lst",
false
],
[
"Backbone_base_sets.gdx",
true
],
[
"Backbone_base_sets_to_gdx.lst",
false
]
]
},
......@@ -374,7 +381,7 @@
"type": "Importer",
"description": "",
"x": -5.105629674072162,
"y": -28.736382663956306,
"y": -29.12652513068616,
"specification": "BB_to_SpineDB_ts",
"cancel_on_error": true,
"file_selection": []
......@@ -383,14 +390,14 @@
"type": "Data Transformer",
"description": "",
"x": 36.21444168453502,
"y": -130.47971652364004,
"y": -130.8698589903699,
"specification": "ToBackboneSets"
},
"Export_to_BB": {
"type": "Exporter",
"description": "",
"x": 305.9880990968649,
"y": -157.69584914905198,
"y": -159.36627654924155,
"databases": [
{
"output_file_name": "inputData.gdx",
......@@ -409,8 +416,8 @@
"BB_parameters": {
"type": "Data Transformer",
"description": "",
"x": 166.4370413497591,
"y": -160.25641901597137,
"x": 166.43704134975908,
"y": -159.36627654924155,
"specification": "ToBackboneParameters"
}
}
......
spineToolbox.json
View file @ 7b718161
......@@ -14,16 +14,16 @@
"inputfiles": [
"input/1_options.gms",
"input/timeAndSamples.inc",
"input/modelsInit.gms",
"input/scheduleInit.gms",
"input/modelsInit.gms",
"input/inputData.gdx"
],
"inputfiles_opt": [
"input/*.*"
],
"outputfiles": [
"Backbone.lst",
"output/results.gdx"
"output/results.gdx",
"Backbone.lst"
],
"cmdline_args": [],
"execute_in_work": false,
......
tools/Convert_to_Bacbbone_parameter_names.json
View file @ 7b718161
......@@ -4,40 +4,6 @@
"description": "",
"filter": {
"type": "parameter_rename",
"settings": {
"ts_grid__node__boundary__f": {
"boundaryValue": "ts_node"
},
"ts_flow__node__f": {
"capacityFactor": "ts_cf"
},
"unit__constraint__node": {
"coefficient": "p_unitConstraintNode"
},
"unit__constraint": {
"constant": "p_unitConstraint"
},
"s": {
"discountFactor": "p_s_discountFactor"
},
"node__emission": {
"emission_content": "p_nEmission"
},
"gnu__restype__up_down__restype": {
"forwardReserve": "p_gnuRes2Res"
},
"ts_grid__node__f": {
"influx": "ts_influx"
},
"ts_commodity": {
"priceChange": "ts_priceChange"
},
"ts_restype__up_down__group__f": {
"reserveDemand": "ts_reserveDemand"
},
"grid__node": {
"storageValue": "p_storageValue"
}
}
"settings": {}
}
}
\ No newline at end of file
tools/Import_Bacbkone_base_sets_to_SpineDB.json
View file @ 7b718161
......@@ -5,163 +5,149 @@
"table_mappings": {
"s": [
{
"map_type": "ObjectClass",
"skip_columns": [],
"read_start_row": 0,
"name": {
"map_type": "constant",
"reference": "s"
},
"parameters": {
"map_type": "None"
},
"import_objects": true,
"objects": {
"map_type": "column",
"reference": 0
},
"object_metadata": {
"map_type": "None"
},
"mapping_name": "Mapping 0"
"Mapping 0": {
"mapping": [
{
"map_type": "ObjectClass",
"position": "hidden",
"value": "s"
},
{
"map_type": "Object",
"position": 0
},
{
"map_type": "ObjectMetadata",
"position": "hidden"
}
]
}
}
],
"f": [
{
"map_type": "ObjectClass",
"skip_columns": [],
"read_start_row": 0,
"name": {
"map_type": "constant",
"reference": "f"
},
"parameters": {
"map_type": "None"
},
"import_objects": true,
"objects": {
"map_type": "column",
"reference": 0
},
"object_metadata": {
"map_type": "None"
},
"mapping_name": "Mapping 0"
"Mapping 0": {
"mapping": [
{
"map_type": "ObjectClass",
"position": "hidden",
"value": "f"
},
{
"map_type": "Object",
"position": 0
},
{
"map_type": "ObjectMetadata",
"position": "hidden"
}
]
}
}
],
"scenario": [
{
"map_type": "ObjectClass",
"skip_columns": [],
"read_start_row": 0,
"name": {
"map_type": "constant",
"reference": "scenario"
},
"parameters": {
"map_type": "None"
},
"import_objects": true,
"objects": {
"map_type": "column",
"reference": 0
},
"object_metadata": {
"map_type": "None"
},
"mapping_name": "Mapping 0"
"Mapping 0": {
"mapping": [
{
"map_type": "ObjectClass",
"position": "hidden",
"value": "scenario"
},
{
"map_type": "Object",
"position": 0
},
{
"map_type": "ObjectMetadata",
"position": "hidden"
}
]
}
}
],
"input_output": [
{
"map_type": "ObjectClass",
"skip_columns": [],
"read_start_row": 0,
"name": {
"map_type": "constant",
"reference": "input_output"
},
"parameters": {
"map_type": "None"
},
"import_objects": true,
"objects": {
"map_type": "column",
"reference": 0
},
"object_metadata": {
"map_type": "None"
},
"mapping_name": "Mapping 0"
"Mapping 0": {
"mapping": [
{
"map_type": "ObjectClass",
"position": "hidden",
"value": "input_output"
},
{
"map_type": "Object",
"position": 0
},
{
"map_type": "ObjectMetadata",
"position": "hidden"
}
]
}
}
],
"effLevel": [
{
"map_type": "ObjectClass",
"skip_columns": [],
"read_start_row": 0,
"name": {
"map_type": "constant",
"reference": "effLevel"
},
"parameters": {
"map_type": "None"
},
"import_objects": true,
"objects": {
"map_type": "column",
"reference": 0
},
"object_metadata": {
"map_type": "None"
},
"mapping_name": "Mapping 0"
"Mapping 0": {
"mapping": [
{
"map_type": "ObjectClass",
"position": "hidden",
"value": "effLevel"
},
{
"map_type": "Object",
"position": 0
},
{
"map_type": "ObjectMetadata",
"position": "hidden"
}
]
}
}
],
"effSelector": [
{
"map_type": "ObjectClass",
"skip_columns": [],
"read_start_row": 0,
"name": {
"map_type": "constant",
"reference": "effSelector"
},
"parameters": {
"map_type": "None"
},
"import_objects": true,
"objects": {
"map_type": "column",
"reference": 0
},
"object_metadata": {
"map_type": "None"
},
"mapping_name": "Mapping 0"
"Mapping 0": {
"mapping": [
{
"map_type": "ObjectClass",
"position": "hidden",
"value": "effSelector"
},
{
"map_type": "Object",
"position": 0
},
{
"map_type": "ObjectMetadata",
"position": "hidden"
}
]
}
}
],
"up_down": [
{
"map_type": "ObjectClass",
"skip_columns": [],
"read_start_row": 0,
"name": {
"map_type": "constant",
"reference": "up_down"
},
"parameters": {
"map_type": "None"
},
"import_objects": true,
"objects": {
"map_type": "column",
"reference": 0
},
"object_metadata": {
"map_type": "None"
},
"mapping_name": "Mapping 0"
"Mapping 0": {
"mapping": [
{
"map_type": "ObjectClass",
"position": "hidden",
"value": "up_down"
},
{
"map_type": "Object",
"position": 0
},
{
"map_type": "ObjectMetadata",
"position": "hidden"
}
]
}
}
]
},
......@@ -200,7 +186,6 @@
"table_row_types": {},
"selected_tables": [
"s",
"f",
"scenario",
"up_down",
"input_output",
......
tools/bb1.3_to_spinedb.json
View file @ 7b718161
This diff is collapsed.
tools/bb_base_sets.json
View file @ 7b718161
......@@ -8,8 +8,8 @@
"inputfiles": [],
"inputfiles_opt": [],
"outputfiles": [
"Backbone_base_sets_to_gdx.lst",
"Backbone_base_sets.gdx"
"Backbone_base_sets.gdx",
"Backbone_base_sets_to_gdx.lst"
],
"cmdline_args": [],
"execute_in_work": false,
......
tools/exporttobb.json
View file @ 7b718161
This diff is collapsed.
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

This system is mainly used for VTT projects and partners in those projects. Default permission does not allow user to create projects / groups. If you are VTT person, please contact Kimmo Ahola for getting permissions.