Merge pull request 'hp_results' (#9) from hp_results into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/9
This commit is contained in:
commit
cc3ac164aa
|
@ -63,7 +63,7 @@ class TestCityMerge(TestCase):
|
||||||
ResultFactory('sra', city_two, self._output_path).enrich()
|
ResultFactory('sra', city_two, self._output_path).enrich()
|
||||||
merged_city = city_one.merge(city_two)
|
merged_city = city_one.merge(city_two)
|
||||||
self.assertEqual(len(merged_city.buildings), 2)
|
self.assertEqual(len(merged_city.buildings), 2)
|
||||||
self.assertEqual(merged_city.buildings[1].surfaces[0].global_irradiance['year'].iloc[0], 254.3453196347032)
|
self.assertEqual(round(merged_city.buildings[1].surfaces[0].global_irradiance['year'].iloc[0]), 254)
|
||||||
self.assertEqual(merged_city.buildings[0].surfaces[0].global_irradiance, {})
|
self.assertEqual(merged_city.buildings[0].surfaces[0].global_irradiance, {})
|
||||||
self.assertEqual(merged_city.buildings[0].surfaces[2].global_irradiance, {})
|
self.assertEqual(merged_city.buildings[0].surfaces[2].global_irradiance, {})
|
||||||
self.assertEqual(city_one.buildings[0].surfaces[0].global_irradiance, merged_city.buildings[0].surfaces[0].global_irradiance)
|
self.assertEqual(city_one.buildings[0].surfaces[0].global_irradiance, merged_city.buildings[0].surfaces[0].global_irradiance)
|
||||||
|
|
|
@ -82,9 +82,3 @@ class TestEnergySystemsFactory(TestCase):
|
||||||
df = pd.read_csv(self._output_path)
|
df = pd.read_csv(self._output_path)
|
||||||
self.assertEqual(df.shape, (13, 3))
|
self.assertEqual(df.shape, (13, 3))
|
||||||
self.assertEqual(df.iloc[0, 1], 1031544.62)
|
self.assertEqual(df.iloc[0, 1], 1031544.62)
|
||||||
|
|
||||||
def tearDown(self) -> None:
|
|
||||||
try:
|
|
||||||
os.remove(self._output_path)
|
|
||||||
except OSError:
|
|
||||||
pass
|
|
||||||
|
|
8764
hub/unittests/tests_data/New_York.cli
Normal file
8764
hub/unittests/tests_data/New_York.cli
Normal file
File diff suppressed because it is too large
Load Diff
14
hub/unittests/tests_data/w2w_user_output.csv
Normal file
14
hub/unittests/tests_data/w2w_user_output.csv
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
,Monthly HP Electricity Demand (kWh),Monthly Fuel Consumption of Auxiliary Heater (m3)
|
||||||
|
Jan,1031544.62,24276356.0
|
||||||
|
Feb,874352.562,19785768.0
|
||||||
|
Mar,691775.25,117312.656
|
||||||
|
Apr,280416.469,-0.0
|
||||||
|
May,0.0,40314676.0
|
||||||
|
Jun,0.0,5447721.0
|
||||||
|
Jul,0.0,1187115.88
|
||||||
|
Aug,0.0,1961530.88
|
||||||
|
Sept,0.0,20623850.0
|
||||||
|
Oct,191220.531,-0.0
|
||||||
|
Nov,423974.062,-0.0
|
||||||
|
Dec,848334.875,6793204.5
|
||||||
|
Total,4341618.369,120507534.91600001
|
|
230
hub/unittests/tests_outputs/New_York_sra.xml
Normal file
230
hub/unittests/tests_outputs/New_York_sra.xml
Normal file
|
@ -0,0 +1,230 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<CitySim name="New_York_sra.xml">
|
||||||
|
<Simulation beginMonth="1" beginDay="1" endMonth="12" endDay="31"/>
|
||||||
|
<Climate location="/Users/peteryefi/Desktop/dompark/hub/hub/unittests/tests_data/New_York.cli" city="None"/>
|
||||||
|
<District>
|
||||||
|
<FarFieldObstructions/>
|
||||||
|
<Building Name="GBP__169" id="0" key="GBP__169" Simulate="true">
|
||||||
|
<Wall id="10" ShortWaveReflectance="None">
|
||||||
|
<V0 x="1399.46142578125" y="1964.59521484375" z="10.786276534199727"/>
|
||||||
|
<V1 x="1399.46142578125" y="1964.59521484375" z="0.0"/>
|
||||||
|
<V2 x="1395.708984375" y="1957.1826171875" z="10.786276534199727"/>
|
||||||
|
</Wall>
|
||||||
|
<Wall id="11" ShortWaveReflectance="None">
|
||||||
|
<V0 x="1395.708984375" y="1957.1826171875" z="10.786276534199727"/>
|
||||||
|
<V1 x="1399.46142578125" y="1964.59521484375" z="0.0"/>
|
||||||
|
<V2 x="1395.708984375" y="1957.1826171875" z="0.0"/>
|
||||||
|
</Wall>
|
||||||
|
<Wall id="22" ShortWaveReflectance="None">
|
||||||
|
<V0 x="1407.73974609375" y="1960.412109375" z="10.786276534199727"/>
|
||||||
|
<V1 x="1407.73974609375" y="1960.412109375" z="0.0"/>
|
||||||
|
<V2 x="1399.46142578125" y="1964.59521484375" z="10.786276534199727"/>
|
||||||
|
</Wall>
|
||||||
|
<Wall id="23" ShortWaveReflectance="None">
|
||||||
|
<V0 x="1399.46142578125" y="1964.59521484375" z="10.786276534199727"/>
|
||||||
|
<V1 x="1407.73974609375" y="1960.412109375" z="0.0"/>
|
||||||
|
<V2 x="1399.46142578125" y="1964.59521484375" z="0.0"/>
|
||||||
|
</Wall>
|
||||||
|
<Wall id="24" ShortWaveReflectance="None">
|
||||||
|
<V0 x="1410.73974609375" y="1966.33837890625" z="10.786276534199727"/>
|
||||||
|
<V1 x="1410.73974609375" y="1966.33837890625" z="0.0"/>
|
||||||
|
<V2 x="1407.73974609375" y="1960.412109375" z="10.786276534199727"/>
|
||||||
|
</Wall>
|
||||||
|
<Wall id="25" ShortWaveReflectance="None">
|
||||||
|
<V0 x="1407.73974609375" y="1960.412109375" z="10.786276534199727"/>
|
||||||
|
<V1 x="1410.73974609375" y="1966.33837890625" z="0.0"/>
|
||||||
|
<V2 x="1407.73974609375" y="1960.412109375" z="0.0"/>
|
||||||
|
</Wall>
|
||||||
|
<Wall id="26" ShortWaveReflectance="None">
|
||||||
|
<V0 x="1395.708984375" y="1957.1826171875" z="10.786276534199727"/>
|
||||||
|
<V1 x="1395.708984375" y="1957.1826171875" z="0.0"/>
|
||||||
|
<V2 x="1403.9873046875" y="1952.99853515625" z="10.786276534199727"/>
|
||||||
|
</Wall>
|
||||||
|
<Wall id="27" ShortWaveReflectance="None">
|
||||||
|
<V0 x="1403.9873046875" y="1952.99853515625" z="10.786276534199727"/>
|
||||||
|
<V1 x="1395.708984375" y="1957.1826171875" z="0.0"/>
|
||||||
|
<V2 x="1403.9873046875" y="1952.99853515625" z="0.0"/>
|
||||||
|
</Wall>
|
||||||
|
<Wall id="28" ShortWaveReflectance="None">
|
||||||
|
<V0 x="1417.9833984375" y="1962.68603515625" z="10.786276534199727"/>
|
||||||
|
<V1 x="1417.9833984375" y="1962.68603515625" z="0.0"/>
|
||||||
|
<V2 x="1410.73974609375" y="1966.33837890625" z="10.786276534199727"/>
|
||||||
|
</Wall>
|
||||||
|
<Wall id="29" ShortWaveReflectance="None">
|
||||||
|
<V0 x="1410.73974609375" y="1966.33837890625" z="10.786276534199727"/>
|
||||||
|
<V1 x="1417.9833984375" y="1962.68603515625" z="0.0"/>
|
||||||
|
<V2 x="1410.73974609375" y="1966.33837890625" z="0.0"/>
|
||||||
|
</Wall>
|
||||||
|
<Wall id="30" ShortWaveReflectance="None">
|
||||||
|
<V0 x="1398.08251953125" y="1923.3291015625" z="10.786276534199727"/>
|
||||||
|
<V1 x="1398.08251953125" y="1923.3291015625" z="0.0"/>
|
||||||
|
<V2 x="1417.9833984375" y="1962.68603515625" z="10.786276534199727"/>
|
||||||
|
</Wall>
|
||||||
|
<Wall id="31" ShortWaveReflectance="None">
|
||||||
|
<V0 x="1417.9833984375" y="1962.68603515625" z="10.786276534199727"/>
|
||||||
|
<V1 x="1398.08251953125" y="1923.3291015625" z="0.0"/>
|
||||||
|
<V2 x="1417.9833984375" y="1962.68603515625" z="0.0"/>
|
||||||
|
</Wall>
|
||||||
|
<Wall id="32" ShortWaveReflectance="None">
|
||||||
|
<V0 x="1390.837890625" y="1926.99951171875" z="10.786276534199727"/>
|
||||||
|
<V1 x="1390.837890625" y="1926.99951171875" z="0.0"/>
|
||||||
|
<V2 x="1398.08251953125" y="1923.3291015625" z="10.786276534199727"/>
|
||||||
|
</Wall>
|
||||||
|
<Wall id="33" ShortWaveReflectance="None">
|
||||||
|
<V0 x="1398.08251953125" y="1923.3291015625" z="10.786276534199727"/>
|
||||||
|
<V1 x="1390.837890625" y="1926.99951171875" z="0.0"/>
|
||||||
|
<V2 x="1398.08251953125" y="1923.3291015625" z="0.0"/>
|
||||||
|
</Wall>
|
||||||
|
<Wall id="34" ShortWaveReflectance="None">
|
||||||
|
<V0 x="1403.9873046875" y="1952.99853515625" z="10.786276534199727"/>
|
||||||
|
<V1 x="1403.9873046875" y="1952.99853515625" z="0.0"/>
|
||||||
|
<V2 x="1397.66845703125" y="1940.4970703125" z="10.786276534199727"/>
|
||||||
|
</Wall>
|
||||||
|
<Wall id="35" ShortWaveReflectance="None">
|
||||||
|
<V0 x="1397.66845703125" y="1940.4970703125" z="10.786276534199727"/>
|
||||||
|
<V1 x="1403.9873046875" y="1952.99853515625" z="0.0"/>
|
||||||
|
<V2 x="1397.66845703125" y="1940.4970703125" z="0.0"/>
|
||||||
|
</Wall>
|
||||||
|
<Wall id="36" ShortWaveReflectance="None">
|
||||||
|
<V0 x="1397.66845703125" y="1940.4970703125" z="10.786276534199727"/>
|
||||||
|
<V1 x="1397.66845703125" y="1940.4970703125" z="0.0"/>
|
||||||
|
<V2 x="1389.3896484375" y="1944.67919921875" z="10.786276534199727"/>
|
||||||
|
</Wall>
|
||||||
|
<Wall id="37" ShortWaveReflectance="None">
|
||||||
|
<V0 x="1389.3896484375" y="1944.67919921875" z="10.786276534199727"/>
|
||||||
|
<V1 x="1397.66845703125" y="1940.4970703125" z="0.0"/>
|
||||||
|
<V2 x="1389.3896484375" y="1944.67919921875" z="0.0"/>
|
||||||
|
</Wall>
|
||||||
|
<Wall id="38" ShortWaveReflectance="None">
|
||||||
|
<V0 x="1393.88134765625" y="1932.99951171875" z="10.786276534199727"/>
|
||||||
|
<V1 x="1393.88134765625" y="1932.99951171875" z="0.0"/>
|
||||||
|
<V2 x="1390.837890625" y="1926.99951171875" z="10.786276534199727"/>
|
||||||
|
</Wall>
|
||||||
|
<Wall id="39" ShortWaveReflectance="None">
|
||||||
|
<V0 x="1390.837890625" y="1926.99951171875" z="10.786276534199727"/>
|
||||||
|
<V1 x="1393.88134765625" y="1932.99951171875" z="0.0"/>
|
||||||
|
<V2 x="1390.837890625" y="1926.99951171875" z="0.0"/>
|
||||||
|
</Wall>
|
||||||
|
<Wall id="40" ShortWaveReflectance="None">
|
||||||
|
<V0 x="1389.3896484375" y="1944.67919921875" z="10.786276534199727"/>
|
||||||
|
<V1 x="1389.3896484375" y="1944.67919921875" z="0.0"/>
|
||||||
|
<V2 x="1385.595703125" y="1937.19140625" z="10.786276534199727"/>
|
||||||
|
</Wall>
|
||||||
|
<Wall id="41" ShortWaveReflectance="None">
|
||||||
|
<V0 x="1385.595703125" y="1937.19140625" z="10.786276534199727"/>
|
||||||
|
<V1 x="1389.3896484375" y="1944.67919921875" z="0.0"/>
|
||||||
|
<V2 x="1385.595703125" y="1937.19140625" z="0.0"/>
|
||||||
|
</Wall>
|
||||||
|
<Wall id="42" ShortWaveReflectance="None">
|
||||||
|
<V0 x="1385.595703125" y="1937.19140625" z="10.786276534199727"/>
|
||||||
|
<V1 x="1385.595703125" y="1937.19140625" z="0.0"/>
|
||||||
|
<V2 x="1393.88134765625" y="1932.99951171875" z="10.786276534199727"/>
|
||||||
|
</Wall>
|
||||||
|
<Wall id="43" ShortWaveReflectance="None">
|
||||||
|
<V0 x="1393.88134765625" y="1932.99951171875" z="10.786276534199727"/>
|
||||||
|
<V1 x="1385.595703125" y="1937.19140625" z="0.0"/>
|
||||||
|
<V2 x="1393.88134765625" y="1932.99951171875" z="0.0"/>
|
||||||
|
</Wall>
|
||||||
|
<Roof id="0" ShortWaveReflectance="None">
|
||||||
|
<V0 x="1403.9873046875" y="1952.99853515625" z="10.786276534199727"/>
|
||||||
|
<V1 x="1397.66845703125" y="1940.4970703125" z="10.786276534199727"/>
|
||||||
|
<V2 x="1417.9833984375" y="1962.68603515625" z="10.786276534199727"/>
|
||||||
|
</Roof>
|
||||||
|
<Roof id="1" ShortWaveReflectance="None">
|
||||||
|
<V0 x="1407.73974609375" y="1960.412109375" z="10.786276534199727"/>
|
||||||
|
<V1 x="1403.9873046875" y="1952.99853515625" z="10.786276534199727"/>
|
||||||
|
<V2 x="1417.9833984375" y="1962.68603515625" z="10.786276534199727"/>
|
||||||
|
</Roof>
|
||||||
|
<Roof id="2" ShortWaveReflectance="None">
|
||||||
|
<V0 x="1397.66845703125" y="1940.4970703125" z="10.786276534199727"/>
|
||||||
|
<V1 x="1385.595703125" y="1937.19140625" z="10.786276534199727"/>
|
||||||
|
<V2 x="1393.88134765625" y="1932.99951171875" z="10.786276534199727"/>
|
||||||
|
</Roof>
|
||||||
|
<Roof id="3" ShortWaveReflectance="None">
|
||||||
|
<V0 x="1417.9833984375" y="1962.68603515625" z="10.786276534199727"/>
|
||||||
|
<V1 x="1397.66845703125" y="1940.4970703125" z="10.786276534199727"/>
|
||||||
|
<V2 x="1398.08251953125" y="1923.3291015625" z="10.786276534199727"/>
|
||||||
|
</Roof>
|
||||||
|
<Roof id="4" ShortWaveReflectance="None">
|
||||||
|
<V0 x="1393.88134765625" y="1932.99951171875" z="10.786276534199727"/>
|
||||||
|
<V1 x="1390.837890625" y="1926.99951171875" z="10.786276534199727"/>
|
||||||
|
<V2 x="1398.08251953125" y="1923.3291015625" z="10.786276534199727"/>
|
||||||
|
</Roof>
|
||||||
|
<Roof id="5" ShortWaveReflectance="None">
|
||||||
|
<V0 x="1397.66845703125" y="1940.4970703125" z="10.786276534199727"/>
|
||||||
|
<V1 x="1393.88134765625" y="1932.99951171875" z="10.786276534199727"/>
|
||||||
|
<V2 x="1398.08251953125" y="1923.3291015625" z="10.786276534199727"/>
|
||||||
|
</Roof>
|
||||||
|
<Roof id="6" ShortWaveReflectance="None">
|
||||||
|
<V0 x="1410.73974609375" y="1966.33837890625" z="10.786276534199727"/>
|
||||||
|
<V1 x="1407.73974609375" y="1960.412109375" z="10.786276534199727"/>
|
||||||
|
<V2 x="1417.9833984375" y="1962.68603515625" z="10.786276534199727"/>
|
||||||
|
</Roof>
|
||||||
|
<Roof id="7" ShortWaveReflectance="None">
|
||||||
|
<V0 x="1399.46142578125" y="1964.59521484375" z="10.786276534199727"/>
|
||||||
|
<V1 x="1395.708984375" y="1957.1826171875" z="10.786276534199727"/>
|
||||||
|
<V2 x="1407.73974609375" y="1960.412109375" z="10.786276534199727"/>
|
||||||
|
</Roof>
|
||||||
|
<Roof id="8" ShortWaveReflectance="None">
|
||||||
|
<V0 x="1389.3896484375" y="1944.67919921875" z="10.786276534199727"/>
|
||||||
|
<V1 x="1385.595703125" y="1937.19140625" z="10.786276534199727"/>
|
||||||
|
<V2 x="1397.66845703125" y="1940.4970703125" z="10.786276534199727"/>
|
||||||
|
</Roof>
|
||||||
|
<Roof id="9" ShortWaveReflectance="None">
|
||||||
|
<V0 x="1407.73974609375" y="1960.412109375" z="10.786276534199727"/>
|
||||||
|
<V1 x="1395.708984375" y="1957.1826171875" z="10.786276534199727"/>
|
||||||
|
<V2 x="1403.9873046875" y="1952.99853515625" z="10.786276534199727"/>
|
||||||
|
</Roof>
|
||||||
|
<Floor id="12" ShortWaveReflectance="None">
|
||||||
|
<V0 x="1410.73974609375" y="1966.33837890625" z="0.0"/>
|
||||||
|
<V1 x="1417.9833984375" y="1962.68603515625" z="0.0"/>
|
||||||
|
<V2 x="1407.73974609375" y="1960.412109375" z="0.0"/>
|
||||||
|
</Floor>
|
||||||
|
<Floor id="13" ShortWaveReflectance="None">
|
||||||
|
<V0 x="1399.46142578125" y="1964.59521484375" z="0.0"/>
|
||||||
|
<V1 x="1407.73974609375" y="1960.412109375" z="0.0"/>
|
||||||
|
<V2 x="1395.708984375" y="1957.1826171875" z="0.0"/>
|
||||||
|
</Floor>
|
||||||
|
<Floor id="14" ShortWaveReflectance="None">
|
||||||
|
<V0 x="1389.3896484375" y="1944.67919921875" z="0.0"/>
|
||||||
|
<V1 x="1397.66845703125" y="1940.4970703125" z="0.0"/>
|
||||||
|
<V2 x="1385.595703125" y="1937.19140625" z="0.0"/>
|
||||||
|
</Floor>
|
||||||
|
<Floor id="15" ShortWaveReflectance="None">
|
||||||
|
<V0 x="1407.73974609375" y="1960.412109375" z="0.0"/>
|
||||||
|
<V1 x="1403.9873046875" y="1952.99853515625" z="0.0"/>
|
||||||
|
<V2 x="1395.708984375" y="1957.1826171875" z="0.0"/>
|
||||||
|
</Floor>
|
||||||
|
<Floor id="16" ShortWaveReflectance="None">
|
||||||
|
<V0 x="1403.9873046875" y="1952.99853515625" z="0.0"/>
|
||||||
|
<V1 x="1417.9833984375" y="1962.68603515625" z="0.0"/>
|
||||||
|
<V2 x="1397.66845703125" y="1940.4970703125" z="0.0"/>
|
||||||
|
</Floor>
|
||||||
|
<Floor id="17" ShortWaveReflectance="None">
|
||||||
|
<V0 x="1407.73974609375" y="1960.412109375" z="0.0"/>
|
||||||
|
<V1 x="1417.9833984375" y="1962.68603515625" z="0.0"/>
|
||||||
|
<V2 x="1403.9873046875" y="1952.99853515625" z="0.0"/>
|
||||||
|
</Floor>
|
||||||
|
<Floor id="18" ShortWaveReflectance="None">
|
||||||
|
<V0 x="1417.9833984375" y="1962.68603515625" z="0.0"/>
|
||||||
|
<V1 x="1398.08251953125" y="1923.3291015625" z="0.0"/>
|
||||||
|
<V2 x="1397.66845703125" y="1940.4970703125" z="0.0"/>
|
||||||
|
</Floor>
|
||||||
|
<Floor id="19" ShortWaveReflectance="None">
|
||||||
|
<V0 x="1397.66845703125" y="1940.4970703125" z="0.0"/>
|
||||||
|
<V1 x="1393.88134765625" y="1932.99951171875" z="0.0"/>
|
||||||
|
<V2 x="1385.595703125" y="1937.19140625" z="0.0"/>
|
||||||
|
</Floor>
|
||||||
|
<Floor id="20" ShortWaveReflectance="None">
|
||||||
|
<V0 x="1393.88134765625" y="1932.99951171875" z="0.0"/>
|
||||||
|
<V1 x="1398.08251953125" y="1923.3291015625" z="0.0"/>
|
||||||
|
<V2 x="1390.837890625" y="1926.99951171875" z="0.0"/>
|
||||||
|
</Floor>
|
||||||
|
<Floor id="21" ShortWaveReflectance="None">
|
||||||
|
<V0 x="1397.66845703125" y="1940.4970703125" z="0.0"/>
|
||||||
|
<V1 x="1398.08251953125" y="1923.3291015625" z="0.0"/>
|
||||||
|
<V2 x="1393.88134765625" y="1932.99951171875" z="0.0"/>
|
||||||
|
</Floor>
|
||||||
|
</Building>
|
||||||
|
</District>
|
||||||
|
</CitySim>
|
8761
hub/unittests/tests_outputs/New_York_sra_SW.out
Normal file
8761
hub/unittests/tests_outputs/New_York_sra_SW.out
Normal file
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user