diff --git a/Assignment 1/assignment1.py b/Assignment 1/assignment1.py index 2f8da3babcc3db4d8350fd3dbecee721d9e9b317..f321ef8e534f4fcad6e71af2e5983d600961af01 100644 --- a/Assignment 1/assignment1.py +++ b/Assignment 1/assignment1.py @@ -32,7 +32,7 @@ def armijo(alpha0,Q,b,c,D,m): #print('alpha is ', alpha) s = 1.0 sigma = 1.0 - beta = 1.0/2 + beta = 1.0/3 while f(Q,b,c,x+np.transpose(beta**m*s*D)) < f(Q,b,c,x) + sigma*beta**m*s*(np.transpose(gradf(Q,b,x)))*np.transpose(D): m+=1 #print('m is ', m) @@ -56,7 +56,7 @@ def grad_opt(epsilon,x,count,alpha): D = -1*np.transpose(gradf(Q,b,x))/np.linalg.norm(gradf(Q,b,x)) #print('D is ', D) alpha = armijo(alpha,Q,b,c,D,m) - print('alpha0 is ', alpha) + #print('alpha0 is ', alpha) count += 1 if count%1000==0: print 'f(x) is ', f(Q,b,c,x)