Skip to content

Commit

Permalink
Jan update
Browse files Browse the repository at this point in the history
  • Loading branch information
OlegKonings committed Jan 29, 2014
1 parent 8b51585 commit 3d1e1f6
Show file tree
Hide file tree
Showing 39 changed files with 41 additions and 4,185 deletions.
13 changes: 10 additions & 3 deletions GLtest2.m
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
m=int32(5632);
K=int32(208);
m=int32(1536);
K=int32(44);
density=single(100);

[ A,b,partition,lambda ] = GenerateRandomGroupLassoDataSet( m,K,density );
Expand All @@ -24,16 +24,20 @@
z=single(zeros(n,1));

AA=A';
disp('partition sum= ');
dd=sum(partition);
disp(dd);
disp(n);
disp('m=');
disp(m);
disp('n=');
disp(n);
tic;
[nxtu,nxtz]=GroupMextest(AA,b,partition,u,z,rho,alpha,lambda,MAX_ITER,ABSTOL,RELTOL);% for this version matrix A must be passed in transpose (CUDA solver uses row major)
toc;
gtime=(toc-tic);
disp(gtime);


tic;

x = single(zeros(n,1));
Expand Down Expand Up @@ -106,6 +110,9 @@
disp(norm(nxtu-u));
disp('vector z diff');
disp(norm(nxtz-z));
disp('maxes');
disp(max(u));
disp(max(z));



2 changes: 1 addition & 1 deletion GenerateRandomGroupLassoDataSet.m
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

flag=true;
while flag
partition = int32(randi(48, [K 1]));% per Boyd example
partition = int32(randi(128, [K 1]));% per Boyd example
n = int32(sum(partition)); % number of features
if (mod(n,16))==0
flag=false;
Expand Down
Binary file modified GroupMextest.mexw64
Binary file not shown.
Loading

0 comments on commit 3d1e1f6

Please sign in to comment.