FluxDistributionResult has objective_value property now. Also, fba re…

…turns FluxDistributionResult now.

cameo/core/result.py

@@ -67,6 +67,7 @@ class FluxDistributionResult(Result):
     def __init__(self, solution, *args, **kwargs):
         super(FluxDistributionResult, self).__init__(*args, **kwargs)
         self._fluxes = solution.fluxes
+        self._objective_value = solution.f
 
     @property
     def data_frame(self):
@@ -76,6 +77,10 @@ def data_frame(self):
     def fluxes(self):
         return self._fluxes
 
+    @property
+    def objective_value(self):
+        return self._objective_value
+
 
 if __name__ == '__main__':
 

cameo/flux_analysis/distance.py

@@ -14,6 +14,7 @@
 
 from types import DictType
 from sympy import Add
+from cameo.core.result import FluxDistributionResult
 from cameo.core.solution import SolutionBase, Solution
 
 add = Add._from_args
@@ -109,9 +110,11 @@ def __add_deviavtion_constraint(self, reaction_id, flux_value):
 
     def minimize_L1(self, *args, **kwargs):
         self.model.objective.direction = 'min'
-        return self.model.solve(solution_type=Solution)
+        solution = self.model.solve()
+        result = FluxDistributionResult(solution)
+        return result
 
-    def maximize_L1(self, *args, **kwargs):
-        self.model.objective.direction = 'max'
-        return self.model.solve(solution_type=Solution)
+    # def maximize_L1(self, *args, **kwargs):
+    #     self.model.objective.direction = 'max'
+    #     return self.model.solve(solution_type=Solution)
 

cameo/flux_analysis/simulation.py

@@ -53,13 +53,8 @@ def fba(model, objective=None, *args, **kwargs):
         if objective is not None:
             tm(do=partial(setattr, model, 'objective', objective),
                undo=partial(setattr, model, 'objective', model.objective))
-        try:
-            solution = model.solve()
-            result = FluxDistributionResult(solution)
-            tm.reset()
-            return solution
-        except SolveError as e:
-            raise e
+        solution = model.solve()
+        result = FluxDistributionResult(solution)
     return result
 
 def pfba(model, objective=None, *args, **kwargs):

tests/test_flux_analysis.py

@@ -156,7 +156,7 @@ def setUp(self):
 
     def test_fba(self):
         solution = fba(self.model)
-        self.assertAlmostEqual(solution.f, 0.873921, delta=0.000001)
+        self.assertAlmostEqual(solution.objective_value, 0.873921, delta=0.000001)
 
     def test_pfba(self):
         fba_solution = fba(self.model)