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

Temporary change ... comment out W and Wsmooth

Browse Source
This commit is contained in:
D Fournier
2016-05-12 08:31:01 -07:00
parent cd2360b815
commit 3cc46131a3
2 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SimPEG/Directives.py
+2 -4
View File
@@ -278,7 +278,6 @@ class Update_IRLS(InversionDirective):
self.reg._Wx = None
self.reg._Wy = None
self.reg._Wz = None
self.reg._W = None
if getattr(self, 'phi_d_last', None) is None:
self.phi_d_last = self.invProb.phi_d
@@ -308,20 +307,19 @@ class Update_IRLS(InversionDirective):
self.reg._Wx = None
self.reg._Wy = None
self.reg._Wz = None
self.reg._W = None
# Compute new model objective function value
phim_new = self.reg.eval(self.invProb.curModel)
# Update gamma to scale the regularization between IRLS iterations
self.reg.gamma = self.phi_m_last / phim_new
print "New gamma ", np.linalg.norm(self.reg.gamma)
# Reset the regularization matrices again for new gamma
self.reg._Wsmall = None
self.reg._Wx = None
self.reg._Wy = None
self.reg._Wz = None
self.reg._W = None
class Update_lin_PreCond(InversionDirective):
"""
SimPEG/Regularization.py
+26 -26
View File
@@ -451,32 +451,32 @@ class Simple(BaseRegularization):
self._Wz = Utils.sdiag((self.alpha_z * (self.regmesh.aveCC2Fz*self.cell_weights))**0.5)*self.regmesh.cellDiffzStencil
return self._Wz
@property
def Wsmooth(self):
"""Full smoothness regularization matrix W"""
print 'wtf why are we using Wsmooth'
raise NotImplementedError
if getattr(self, '_Wsmooth', None) is None:
wlist = (self.Wx,)
if self.regmesh.dim > 1:
wlist += (self.Wy,)
if self.regmesh.dim > 2:
wlist += (self.Wz,)
self._Wsmooth = sp.vstack(wlist)
return self._Wsmooth
@property
def W(self):
"""Full regularization matrix W"""
print 'wtf why are we using W'
if getattr(self, '_W', None) is None:
wlist = (self.Wsmall, self.Wx)
if self.regmesh.dim > 1:
wlist += (self.Wy,)
if self.regmesh.dim > 2:
wlist += (self.Wz,)
self._W = sp.vstack(wlist)
return self._W
# @property
# def Wsmooth(self):
# """Full smoothness regularization matrix W"""
# print 'wtf why are we using Wsmooth'
# raise NotImplementedError
# if getattr(self, '_Wsmooth', None) is None:
# wlist = (self.Wx,)
# if self.regmesh.dim > 1:
# wlist += (self.Wy,)
# if self.regmesh.dim > 2:
# wlist += (self.Wz,)
# self._Wsmooth = sp.vstack(wlist)
# return self._Wsmooth
#
# @property
# def W(self):
# """Full regularization matrix W"""
# print 'wtf why are we using W'
# if getattr(self, '_W', None) is None:
# wlist = (self.Wsmall, self.Wx)
# if self.regmesh.dim > 1:
# wlist += (self.Wy,)
# if self.regmesh.dim > 2:
# wlist += (self.Wz,)
# self._W = sp.vstack(wlist)
# return self._W
@Utils.timeIt