wassname/simpeg
1
0
Fork 0
mirror of https://github.com/wassname/simpeg.git synced 2026-08-18 12:30:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Moved projectedGradient to the optimize file. Added video to IPNB.

Browse Source
This commit is contained in:
Rowan Cockett
2013-11-07 14:56:54 -08:00
parent 1427fe5cec
commit 1ef70ba15c
4 changed files with 1013 additions and 503 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SimPEG/inverse/Inversion.py
+6 -6
View File
@@ -25,10 +25,10 @@ class Inversion(object):
"value": lambda M: M.parent._beta,
"width": 10, "format": "%1.2e"})
self.opt.printers.insert(2,{"title": "phi_d",
"value": lambda M: M.parent._phi_d_last,
"value": lambda M: M.parent.phi_d,
"width": 10, "format": "%1.2e"})
self.opt.printers.insert(3,{"title": "phi_m",
"value": lambda M: M.parent._phi_m_last,
"value": lambda M: M.parent.phi_m,
"width": 10, "format": "%1.2e"})
def setKwargs(self, **kwargs):
@@ -45,7 +45,7 @@ class Inversion(object):
# print "%s" % '-'*62
# def printIter(self):
# print "%3d %1.2e %1.2e %1.2e %1.2e %1.2e %3d" % (self.opt._iter, self._beta, self._phi_d_last, self._phi_m_last, self.opt.f, np.linalg.norm(self.opt.g), self.opt._iterLS)
# print "%3d %1.2e %1.2e %1.2e %1.2e %1.2e %3d" % (self.opt._iter, self._beta, self.phi_d, self.phi_m, self.opt.f, np.linalg.norm(self.opt.g), self.opt._iterLS)
@property
def Wd(self):
@@ -95,7 +95,7 @@ class Inversion(object):
def stoppingCriteria(self):
self._STOP = np.zeros(2,dtype=bool)
self._STOP[0] = self._iter >= self.maxIter
self._STOP[1] = self._phi_d_last <= self.phi_d_target
self._STOP[1] = self.phi_d <= self.phi_d_target
return np.any(self._STOP)
@@ -105,8 +105,8 @@ class Inversion(object):
phi_d = self.dataObj(m, u)
phi_m = self.reg.modelObj(m)
self._phi_d_last = phi_d
self._phi_m_last = phi_m
self.phi_d = phi_d
self.phi_m = phi_m
f = phi_d + self._beta * phi_m