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

change modelObj2Deriv from (self) --> (self, m, v=None)

Browse Source 
Had to change location of _bfgsH0 calculation, which now actually works.
This commit is contained in:
rowanc1
2014-03-02 20:15:29 -08:00
parent 802094096e
commit c1d37ef8ff
5 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SimPEG/Regularization.py
+14 -3
View File
@@ -79,12 +79,18 @@ class BaseRegularization(object):
R(m) = \mathbf{W^\\top W (m-m_\\text{ref})}
"""
return self.W.T * ( self.W * self.model.transform(m - self.mref) )
mTd = self.model.transformDeriv(m - self.mref)
return mTd.T * ( self.W.T * ( self.W * self.model.transform(m - self.mref) ) )
@Utils.timeIt
def modelObj2Deriv(self):
def modelObj2Deriv(self, m, v=None):
"""
:param numpy.array m: geophysical model
:param numpy.array v: vector to multiply
:rtype: scipy.sparse.csr_matrix or numpy.ndarray
:return: WtW or WtW*v
The regularization is:
.. math::
@@ -98,7 +104,12 @@ class BaseRegularization(object):
R(m) = \mathbf{W^\\top W}
"""
return self.W.T * self.W
mTd = self.model.transformDeriv(m - self.mref)
if v is None:
return mTd.T * self.W.T * self.W * mTd
return mTd.T * ( self.W.T * ( self.W * ( mTd * v) ) )