diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..485dee6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.idea diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 26d3352..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git a/.idea/costs.iml b/.idea/costs.iml deleted file mode 100644 index b6de3e9..0000000 --- a/.idea/costs.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index db85aa1..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml deleted file mode 100644 index 105ce2d..0000000 --- a/.idea/inspectionProfiles/profiles_settings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index dc7953c..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 1a243a1..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/costs/__pycache__/__init__.cpython-39.pyc b/costs/__pycache__/__init__.cpython-39.pyc index 49e54d8..142e29f 100644 Binary files a/costs/__pycache__/__init__.cpython-39.pyc and b/costs/__pycache__/__init__.cpython-39.pyc differ diff --git a/costs/__pycache__/capital_costs.cpython-39.pyc b/costs/__pycache__/capital_costs.cpython-39.pyc index fb8a19d..77d805d 100644 Binary files a/costs/__pycache__/capital_costs.cpython-39.pyc and b/costs/__pycache__/capital_costs.cpython-39.pyc differ diff --git a/costs/__pycache__/configuration.cpython-39.pyc b/costs/__pycache__/configuration.cpython-39.pyc index b83af83..6968cf4 100644 Binary files a/costs/__pycache__/configuration.cpython-39.pyc and b/costs/__pycache__/configuration.cpython-39.pyc differ diff --git a/costs/__pycache__/constants.cpython-39.pyc b/costs/__pycache__/constants.cpython-39.pyc index 431a8a5..9d6ade9 100644 Binary files a/costs/__pycache__/constants.cpython-39.pyc and b/costs/__pycache__/constants.cpython-39.pyc differ diff --git a/costs/__pycache__/cost.cpython-39.pyc b/costs/__pycache__/cost.cpython-39.pyc index 94233ab..e46b6a2 100644 Binary files a/costs/__pycache__/cost.cpython-39.pyc and b/costs/__pycache__/cost.cpython-39.pyc differ diff --git a/costs/__pycache__/cost_base.cpython-39.pyc b/costs/__pycache__/cost_base.cpython-39.pyc index 7056f38..7b0b979 100644 Binary files a/costs/__pycache__/cost_base.cpython-39.pyc and b/costs/__pycache__/cost_base.cpython-39.pyc differ diff --git a/costs/__pycache__/end_of_life_costs.cpython-39.pyc b/costs/__pycache__/end_of_life_costs.cpython-39.pyc index 45c85b4..3b3ce6d 100644 Binary files a/costs/__pycache__/end_of_life_costs.cpython-39.pyc and b/costs/__pycache__/end_of_life_costs.cpython-39.pyc differ diff --git a/costs/__pycache__/total_maintenance_costs.cpython-39.pyc b/costs/__pycache__/total_maintenance_costs.cpython-39.pyc index fbc6e1c..ce75a82 100644 Binary files a/costs/__pycache__/total_maintenance_costs.cpython-39.pyc and b/costs/__pycache__/total_maintenance_costs.cpython-39.pyc differ diff --git a/costs/__pycache__/total_operational_costs.cpython-39.pyc b/costs/__pycache__/total_operational_costs.cpython-39.pyc index aacfb2d..8e5a72c 100644 Binary files a/costs/__pycache__/total_operational_costs.cpython-39.pyc and b/costs/__pycache__/total_operational_costs.cpython-39.pyc differ diff --git a/costs/__pycache__/total_operational_incomes.cpython-39.pyc b/costs/__pycache__/total_operational_incomes.cpython-39.pyc index 0944ee4..d5e05e0 100644 Binary files a/costs/__pycache__/total_operational_incomes.cpython-39.pyc and b/costs/__pycache__/total_operational_incomes.cpython-39.pyc differ diff --git a/tests/__pycache__/test_costs.cpython-39.pyc b/tests/__pycache__/test_costs.cpython-39.pyc new file mode 100644 index 0000000..ba32321 Binary files /dev/null and b/tests/__pycache__/test_costs.cpython-39.pyc differ diff --git a/tests/__pycache__/unit_tests.cpython-39.pyc b/tests/__pycache__/unit_tests.cpython-39.pyc index 3e1f658..dc9c8f7 100644 Binary files a/tests/__pycache__/unit_tests.cpython-39.pyc and b/tests/__pycache__/unit_tests.cpython-39.pyc differ diff --git a/tests/unit_tests.py b/tests/unit_tests.py index 22a8c06..5a6b1dd 100644 --- a/tests/unit_tests.py +++ b/tests/unit_tests.py @@ -20,8 +20,9 @@ from costs.constants import SKIN_RETROFIT, SKIN_RETROFIT_AND_SYSTEM_RETROFIT_AND class UnitTests(unittest.TestCase): def setUp(self) -> None: - city_file = Path("./data/test.geojson").resolve() - output_path = Path('./output/').resolve() + + city_file = (Path(__file__).parent / 'data/test.geojson').resolve() + output_path = (Path(__file__).parent / 'output').resolve() city = GeometryFactory('geojson', city_file, height_field='citygml_me', @@ -49,7 +50,7 @@ class UnitTests(unittest.TestCase): for building in self._city.buildings: result = Cost(building).life_cycle self.assertIsNotNone(result) - self.assertEqual(1, result.values[0]) + self.assertEqual(0, result.values[0]) def test_scenario_1(self): for building in self._city.buildings: