VeniVidiVici
/
invest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

accept incoming changes in test_ucm merge conflict

This commit is contained in:
Claire Simpson 2025-02-27 11:37:20 -07:00
parent 79c39d7060
commit e4aa6f6a31
1 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tests/test_ucm.py
View File

@ -119,19 +119,11 @@ class UCMTests(unittest.TestCase):
results_feature = results_layer.GetFeature(1)
expected_results = {
<<<<<<< HEAD
'avg_cc': 0.222150472947109,
'avg_tmp_v': 37.306549,
'avg_tmp_an': 2.306549,
'avd_eng_cn': 3602851.784639,
'avg_wbgt_v': 32.585935,
=======
'avg_cc': 0.221991,
'avg_tmp_v': 37.321395,
'avg_tmp_an': 2.321395,
'avd_eng_cn': 3525589.694141,
'avg_wbgt_v': 32.600393,
>>>>>>> release/3.15.0
'avg_ltls_v': 75.000000000000000,
'avg_hvls_v': 75.000000000000000,
}
@ -149,11 +141,7 @@ class UCMTests(unittest.TestCase):
# Assert that the decimal value of the energy savings value is what we
# expect.
<<<<<<< HEAD
expected_energy_sav = 3647696.209368
=======
expected_energy_sav = 3562738.321307
>>>>>>> release/3.15.0
energy_sav = 0.0
n_nonetype = 0
@ -174,11 +162,7 @@ class UCMTests(unittest.TestCase):
# Expected energy savings is an accumulated value and may differ
# past about 4 decimal places.
numpy.testing.assert_allclose(energy_sav, expected_energy_sav, rtol=1e-4)
<<<<<<< HEAD
self.assertEqual(n_nonetype, 121)
=======
self.assertEqual(n_nonetype, 134)
>>>>>>> release/3.15.0
finally:
buildings_layer = None
buildings_vector = None
@ -217,11 +201,7 @@ class UCMTests(unittest.TestCase):
# and may differ past about 4 decimal places.
numpy.testing.assert_allclose(energy_sav, expected_energy_sav,
rtol=1e-4)
<<<<<<< HEAD
self.assertEqual(n_nonetype, 121)
=======
self.assertEqual(n_nonetype, 134)
>>>>>>> release/3.15.0
finally:
buildings_layer = None
buildings_vector = None