Skip to content
Snippets Groups Projects
Commit a376a8ed authored by pmag's avatar pmag
Browse files

Merge branch 'bbr' into 'master' 

Added tests for building information retrieval methods.

See merge request !4
parents 333e7536 1fe586f7
No related branches found
No related tags found
1 merge request!4Added tests for building information retrieval methods.
Hide whitespace changes
Inline Side-by-side
src/topupopt/data/buildings/dk/bbr.py
+ 30
− 30
View file @ a376a8ed
...@@ -511,8 +511,8 @@ list_labels_bbr = [ ...@@ -511,8 +511,8 @@ list_labels_bbr = [
label_bbr_extra_heating label_bbr_extra_heating
] ]
#****************************************************************************** # *****************************************************************************
#****************************************************************************** # *****************************************************************************
def get_bbr_building_data_geodataframe( def get_bbr_building_data_geodataframe(
building_entrance_ids: list, building_entrance_ids: list,
...@@ -521,8 +521,8 @@ def get_bbr_building_data_geodataframe( ...@@ -521,8 +521,8 @@ def get_bbr_building_data_geodataframe(
selected_bbr_building_point_labels: list = SELECT_BBR_BDG_POINT_LABELS selected_bbr_building_point_labels: list = SELECT_BBR_BDG_POINT_LABELS
) -> Tuple[GeoDataFrame,list]: ) -> Tuple[GeoDataFrame,list]:
#************************************************************************** # *************************************************************************
#************************************************************************** # *************************************************************************
# get data about building entrances # get data about building entrances
...@@ -548,8 +548,8 @@ def get_bbr_building_data_geodataframe( ...@@ -548,8 +548,8 @@ def get_bbr_building_data_geodataframe(
index=dict_building_entrances.keys() index=dict_building_entrances.keys()
) )
#************************************************************************** # *************************************************************************
#************************************************************************** # *************************************************************************
# get data about buildings # get data about buildings
...@@ -577,8 +577,8 @@ def get_bbr_building_data_geodataframe( ...@@ -577,8 +577,8 @@ def get_bbr_building_data_geodataframe(
index=dict_buildings.keys() index=dict_buildings.keys()
) )
#************************************************************************** # *************************************************************************
#************************************************************************** # *************************************************************************
# get building point data # get building point data
...@@ -626,8 +626,8 @@ def get_bbr_building_data_geodataframe( ...@@ -626,8 +626,8 @@ def get_bbr_building_data_geodataframe(
left_index=True, left_index=True,
suffixes=(None,"_y")) # adds "_y" to duplicate columns suffixes=(None,"_y")) # adds "_y" to duplicate columns
#************************************************************************** # *************************************************************************
#************************************************************************** # *************************************************************************
# create a geodataframe whose geometry is that of building points # create a geodataframe whose geometry is that of building points
...@@ -671,17 +671,17 @@ def get_bbr_building_data_geodataframe( ...@@ -671,17 +671,17 @@ def get_bbr_building_data_geodataframe(
return gdf_buildings, list_failures return gdf_buildings, list_failures
#************************************************************************** # *************************************************************************
#************************************************************************** # *************************************************************************
#****************************************************************************** # *****************************************************************************
#****************************************************************************** # *****************************************************************************
def fetch_building_entrance_data(building_entrance_ids: list) -> Tuple[dict, def fetch_building_entrance_data(building_entrance_ids: list) -> Tuple[dict,
list]: list]:
#************************************************************************** # *************************************************************************
#************************************************************************** # *************************************************************************
# retrieve data about each node identified through OSM # retrieve data about each node identified through OSM
...@@ -733,21 +733,21 @@ def fetch_building_entrance_data(building_entrance_ids: list) -> Tuple[dict, ...@@ -733,21 +733,21 @@ def fetch_building_entrance_data(building_entrance_ids: list) -> Tuple[dict,
response.close() response.close()
#************************************************************************** # *************************************************************************
#************************************************************************** # *************************************************************************
return dict_building_entrances, list_failures return dict_building_entrances, list_failures
#************************************************************************** # *************************************************************************
#************************************************************************** # *************************************************************************
#****************************************************************************** # *****************************************************************************
#****************************************************************************** # *****************************************************************************
def fetch_building_data(building_codes: list): def fetch_building_data(building_codes: list):
#************************************************************************** # *************************************************************************
#************************************************************************** # *************************************************************************
# get data about each specific building # get data about each specific building
...@@ -781,13 +781,13 @@ def fetch_building_data(building_codes: list): ...@@ -781,13 +781,13 @@ def fetch_building_data(building_codes: list):
response.close() response.close()
#************************************************************************** # *************************************************************************
#************************************************************************** # *************************************************************************
return dict_buildings return dict_buildings
#************************************************************************** # *************************************************************************
#************************************************************************** # *************************************************************************
#****************************************************************************** # *****************************************************************************
#****************************************************************************** # *****************************************************************************
\ No newline at end of file \ No newline at end of file
src/topupopt/data/buildings/dk/heat.py
+ 13
− 13
View file @ a376a8ed
#****************************************************************************** # *****************************************************************************
#****************************************************************************** # *****************************************************************************
import numpy as np import numpy as np
...@@ -11,8 +11,8 @@ from ...misc.utils import create_profile_using_time_weighted_state ...@@ -11,8 +11,8 @@ from ...misc.utils import create_profile_using_time_weighted_state
from .bbr import label_bbr_entrance_id, label_bbr_housing_area from .bbr import label_bbr_entrance_id, label_bbr_housing_area
#****************************************************************************** # *****************************************************************************
#****************************************************************************** # *****************************************************************************
# labels # labels
...@@ -58,8 +58,8 @@ selected_bbr_building_labels = [ ...@@ -58,8 +58,8 @@ selected_bbr_building_labels = [
label_osm_entrance_id = 'osak:identifier' label_osm_entrance_id = 'osak:identifier'
#****************************************************************************** # *****************************************************************************
#****************************************************************************** # *****************************************************************************
def heat_demand_dict_by_building_entrance( def heat_demand_dict_by_building_entrance(
gdf_osm: GeoDataFrame, gdf_osm: GeoDataFrame,
...@@ -67,7 +67,7 @@ def heat_demand_dict_by_building_entrance( ...@@ -67,7 +67,7 @@ def heat_demand_dict_by_building_entrance(
number_intervals: int, number_intervals: int,
time_interval_durations: list, time_interval_durations: list,
bdg_specific_demand: dict, bdg_specific_demand: dict,
bdg_base_load_avg_ratio: dict, bdg_min_to_max_ratio: dict,
bdg_demand_phase_shift: dict = None, bdg_demand_phase_shift: dict = None,
key_osm_entr_id: str = label_osm_entrance_id, key_osm_entr_id: str = label_osm_entrance_id,
key_bbr_entr_id: str = label_bbr_entrance_id, key_bbr_entr_id: str = label_bbr_entrance_id,
...@@ -119,7 +119,7 @@ def heat_demand_dict_by_building_entrance( ...@@ -119,7 +119,7 @@ def heat_demand_dict_by_building_entrance(
discrete_sinusoid_matching_integral( discrete_sinusoid_matching_integral(
bdg_specific_demand[building_index]*area, bdg_specific_demand[building_index]*area,
time_interval_durations=time_interval_durations, time_interval_durations=time_interval_durations,
ratio_min_avg=bdg_base_load_avg_ratio[building_index], min_to_max_ratio=bdg_min_to_max_ratio[building_index],
phase_shift_radians=( phase_shift_radians=(
bdg_demand_phase_shift[building_index] bdg_demand_phase_shift[building_index]
# bdg_demand_phase_shift_amplitude*np.random.random() # bdg_demand_phase_shift_amplitude*np.random.random()
...@@ -142,7 +142,7 @@ def heat_demand_dict_by_building_entrance( ...@@ -142,7 +142,7 @@ def heat_demand_dict_by_building_entrance(
), ),
avg_state=avg_state, avg_state=avg_state,
time_interval_durations=time_interval_durations, time_interval_durations=time_interval_durations,
ratio_min_avg=bdg_base_load_avg_ratio[building_index], min_to_max_ratio=bdg_min_to_max_ratio[building_index],
state_correlates_with_output=state_correlates_with_output state_correlates_with_output=state_correlates_with_output
) )
) )
...@@ -173,8 +173,8 @@ def heat_demand_dict_by_building_entrance( ...@@ -173,8 +173,8 @@ def heat_demand_dict_by_building_entrance(
return demand_dict return demand_dict
#****************************************************************************** # *****************************************************************************
#****************************************************************************** # *****************************************************************************
def total_heating_area( def total_heating_area(
gdf_osm: GeoDataFrame, gdf_osm: GeoDataFrame,
...@@ -206,5 +206,5 @@ def total_heating_area( ...@@ -206,5 +206,5 @@ def total_heating_area(
return area return area
#****************************************************************************** # *****************************************************************************
#****************************************************************************** # *****************************************************************************
\ No newline at end of file \ No newline at end of file
src/topupopt/data/gis/utils.py
+ 17
− 8
View file @ a376a8ed
...@@ -812,23 +812,32 @@ def simplify_network(network: MultiDiGraph, ...@@ -812,23 +812,32 @@ def simplify_network(network: MultiDiGraph,
protected_nodes, protected_nodes,
max_iterations=dead_end_probing_depth max_iterations=dead_end_probing_depth
) )
# 2) remove longer parallel edges (tends to create straight paths) # 2) remove self loops (tends to create straight paths and dead ends)
gis_mod.remove_self_loops(network)
# 3) join segments (can create self-loops)
simplifiable_paths = gis_iden.find_simplifiable_paths(
network,
protected_nodes,
consider_reversed_edges=True
)
for path in simplifiable_paths:
gis_mod.replace_path(network, path)
# 4) remove longer parallel edges (tends to create straight paths)
gis_mod.remove_longer_parallel_edges( gis_mod.remove_longer_parallel_edges(
network, network,
ignore_edge_directions=remove_opposite_parallel_edges ignore_edge_directions=remove_opposite_parallel_edges
) )
# 3) remove self loops (tends to create straight paths and dead ends) # 5) remove self loops (tends to create straight paths and dead ends)
gis_mod.remove_self_loops(network) gis_mod.remove_self_loops(network)
# 4) join segments (can create self-loops) # 6) join segments (can create self-loops)
simplifiable_paths = gis_iden.find_simplifiable_paths( simplifiable_paths = gis_iden.find_simplifiable_paths(
network, network,
protected_nodes protected_nodes,
consider_reversed_edges=True
) )
for path in simplifiable_paths: for path in simplifiable_paths:
gis_mod.replace_path(network, path) gis_mod.replace_path(network, path)
# 4) remove self loops (tends to create straight paths and dead ends) # 7) transform roundabouts into crossroads (can create straight paths)
gis_mod.remove_self_loops(network)
# 5) transform roundabouts into crossroads (can create straight paths)
list_roundabout_nodes = gis_iden.find_roundabouts( list_roundabout_nodes = gis_iden.find_roundabouts(
network, network,
**roundabout_conditions) **roundabout_conditions)
...@@ -836,7 +845,7 @@ def simplify_network(network: MultiDiGraph, ...@@ -836,7 +845,7 @@ def simplify_network(network: MultiDiGraph,
network, network,
list_roundabout_nodes list_roundabout_nodes
) )
# 6) update street count # 8) update street count
if update_street_count_per_node: if update_street_count_per_node:
gis_calc.update_street_count(network) gis_calc.update_street_count(network)
......
tests/test_data_buildings_dk.py 0 → 100644
+ 139
− 0
View file @ a376a8ed
# imports
# standard
import math
import random
from numbers import Real
from statistics import mean
import geopandas as gpd
# *****************************************************************************
# *****************************************************************************
# local, internal
from src.topupopt.data.gis.utils import read_gdf_file
from src.topupopt.data.buildings.dk import heat
from src.topupopt.data.buildings.dk import bbr
# *****************************************************************************
# *****************************************************************************
class TestDataBuildingsDK:
# *************************************************************************
# *************************************************************************
def test_demand_dict(self):
# heat_demand_dict_by_building_entrance
osm_data_filename = 'tests/data/gdf_osm.gpkg'
building_data_filename = 'tests/data/gdf_buildings.gpkg'
bdg_gdf_container_columns = ('ejerskaber','koordinater','bygningspunkt')
number_time_intervals = 12
min_to_max_ratio = 0.1
intraperiod_time_interval_duration = [
30*24*3600
for i in range(number_time_intervals)
]
annual_heat_demand_scenario = 1000
total_area = 1000
air_temperature_scenario = [10 for i in range(number_time_intervals)]
gdf_osm = gpd.read_file(osm_data_filename)
gdf_osm.set_index(['element_type', 'osmid'], drop=True, inplace=True)
gdf_buildings = read_gdf_file(
filename=building_data_filename,
packed_columns=bdg_gdf_container_columns,
index='index'
)
# order by state
heat_demand_dict = heat.heat_demand_dict_by_building_entrance(
gdf_osm=gdf_osm,
gdf_buildings=gdf_buildings,
number_intervals=number_time_intervals,
time_interval_durations=intraperiod_time_interval_duration,
bdg_min_to_max_ratio={
index: min_to_max_ratio for index in gdf_buildings.index
},
bdg_specific_demand={
index: annual_heat_demand_scenario/total_area
for index in gdf_buildings.index
},
bdg_demand_phase_shift=None,
avg_state=air_temperature_scenario,
state_correlates_with_output=False
)
assert type(heat_demand_dict) == dict
assert len(heat_demand_dict) == len(gdf_osm)
# no state preference, use phase shift
heat_demand_dict2 = heat.heat_demand_dict_by_building_entrance(
gdf_osm=gdf_osm,
gdf_buildings=gdf_buildings,
number_intervals=number_time_intervals,
time_interval_durations=intraperiod_time_interval_duration,
bdg_min_to_max_ratio={
index: min_to_max_ratio for index in gdf_buildings.index
},
bdg_specific_demand={
index: annual_heat_demand_scenario/total_area
for index in gdf_buildings.index
},
bdg_demand_phase_shift={
index: 2*math.pi*random.random() for index in gdf_buildings.index
},
avg_state=None,
state_correlates_with_output=False
)
assert type(heat_demand_dict2) == dict
assert len(heat_demand_dict2) == len(gdf_osm)
# total heating area
heating_area = heat.total_heating_area(gdf_osm, gdf_buildings)
assert isinstance(heating_area, Real)
assert math.isclose(heating_area, 100882, abs_tol=1e-3)
# *************************************************************************
# *************************************************************************
# def test_bbr(self):
# # test get_bbr_building_data_geodataframe
# osm_data_filename = 'tests/data/gdf_osm.gpkg'
# gdf_osm = gpd.read_file(osm_data_filename)
# gdf_osm.set_index(['element_type', 'osmid'], drop=True, inplace=True)
# error_raised = False
# try:
# gdf_buildings, drop_list = bbr.get_bbr_building_data_geodataframe(
# list(gdf_osm[heat.label_osm_entrance_id]),
# None,
# None,
# None)
# except UnboundLocalError:
# error_raised = True
# assert error_raised
# # drop the rows with no data
# gdf_osm = gdf_osm.drop(
# index=[
# (gdf_osm[
# gdf_osm[
# heat.label_osm_entrance_id
# ]==bdg_entrance_id].index)[0]
# for bdg_entrance_id in drop_list
# ]
# )
# *****************************************************************************
# *****************************************************************************
\ No newline at end of file
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