Changes to evalFunction. and more extensible calls in startup and endIteration

SimPEG/tests/TestUtils.py

@@ -5,6 +5,7 @@ from SimPEG.utils import mkvc, sdiag
 from SimPEG import utils
 from SimPEG.mesh import TensorMesh, LogicallyOrthogonalMesh
 import numpy as np
+import scipy.sparse as sp
 import unittest
 import inspect
 
@@ -179,14 +180,14 @@ def Rosenbrock(x, return_g=True, return_H=True):
 
     f = 100*(x[1]-x[0]**2)**2+(1-x[0])**2
     g = np.array([2*(200*x[0]**3-200*x[0]*x[1]+x[0]-1), 200*(x[1]-x[0]**2)])
-    H = np.array([[-400*x[1]+1200*x[0]**2+2, -400*x[0]], [-400*x[0], 200]])
+    H = sp.csr_matrix(np.array([[-400*x[1]+1200*x[0]**2+2, -400*x[0]], [-400*x[0], 200]]))
 
     out = (f,)
     if return_g:
         out += (g,)
     if return_H:
         out += (H,)
-    return out
+    return out if len(out) > 1 else out[0]
 
 def checkDerivative(fctn, x0, num=7, plotIt=True, dx=None):
     """