Model fit information in repr output

ddm/fitresult.py

@@ -57,6 +57,13 @@ def __init__(self, fitting_method, method, loss, value, **kwargs):
         self.loss = loss
         self.properties = kwargs
         self.fitting_method = fitting_method
+    def __repr__(self):
+        components = ["fitting_method=%s" % repr(self.fitting_method),
+                      "method=%s" % repr(self.method),
+                      "loss=%s" % repr(self.loss),
+                      "value=%s" % repr(self.val)]
+        components += ["%s=%s" % (k,repr(v)) for k,v in self.properties.items()]
+        return type(self).__name__ + "(" + ", ".join(components) + ")"
     @accepts(Self)
     @returns(ExtendedReal)
     def value(self):
@@ -72,6 +79,8 @@ def value(self):
 
 class FitResultEmpty(FitResult):
     """A default Fit object before a model has been fit."""
+    def __repr__(self):
+        return type(self).__name__ + "()"
     def __init__(self):
         self.val = None
         self.properties = {}

ddm/functions.py

@@ -429,6 +429,8 @@ def solve_all_conditions(model, sample, conditions={}, method=None):
         meth = model.solve_numerical_implicit
     elif method == "explicit":
         meth = model.solve_numerical_explicit
+    else:
+        raise ValueError("Invalid method "+method)
 
     cache = {}
     if _parallel_pool is None: # No parallelization

ddm/model.py

@@ -135,6 +135,11 @@ def __repr__(self, pretty=False):
                     params += ",\n" + " "*(len(type(self).__name__)+1)
                 else:
                     params += ", "
+        if not isinstance(self.fitresult, FitResultEmpty):
+            if pretty:
+                params += ",\n  " + repr(self.fitresult)
+            else:
+                params += ", " + repr(self.fitresult)
         return type(self).__name__ + "(" + params + ")"
     def __str__(self):
         return self.__repr__(pretty=True)