Merge pull request #49 from bendudson/measures-catch-exceptions

Check for exceptions in measures

freegs/optimise.py

@@ -71,7 +71,10 @@ def weighted_sum(*args):
         else:
             args_with_weights.append(arg)
 
-    return lambda eq: sum(func(eq) * weight for func, weight in args_with_weights)
+    def combined_measure(eq):
+        return sum(func(eq) * weight for func, weight in args_with_weights)
+
+    return combined_measure
 
 
 #### Controls for Equilibrium objects
@@ -193,11 +196,11 @@ def solve_and_measure(eq):
         try:
             # Re-solve
             picard.solve(eq, eq._profiles, eq._constraints)
+            # Call user-supplied evaluation function
+            return measure(eq)
         except:
             # Solve failed.
             return float("inf")
-        # Call user-supplied evaluation function
-        return measure(eq)
 
     # Call the generic optimiser,
     return optimiser.optimise(