Skip to content

GSYE-555: Remove target_market_kpi and target_device_kpi #437

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

GSYE-555: Remove target_market_kpi and target_device_kpi #437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a240c8
GSYE-555: Remove target_market_kpi and target_device_kpi
hannesdiedrich Apr 6, 2023
2a357f0
Merge branch 'master' into feature/GSYE-555
hannesdiedrich May 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions gsy_framework/schema/avro_schemas/launch_simulation_scenario.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
"items": "float"
}
]},
{"name": "target_market_kpi", "type": ["null", "int"]},
{"name": "export_capacity_kVA", "type": ["null", "float"]},
{"name": "import_capacity_kVA", "type": ["null", "float"]},
{"name": "grid_fee_percentage", "type": ["null", "float"]},
Expand Down Expand Up @@ -164,7 +163,6 @@
{"name": "fit_to_limit", "type": ["null","boolean"]},
{"name": "cloud_coverage", "type": "int"},
{"name": "update_interval", "type": ["null", "int"]},
{"name": "target_device_kpi", "type": ["null", "int"]},
{"name": "final_selling_rate", "type": ["null", "float"]},
{"name": "initial_selling_rate", "type": ["null", "float"]},
{"name": "use_market_maker_rate", "type": ["null", "boolean"]},
Expand Down Expand Up @@ -224,7 +222,6 @@
]},
{"name": "final_buying_rate", "type": ["null", "float"]},
{"name": "initial_buying_rate", "type": ["null", "float"]},
{"name": "target_device_kpi", "type": ["null", "int"]},
{"name": "daily_load_profile", "type": ["null", "string"]},
{"name": "daily_load_profile_uuid", "type": ["null", "string"]},
{"name": "use_market_maker_rate", "type": ["null", "boolean"]},
Expand Down Expand Up @@ -256,7 +253,6 @@
{"name": "capacity_kW", "type": ["null", "float"]},
{"name": "final_buying_rate", "type": ["null", "float"]},
{"name": "initial_buying_rate", "type": ["null", "float"]},
{"name": "target_device_kpi", "type": ["null", "int"]},
{"name": "use_market_maker_rate", "type": ["null", "boolean"]},
{"name": "forecast_stream_enabled", "type": ["null", "boolean"]},
{"name": "allow_external_connection", "type": ["null", "boolean"]},
Expand Down Expand Up @@ -291,7 +287,6 @@
{"name": "initial_selling_rate", "type": ["null", "float"]},
{"name": "energy_rate_increase_per_update", "type": ["null", "float"]},
{"name": "energy_rate_decrease_per_update", "type": ["null", "float"]},
{"name": "target_device_kpi", "type": ["null", "int"]},
{"name": "use_market_maker_rate", "type": ["null", "boolean"]},
{"name": "allow_external_connection", "type": ["null", "boolean"]},
{"name": "display_type", "type": "string"},
Expand Down Expand Up @@ -323,7 +318,6 @@
{"name": "initial_selling_rate", "type": ["null", "float"]},
{"name": "energy_rate_increase_per_update", "type": ["null", "float"]},
{"name": "energy_rate_decrease_per_update", "type": ["null", "float"]},
{"name": "target_device_kpi", "type": ["null", "int"]},
{"name": "use_market_maker_rate", "type": ["null", "boolean"]},
{"name": "allow_external_connection", "type": ["null", "boolean"]},
{"name": "display_type", "type": "string"}
Expand Down
1 change: 0 additions & 1 deletion gsy_framework/schemas.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ class ScenarioSchemas:
"fixed_monthly_fee": {"type": ["number", "null"]},
"marketplace_monthly_fee": {"type": ["number", "null"]},
"market_maker_rate": {"type": ["number", "null"]},
"target_market_kpi": {"type": ["number", "null"]},
"grid_fee_constant": {"anyOf": [{"type": "number"}, {"type": "null"}]},
"grid_fee_percentage": {"anyOf": [{"type": "number"}, {"type": "null"}]},
"baseline_peak_energy_import_kWh":
Expand Down
13 changes: 0 additions & 13 deletions tests/schema/test_scenario_validator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ def setup_method(self):
21.817164413489536,
38.398776189002916
],
"target_device_kpi": 0,
"final_selling_rate": 0.0,
"power_profile_uuid": "d8f9f372-d636-45da-a7f5-9ef02bbc8650",
"initial_selling_rate": 30.0,
Expand All @@ -75,7 +74,6 @@ def setup_method(self):
38.398776189002916
],
"final_buying_rate": 30.0,
"target_device_kpi": 0,
"daily_load_profile":
"{\"filename\": \"CHR27 Family both at work, 2 children HH1.csv\"}",
"initial_buying_rate": 0.0,
Expand All @@ -94,7 +92,6 @@ def setup_method(self):
],
"fit_area_boundary": True,
"grid_fee_constant": None,
"target_market_kpi": 0,
"export_capacity_kVA": None,
"grid_fee_percentage": None,
"import_capacity_kVA": None,
Expand Down Expand Up @@ -125,7 +122,6 @@ def setup_method(self):
21.819383035040943,
38.40110442451805
],
"target_device_kpi": 0,
"final_selling_rate": 0.0,
"power_profile_uuid": "65517989-031d-465b-94f7-5889b1e6bcfa",
"initial_selling_rate": 30.0,
Expand All @@ -147,7 +143,6 @@ def setup_method(self):
38.40110442451805
],
"final_buying_rate": 30.0,
"target_device_kpi": 0,
"daily_load_profile":
"{\"filename\": \"CHR41 Family with 3 children, both at work HH1.csv\"}",
"initial_buying_rate": 0.0,
Expand All @@ -166,7 +161,6 @@ def setup_method(self):
],
"fit_area_boundary": True,
"grid_fee_constant": None,
"target_market_kpi": 0,
"export_capacity_kVA": None,
"grid_fee_percentage": None,
"import_capacity_kVA": None,
Expand All @@ -189,7 +183,6 @@ def setup_method(self):
38.40017818882174
],
"final_buying_rate": None,
"target_device_kpi": 0,
"initial_buying_rate": 0.0,
"use_market_maker_rate": True,
"forecast_stream_enabled": None,
Expand Down Expand Up @@ -218,7 +211,6 @@ def setup_method(self):
38.40119487732349
],
"final_buying_rate": None,
"target_device_kpi": 0,
"initial_buying_rate": 0.0,
"use_market_maker_rate": True,
"forecast_stream_enabled": None,
Expand All @@ -241,7 +233,6 @@ def setup_method(self):
38.40119487732349
],
"final_buying_rate": 22.0,
"target_device_kpi": 0,
"cap_price_strategy": False,
"final_selling_rate": 25.0,
"initial_buying_rate": 12.0,
Expand All @@ -265,7 +256,6 @@ def setup_method(self):
"fixed_monthly_fee": 0.0,
"grid_fee_constant": 1.0,
"market_maker_rate": 0.0,
"target_market_kpi": 0,
"export_capacity_kVA": 23.0,
"grid_fee_percentage": None,
"import_capacity_kVA": 1.0,
Expand All @@ -290,7 +280,6 @@ def setup_method(self):
38.39855216791665
],
"final_buying_rate": 22.0,
"target_device_kpi": 0,
"cap_price_strategy": False,
"final_selling_rate": 25.0,
"initial_buying_rate": 12.0,
Expand All @@ -307,7 +296,6 @@ def setup_method(self):
"geo_tag_location": None,
"fit_area_boundary": True,
"grid_fee_constant": None,
"target_market_kpi": 0,
"export_capacity_kVA": None,
"grid_fee_percentage": None,
"import_capacity_kVA": None,
Expand All @@ -320,7 +308,6 @@ def setup_method(self):
"geo_tag_location": None,
"fit_area_boundary": True,
"grid_fee_constant": None,
"target_market_kpi": 0,
"export_capacity_kVA": None,
"grid_fee_percentage": None,
"import_capacity_kVA": None,
Expand Down