Skip to content

Commit

Permalink
Merge branch 'master' into Development
Browse files Browse the repository at this point in the history
  • Loading branch information
krzakala committed Aug 16, 2015
2 parents bae9cc5 + 9af0dba commit 5ee1c55
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 624 deletions.
19 changes: 6 additions & 13 deletions Functions/LowRAMP_UV.m
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,9 @@

u_old=zeros(m,RANK);
v_old=zeros(n,RANK);
u_var=zeros(RANK,RANK);u_var_old=zeros(RANK,RANK);
v_var=zeros(RANK,RANK);v_var_old=zeros(RANK,RANK);

u_var=zeros(RANK,RANK);
v_var=zeros(RANK,RANK);
A_u=zeros(RANK,RANK);
B_u=zeros(m,RANK);
A_v=zeros(RANK,RANK);
Expand All @@ -125,19 +125,12 @@
B_u_new=(S*v)/sqrt(n)-u_old*v_var/(Delta);
A_u_new=v'*v/(n*Delta);

% m_mean=sum(sum(triu(A_u_new,1)))/((RANK*RANK-RANK)*0.5);
% A_u_new=diag(diag(A_u_new))+triu(ones(RANK,RANK),1)*m_mean+triu(ones(RANK,RANK),1)'*m_mean;


B_v_new=(S'*u)/sqrt(n)-v_old*(m*u_var/n)/(Delta);
A_v_new=u'*u/(n*Delta);

% m_mean=sum(sum(triu(A_v_new,1)))/((RANK*RANK-RANK)*0.5);
% A_v_new=diag(diag(A_v_new))+triu(ones(RANK,RANK),1)*m_mean+triu(ones(RANK,RANK),1)'*m_mean;


%Keep old variables
u_old=u;u_var_old=u_var;
v_old=v;v_var_old=v_var;
u_old=u;
v_old=v;

%Iteration with fixed damping or learner one
pass=0;
Expand Down
201 changes: 0 additions & 201 deletions Functions/LowRAMP_UV.m~

This file was deleted.

Loading

0 comments on commit 5ee1c55

Please sign in to comment.