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

Merge branch 'feat/sparse-regularization' into patch/sparse-dcip

Browse Source 
# Conflicts:
#	SimPEG/Examples/__init__.py
#	SimPEG/Optimization.py
This commit is contained in:
Lindsey Heagy
2016-04-06 14:53:45 -07:00
parent f799733a9d 15d59a5b50
commit ae9ca6cec9
15 changed files with 2067 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SimPEG/Optimization.py
+1
View File
@@ -1003,6 +1003,7 @@ class ProjectedGNCG(BFGS, Minimize, Remember):
# perturb inactive set off of bounds so that they are included in the step
delx = delx + self.stepOffBoundsFact * (rhs_a * dm_i / dm_a)
# Only keep gradients going in the right direction on the active set
indx = ((self.xc<=self.lower) & (delx < 0)) | ((self.xc>=self.upper) & (delx > 0))
delx[indx] = 0.