Merge branch 'master' into triangle

internal/learnpairdict.m

@@ -20,10 +20,10 @@
 function pd = learnpairdict(stream, n, k, ny, nx, lambda, iters, sbin, fast),
 
 if ~exist('n', 'var'),
-   n = 100000;
+   n = 1000000;
 end
 if ~exist('k', 'var'),
-  k = 1000;
+  k = 1024;
 end
 if ~exist('ny', 'var'),
   ny = 5;
@@ -93,6 +93,7 @@
 param.numThreads = 12;
 param.verbose = 1;
 param.batchsize = 400;
+param.posAlpha = true;
 
 fprintf('ihog: lasso\n');
 model = struct();

internal/pd2txt.m

@@ -0,0 +1,21 @@
+% pd2txt(out, pd)
+%
+% Dumps the paired dictionary 'pd' to output file 'file'
+function pd2txt(out, pd),
+
+f = fopen(out, 'w');
+fprintf(f, '%f\n', pd.lambda);
+fprintf(f, '%i %i\n', pd.ny, pd.nx);
+fprintf(f, '%i\n', pd.sbin);
+fprintf(f, '%i\n', pd.k);
+fprintf(f, '\n');
+for i=1:pd.k,
+  fprintf(f, '%f ', pd.dhog(i, :));
+  fprintf(f, '\n');
+end
+fprintf(f, '\n');
+for i=1:pd.k,
+  fprintf(f, '%f ', pd.dgray(i, :));
+  fprintf(f, '\n');
+end
+fclose(f);

invertHOG.m

@@ -69,6 +69,7 @@
 % solve lasso problem
 param.lambda = pd.lambda;
 param.mode = 2;
+param.pos = true;
 a = full(mexLasso(single(windows), pd.dhog, param));
 recon = pd.dgray * a;