Mercurial > hg > ishara

diff sequences/@seq/unbuffer.m @ 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 3f77126f7b5f
children
line wrap: on
line diff
--- 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)';