domains added and class names in priors capitalized

This commit is contained in:
Max Zwiessele 2013-06-04 17:21:56 +01:00
parent 3546650d15
commit c7ac1ed9d8
7 changed files with 61 additions and 49 deletions

View file

@ -156,8 +156,8 @@ def SCG(f, gradf, x, optargs=(), maxiters=500, max_f_eval=500, display=True, xto
# beta = 1. # TODO: betareset!!
nsuccess = 0
elif success:
gamma = np.dot(gradold - gradnew, gradnew) / (mu)
d = gamma * d - gradnew
Gamma = np.dot(gradold - gradnew, gradnew) / (mu)
d = Gamma * d - gradnew
else:
# If we get here, then we haven't terminated in the given number of
# iterations.