#69 Removed most solvers, replaced by wrappers.

This commit is contained in:
rowanc1
2014-05-16 18:33:57 -07:00
parent 1f0e37d773
commit f3170a8a7f
11 changed files with 92 additions and 670 deletions
+2 -2
View File
@@ -1,5 +1,5 @@
import Utils, numpy as np, scipy.sparse as sp
from Solver import Solver
from Solver import Solver, SolverCG
norm = np.linalg.norm
@@ -778,7 +778,7 @@ class InexactGaussNewton(BFGS, Minimize, Remember):
@Utils.timeIt
def findSearchDirection(self):
Hinv = Solver(self.H, doDirect=False, options={'iterSolver': 'CG', 'M': self.approxHinv, 'tol': self.tolCG, 'maxIter': self.maxIterCG})
Hinv = SolverCG(self.H, M=self.approxHinv, tol=self.tolCG, maxiter=self.maxIterCG)
p = Hinv.solve(-self.g)
return p