From b0bab42a2147a7f2fffd9fb78d773fb958401783 Mon Sep 17 00:00:00 2001 From: Rowan Cockett Date: Tue, 16 Feb 2016 21:39:32 -0800 Subject: [PATCH] Remove the optimization changes from the example branch. This is being taken care of in another PR. #236 --- SimPEG/Optimization.py | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/SimPEG/Optimization.py b/SimPEG/Optimization.py index 54f6c4ff..4f2cb062 100644 --- a/SimPEG/Optimization.py +++ b/SimPEG/Optimization.py @@ -990,18 +990,4 @@ class ProjectedGNCG(BFGS, Minimize, Remember): cgFlag = 1 # End CG Iterations - # Take a gradient step on the active cells if exist - if temp != self.xc.size: - - rhs_a = (Active) * -self.g - - dm_i = max( abs( delx ) ) - dm_a = max( abs(rhs_a) ) - - delx = delx + rhs_a * dm_i / dm_a /10. - - # 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. - return delx