diff Problems/Pierre_Problem.m @ 126:db5a7fe1a404 ivand_dev

Merge from branch "sup_158_IMG_Processing_toolbox_"

--- a/Problems/Pierre_Problem.m	Wed May 25 13:33:47 2011 +0100
+++ b/Problems/Pierre_Problem.m	Wed May 25 15:30:34 2011 +0100
@@ -1,14 +1,5 @@
 function data=Pierre_Problem(src, trg, blocksize, dictsize);
-%%% Generate Pierre Problem
-%
-%   Centre for Digital Music, Queen Mary, University of London.
-%   This file copyright 2010 Ivan Damnjanovic.
-%
-%   This program is free software; you can redistribute it and/or
-%   modify it under the terms of the GNU General Public License as
-%   published by the Free Software Foundation; either version 2 of the
-%   License, or (at your option) any later version.  See the file
-%   COPYING included with this distribution for more information.
+%% Generate Pierre Problem
 %
 %   Pierre_Problem is a part of the SMALLbox and generates the problem
 %   suggested by Professor Pierre Vandergheynst on the SMALL meeting in 
@@ -38,6 +29,15 @@
 %   -   sparse - if 1 SMALL_solve will keep solution matrix in sparse form,
 %                due to memory constrains.
 
+%
+%   Centre for Digital Music, Queen Mary, University of London.
+%   This file copyright 2010 Ivan Damnjanovic.
+%
+%   This program is free software; you can redistribute it and/or
+%   modify it under the terms of the GNU General Public License as
+%   published by the Free Software Foundation; either version 2 of the
+%   License, or (at your option) any later version.  See the file
+%   COPYING included with this distribution for more information.
 %% prompt user for images %%
 
 %   ask for source file name
@@ -91,7 +91,7 @@
 %%
 %% create dictionary data %%
 
-S=im2col(src,blocksize,'sliding');
+S=im2colstep(src,blocksize);
 
 for j= 1:size(S,2)
     S(:,j)=S(:,j)./norm(S(:,j));
@@ -99,7 +99,7 @@
 
 %% create measurement matrix %%
 
-T=im2col(trg,blocksize, 'distinct');
+T=im2colstep(trg,blocksize, blocksize);
 
 %% output structure %%