diff --git a/.idea/Model.iml b/.idea/Model.iml index 4413bb06..b0f9c00d 100644 --- a/.idea/Model.iml +++ b/.idea/Model.iml @@ -7,7 +7,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 6f308057..1122b380 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,7 +3,7 @@ - + diff --git a/recommendations/Costs.py b/recommendations/Costs.py index a57092f9..0d9031b2 100644 --- a/recommendations/Costs.py +++ b/recommendations/Costs.py @@ -315,7 +315,9 @@ class Costs: subtotal_before_profit = labour_costs + materials_costs - contingency_cost = subtotal_before_profit * self.CONTINGENCY + # Because of the possiblity of damage to the existing floor, or difficulties associated to moving fittings, + # we use a higher contingency rate + contingency_cost = subtotal_before_profit * self.HIGH_RISK_CONTINGENCY preliminaries_cost = subtotal_before_profit * self.PRELIMINARIES profit_cost = subtotal_before_profit * self.PROFIT_MARGIN diff --git a/recommendations/tests/test_costs.py b/recommendations/tests/test_costs.py index 1d66ff47..1d519b91 100644 --- a/recommendations/tests/test_costs.py +++ b/recommendations/tests/test_costs.py @@ -240,7 +240,7 @@ class TestCosts: ) assert sus_floor_results == { - 'total': 3114.6027360000003, 'subtotal': 2595.50228, 'vat': 519.100456, 'contingency': 185.39302, + 'total': 3337.07436, 'subtotal': 2780.8953, 'vat': 556.17906, 'contingency': 370.78604, 'preliminaries': 185.39302, 'material': 483.405, 'profit': 370.78604, 'labour_hours': 54.940000000000005, 'labour_days': 2.289166666666667, 'labour_cost': 1370.5252 } diff --git a/recommendations/tests/test_floor_recommendations.py b/recommendations/tests/test_floor_recommendations.py index 01bd308e..43e98d60 100644 --- a/recommendations/tests/test_floor_recommendations.py +++ b/recommendations/tests/test_floor_recommendations.py @@ -81,7 +81,7 @@ class TestFloorRecommendations: assert types == {"suspended_floor_insulation"} assert len(recommender.recommendations) == 6 - assert recommender.recommendations[0]["total"] == 4596.858 + assert recommender.recommendations[0]["total"] == 4925.205 assert recommender.recommendations[0]["new_u_value"] == 0.21 def test_uvalue_0_12(self, input_properties):