Mercurial > hg > ishara

changeset 25:79038cbcce00

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Updated argument order to zipaccum mapaccum.
author samer
date Fri, 18 Jan 2013 22:45:11 +0000
parents 5d8d2ad635f1
children 8f4a21082c45
files sequences/@seq/dynfilter.m sequences/@seq/filter.m sequences/@seq/unbuffer.m sequences/rndscanl.m sequences/rndzip.m sequences/rndzipaccum.m
diffstat 6 files changed, 14 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/sequences/@seq/dynfilter.m	Fri Jan 18 21:42:03 2013 +0000
+++ b/sequences/@seq/dynfilter.m	Fri Jan 18 22:45:11 2013 +0000
@@ -12,4 +12,4 @@
 	if nargin<4, z=[]; end
 end
 
-y = zipaccum(@(ab1,x1,z1)filter(ab1{1},ab1{2},x1,z1,dim),{ab,x},z);
+y = zipaccum(@(ab1,x1,z1)filter(ab1{1},ab1{2},x1,z1,dim),z,ab,x);
--- a/sequences/@seq/filter.m	Fri Jan 18 21:42:03 2013 +0000
+++ b/sequences/@seq/filter.m	Fri Jan 18 22:45:11 2013 +0000
@@ -14,4 +14,4 @@
 	if nargin<4, z=[]; end
 end
 
-y = mapaccum(@(x1,z1)filter(a,b,x1,z1,dim),x,z);
+y = mapaccum(@(x1,z1)filter(a,b,x1,z1,dim),z,x);
--- a/sequences/@seq/unbuffer.m	Fri Jan 18 21:42:03 2013 +0000
+++ b/sequences/@seq/unbuffer.m	Fri Jan 18 22:45:11 2013 +0000
@@ -8,19 +8,16 @@
 % NB. what about windowing function?
 
 function Y=unbuffer(X,hop)
-	if isscalar(hop)
-		N=max(size(X));
-		ol=N-hop;
-		if ol<=hop
-			I=1:hop; J=1:ol; K=hop+1:N;
-			Y=mapaccum(@olap1,X,zeros(ol,1));
-		else
-			I=1:hop; J=hop+1:ol; K=ol+1:N;
-			Y=mapaccum(@olap3,X,zeros(ol,1));
-		end
+	N=max(size(X));
+	ol=N-hop;
+	if ol<=hop
+		I=1:hop; J=1:ol; K=hop+1:N;
+		Y=mapaccum(@olap1,zeros(ol,1),X);
 	else
-		Y=zipaccum(@olap2,{windowdata(repeat(hop)),X},[]);
+		I=1:hop; J=hop+1:ol; K=ol+1:N;
+		Y=mapaccum(@olap3,zeros(ol,1),X);
 	end
+%		Y=zipaccum(@olap2,[],windowdata(repeat(hop)),X);
 
 	function [y,s1]=olap1(x,s)
 		y=x(I)';
--- a/sequences/rndscanl.m	Fri Jan 18 21:42:03 2013 +0000
+++ b/sequences/rndscanl.m	Fri Jan 18 22:45:11 2013 +0000
@@ -11,9 +11,9 @@
 	n=length(varargin)-1;
 	rs0=varargin{n+1};
 	if n>1,
-		X=zipaccum(@zafn,varargin(1:n),{s0,rs0});
+		X=zipaccum(@zafn,{s0,rs0},varargin{1:n});
 	elseif n==1
-		X=mapaccum(@mafn,varargin{1},{s0,rs0});
+		X=mapaccum(@mafn,{s0,rs0},varargin{1});
 	else
 		X=unfold(@ufn,{s0,rs0});
 	end
--- a/sequences/rndzip.m	Fri Jan 18 21:42:03 2013 +0000
+++ b/sequences/rndzip.m	Fri Jan 18 22:45:11 2013 +0000
@@ -9,7 +9,7 @@
 
 	n=length(varargin)-1;
 	if n>0
-		X=zipaccum(@zipfn,varargin(1:n),varargin{n+1});
+		X=zipaccum(@zipfn,varargin{n+1},varargin{1:n});
 	else
 		X=unfold(@ufn,varargin{1});
 	end
--- a/sequences/rndzipaccum.m	Fri Jan 18 21:42:03 2013 +0000
+++ b/sequences/rndzipaccum.m	Fri Jan 18 22:45:11 2013 +0000
@@ -10,7 +10,7 @@
 
 	n=length(varargin)-1;
 	if n>0
-		X=zipaccum(@zafn,varargin(1:n),{s0,varargin{n+1}});
+		X=zipaccum(@zafn,{s0,varargin{n+1}},varargin{1:n});
 	else
 		X=unfold(@ufn,{s0,varargin{1}});
 	end