From: <mb...@us...> - 2010-06-01 02:37:54
|
Revision: 7377 http://octave.svn.sourceforge.net/octave/?rev=7377&view=rev Author: mborg Date: 2010-06-01 02:37:48 +0000 (Tue, 01 Jun 2010) Log Message: ----------- new interleavers Added Paths: ----------- trunk/octave-forge/main/comm/inst/helintrlv.m trunk/octave-forge/main/comm/inst/helscandeintrlv.m trunk/octave-forge/main/comm/inst/helscanintrlv.m Added: trunk/octave-forge/main/comm/inst/helintrlv.m =================================================================== --- trunk/octave-forge/main/comm/inst/helintrlv.m (rev 0) +++ trunk/octave-forge/main/comm/inst/helintrlv.m 2010-06-01 02:37:48 UTC (rev 7377) @@ -0,0 +1,72 @@ +## Copyright (C) 2010 Mark Borgerding <ma...@bo...> +## +## 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. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this program; if not, write to the Free Software +## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +## -*- texinfo -*- +## @deftypefn {Function File} {@var{outdata} =} helintrlv (@var{data}, @var{col}, @var{ngrp},@var{stp}) +## @var{col}-by-@var{ngrp}. +## @seealso{heldeintrlv} +## @end deftypefn + +function [outdata,outstate] = helintrlv(data,col,ngrp,stp,init_state) + + if (nargin < 4 ||nargin>5) + error('usage : interlvd = helintrlv(data,col,ngrp,stp)'); + end + + if(~isscalar(col) || ~isscalar(ngrp)) + error("col and ngrp must be integers"); + end + + if( col ~= floor(col)|| ngrp ~= floor(ngrp)) + error("col and ngrp must be integers"); + end + + didTranspose=0; + if ( isvector(data) && columns(data) > rows(data) ) + data = data.'; + didTranspose=1; + end + + s = size(data); + + if s(1) ~= col*ngrp + error("The length of data must be equals to ngrp*col"); + end + + if nargin==4 + init_state = zeros(stp*col*(col-1)/2,s(2)); + end + + outstate =[]; + # for each column + for k = 1:s(2) + tmp = reshape( data(:,k) , ngrp, col ); + instate = init_state(:,k); + outstateCol=[]; + for k1=2:col + curStepSize = (k1-1)*stp; + tmpCol= [instate(1:curStepSize) ;tmp(:,k1)]; + tmp(:,k1) = tmpCol(1:ngrp); + outstateCol=[outstateCol;tmpCol(end+1-curStepSize:end)]; + instate = instate(curStepSize+1:end); + end + outdata(:,k) = reshape(tmp.',s(1),1); + outstate = [outstate outstateCol]; + end + + if didTranspose + outdata = outdata.'; + end Added: trunk/octave-forge/main/comm/inst/helscandeintrlv.m =================================================================== --- trunk/octave-forge/main/comm/inst/helscandeintrlv.m (rev 0) +++ trunk/octave-forge/main/comm/inst/helscandeintrlv.m 2010-06-01 02:37:48 UTC (rev 7377) @@ -0,0 +1,24 @@ +## Copyright (C) 2010 Mark Borgerding <ma...@bo...> +## +## 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. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this program; if not, write to the Free Software +## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +## -*- texinfo -*- +## @deftypefn {Function File} {@var{outdata} =} helscandeintrlv (@var{data}, @var{nrows}, @var{ncols},@var{Nshift}) +## @var{nrows}-by-@var{ncols}. +## @seealso{helscandeintrlv} +## @end deftypefn + +function outdata = helscandeintrlv(data,Nrows,Ncols,Nshift) + outdata = helscanintrlv(data,Nrows,Ncols,Nrows-Nshift); Added: trunk/octave-forge/main/comm/inst/helscanintrlv.m =================================================================== --- trunk/octave-forge/main/comm/inst/helscanintrlv.m (rev 0) +++ trunk/octave-forge/main/comm/inst/helscanintrlv.m 2010-06-01 02:37:48 UTC (rev 7377) @@ -0,0 +1,62 @@ +## Copyright (C) 2010 Mark Borgerding <ma...@bo...> +## +## 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. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this program; if not, write to the Free Software +## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +## -*- texinfo -*- +## @deftypefn {Function File} {@var{outdata} =} helscanintrlv (@var{data}, @var{nrows}, @var{ncols},@var{Nshift}) +## @var{nrows}-by-@var{ncols}. +## @seealso{helscandeintrlv} +## @end deftypefn + +function outdata = helscanintrlv(data,Nrows,Ncols,Nshift) + + if(nargin ~= 4 ) + error('usage : interlvd = helscanintrlv(data,Nrows,Ncols,Nshift)'); + end + + if(~isscalar(Nrows) || ~isscalar(Ncols)) + error("Nrows and Ncols must be integers"); + end + + if( Nrows ~= floor(Nrows)|| Ncols ~= floor(Ncols)) + error("Nrows and Ncols must be integers"); + end + + didTranspose=0; + if ( isvector(data) && columns(data) > rows(data) ) + data = data.'; + didTranspose=1; + end + + s = size(data); + + if size(data,1) ~= Nrows*Ncols + error("The length of data must be equals to Ncols*Nrows"); + end + + # create the interleaving indices + idx0 = 0:Nrows*Ncols-1; + idxMod = rem(idx0,Ncols); + idxFlr = idx0 - idxMod; + inds = 1+rem(idxFlr + idxMod * Ncols * Nshift + idxMod,Nrows*Ncols); + + # for each column + for k = 1:s(2) + outdata(:,k) = data(inds,k); + end + + if didTranspose + outdata = outdata.'; + end This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |