wassname/simpeg
1
0
Fork 0
mirror of https://github.com/wassname/simpeg.git synced 2026-07-23 13:10:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Rowan Cockett
2013-11-07 12:27:07 -08:00
parent 318ca555c8
commit ded738b077
3 changed files with 39 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SimPEG/inverse/Inversion.py
+5 -5
View File
@@ -23,13 +23,13 @@ class Inversion(object):
if not haveInserted:
self.opt.printers.insert(1,{"title": "beta",
"value": lambda M: M.parent._beta,
"width": 13, "format": "%1.2e"})
"width": 10, "format": "%1.2e"})
self.opt.printers.insert(2,{"title": "phi_d",
"value": lambda M: M.parent._phi_d_last,
"width": 13, "format": "%1.2e"})
"width": 10, "format": "%1.2e"})
self.opt.printers.insert(3,{"title": "phi_m",
"value": lambda M: M.parent._phi_m_last,
"width": 13, "format": "%1.2e"})
"width": 10, "format": "%1.2e"})
def setKwargs(self, **kwargs):
"""Sets key word arguments (kwargs) that are present in the object, throw an error if they don't exist."""
@@ -80,8 +80,8 @@ class Inversion(object):
while True:
self._beta = self.getBeta()
m = self.opt.minimize(self.evalFunction,m)
if self.stoppingCriteria(): break
self._iter += 1
if self.stoppingCriteria(): break
return m
beta0 = 1.e2
@@ -127,7 +127,7 @@ class Inversion(object):
operator = sp.linalg.LinearOperator( (m.size, m.size), H_fun, dtype=float )
out += (operator,)
return out
return out if len(out) > 1 else out[0]
def dataObj(self, m, u=None):