From 9805171a7b37150336101cd40bf8b25c5f3613b5 Mon Sep 17 00:00:00 2001 From: Andy Eschbacher Date: Fri, 19 May 2017 09:25:23 -0400 Subject: [PATCH] adds rounding to output results --- src/py/crankshaft/crankshaft/optimization/optim.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/py/crankshaft/crankshaft/optimization/optim.py b/src/py/crankshaft/crankshaft/optimization/optim.py index b94c521..586ee9a 100644 --- a/src/py/crankshaft/crankshaft/optimization/optim.py +++ b/src/py/crankshaft/crankshaft/optimization/optim.py @@ -150,7 +150,8 @@ class Optim(object): source_id_crosswalk[source_val], self.model_data['cost'][drain_index[idx], source_val], round(self.model_data['source_amount'][source_val] * - assignments[source_val, drain_index[idx]], 6) + assignments[source_val, drain_index[idx]], 6), + False ) for idx, source_val in enumerate(source_index)] # Fixed vals: @@ -179,7 +180,8 @@ class Optim(object): return zip(self.ids['drain_fixed'], self.ids['source_fixed'], [1.] * len(self.ids['source_fixed']), - self.model_data['source_amount_fixed']) + self.model_data['source_amount_fixed'], + [True] * len(self.ids['drain_fixed'])) def cost_func(self, distance, waste, marginal): """