From d40d20497f3f600b17d122d85214e48fd5286d95 Mon Sep 17 00:00:00 2001 From: Khalim Conn-Kowlessar Date: Mon, 26 Jun 2023 09:48:59 +0100 Subject: [PATCH] refactors gain optimised slightly --- model_data/optimiser/Optimiser.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/model_data/optimiser/Optimiser.py b/model_data/optimiser/Optimiser.py index e6766172..9251822a 100644 --- a/model_data/optimiser/Optimiser.py +++ b/model_data/optimiser/Optimiser.py @@ -33,13 +33,6 @@ C = 4000 # group all the parts groups = [wall, floor, roof] -# Get the selected items - - -total_gain = m.objective.x -actual_cost = sum([component['cost'] for component in selected_items]) -print("Selected items:", selected_items) - class GainOptimiser: """ @@ -52,6 +45,9 @@ class GainOptimiser: self.variables = [] self.solution = [] + self.solution_gain = None + self.solution_cost = None + def setup(self): # Initialize Model self.m = Model("knapsack") @@ -95,3 +91,8 @@ class GainOptimiser: item for group, group_vars in zip(groups, self.variables) for item, var in zip(group, group_vars) if var.x >= 0.99 ] + + # Get the selected items + + solution_gain = self.m.objective.x + solution_cost = sum([component['cost'] for component in self.solution])