Clean up whitespace in optimization.

This commit is contained in:
Rowan Cockett
2016-02-16 09:47:07 -08:00
parent 059850f282
commit e4c30705ff
+8 -7
View File
@@ -989,19 +989,20 @@ class ProjectedGNCG(BFGS, Minimize, Remember):
if np.logical_or(norm(resid)/normResid0 <= self.tolCG, cgiter == self.maxIterCG):
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) )
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
return delx