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

Merge branch 'dcip/dev' of https://github.com/simpeg/simpeg into dcip/dev

Browse Source 
Conflicts:
	SimPEG/Regularization.py
This commit is contained in:
seogi_macbook
2016-03-03 15:12:05 -08:00
parent e4506a8773 834de58284
commit f73d0a3b4a
68 changed files with 5837 additions and 1118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SimPEG/Regularization.py
+3
View File
@@ -281,6 +281,7 @@ class Tikhonov(BaseRegularization):
r = self.W * ( self.mapping * (m - self.mref) )
out = mD.T * ( self.W.T * r )
return out
<<<<<<< HEAD
class Simple(BaseRegularization):
"""
@@ -518,3 +519,5 @@ class SparseRegularization(Simple):
r = eta / (f_m**2.+self.eps**2.)**((1-p/2.)/2.)
return r
=======
>>>>>>> 834de582844e8e1eac95819fbe03eed55dbeb001