From a9deb5c768a75c0d931057138fa47d8531d7fe46 Mon Sep 17 00:00:00 2001 From: Ed Kelly Date: Fri, 21 Sep 2007 15:02:55 +0000 Subject: This commit was generated by cvs2svn to compensate for changes in r8741, which included commits to RCS files with non-trunk default branches. svn path=/trunk/externals/ekext/; revision=8742 --- sieve/help-sieve.pd | 44 ++++++++++++++ sieve/sieve.c | 167 +++++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 190 insertions(+), 21 deletions(-) diff --git a/sieve/help-sieve.pd b/sieve/help-sieve.pd index 1e82e8a..e472628 100755 --- a/sieve/help-sieve.pd +++ b/sieve/help-sieve.pd @@ -53,6 +53,47 @@ is wrapped and the lowest or highest is chosen respectively.; #X obj 476 438 polymap; #X obj 476 417 polystat; #X obj 532 438 maskxor; +#X obj 410 181 loadbang; +#X obj 410 233 delay 50; +#N canvas 0 0 596 300 register_functions 0; +#X obj 99 208 sieve; +#X msg 99 83 map 0 1 2 4 5 6 7 9 10 11 12; +#X obj 99 47 loadbang; +#X msg 157 166 get 0; +#X msg 254 125 delete 8; +#X msg 255 167 shunt 5; +#X obj 194 166 delay 0; +#X msg 194 149 bang; +#X msg 254 241 insert 7 100; +#X msg 256 203 shift 5; +#X obj 125 269 print REGMAP; +#X floatatom 38 166 5 0 0 0 - - -; +#X floatatom 35 257 5 0 0 0 - - -; +#X msg 160 57 map 1 1 1 1 1 1 1 1 1 1 1 1; +#X text 324 124 removes an element from the array; +#X text 318 166 removes an element from the array and; +#X text 319 178 subtracts 1 from subsequent elements; +#X text 320 201 shifts elements downstream \, adding 1; +#X text 319 213 to each element \, from a specific point; +#X text 349 242 inserts an element into the array; +#X connect 0 0 12 0; +#X connect 0 2 10 0; +#X connect 1 0 0 0; +#X connect 2 0 1 0; +#X connect 3 0 0 0; +#X connect 4 0 0 0; +#X connect 4 0 7 0; +#X connect 5 0 0 0; +#X connect 5 0 7 0; +#X connect 6 0 3 0; +#X connect 7 0 6 0; +#X connect 8 0 0 0; +#X connect 8 0 7 0; +#X connect 9 0 0 0; +#X connect 9 0 7 0; +#X connect 11 0 0 0; +#X connect 13 0 0 0; +#X restore 325 298 pd register_functions; #X connect 0 0 6 0; #X connect 0 1 7 0; #X connect 0 2 8 0; @@ -77,3 +118,6 @@ is wrapped and the lowest or highest is chosen respectively.; #X connect 29 0 16 0; #X connect 29 1 17 0; #X connect 29 3 19 0; +#X connect 42 0 3 0; +#X connect 42 0 43 0; +#X connect 43 0 5 0; diff --git a/sieve/sieve.c b/sieve/sieve.c index cd6c7d5..d7ff641 100755 --- a/sieve/sieve.c +++ b/sieve/sieve.c @@ -29,8 +29,9 @@ void sieve_float(t_sieve *x, t_floatarg fin) itest = itesta = itestb = iresult = arga = argb = arg = 0; float test, testa, testb, fresult; test = testa = testb = fresult = 0; - x->input = arg = fin;// < 0 ? 0 : fin > LASTENTRY ? LASTENTRY : (int)fin; - if (x->mode == 0) + x->input = arg = fin; + if (x->mode == 0) /* only let through floats when the corresponding + index contains != 0 */ { test = fin < 0 ? 0 : atom_getfloatarg(arg, MAXENTRIES, x->x_map.map); if(test!=0) @@ -40,7 +41,8 @@ void sieve_float(t_sieve *x, t_floatarg fin) outlet_float(x->mapped, arg); } } - else if (x->mode == 1) + else if (x->mode == 1) /* find the nearest float whose (int) index is + != 0 */ { test = fin < 0 ? 0 : atom_getfloatarg(arg, MAXENTRIES, x->x_map.map); if(test!=0) @@ -66,7 +68,7 @@ void sieve_float(t_sieve *x, t_floatarg fin) } switch(itest) { - case 2: + case 2: /* if we find two at equal distance, output the higher */ if (x->mode == 1) { outlet_float(x->value, testb); @@ -87,7 +89,7 @@ void sieve_float(t_sieve *x, t_floatarg fin) } } } - else if (x->mode==2) + else if (x->mode==2) /* if the index is 0, find the next highest */ { itest = 0; test = fin < 0 ? 0 : atom_getfloatarg(arg, MAXENTRIES, x->x_map.map); @@ -113,7 +115,7 @@ void sieve_float(t_sieve *x, t_floatarg fin) } } } - else if (x->mode == 3) + else if (x->mode == 3) /* if the index is 0, find the next lowest */ { itest = 0; test = fin < 0 ? 0 : atom_getfloatarg(arg, MAXENTRIES, x->x_map.map); @@ -139,7 +141,8 @@ void sieve_float(t_sieve *x, t_floatarg fin) } } -void sieve_set(t_sieve *x, t_floatarg fmap, t_floatarg fval) +void sieve_set(t_sieve *x, t_floatarg fmap, t_floatarg fval) /* set one value + in the array */ { float fvaller; if(fmap < MAXENTRIES && fmap >= 0) @@ -152,7 +155,134 @@ void sieve_set(t_sieve *x, t_floatarg fmap, t_floatarg fval) } } -void sieve_get(t_sieve *x, t_floatarg inv) +void sieve_delete(t_sieve *x, t_floatarg loc) /* remove a value */ +{ + int addloc = (int)loc + 1; + int maxentry = (int)x->max; + int i; + float buffer; + if(locmax && loc>=0) + { + for(i=addloc;i<=maxentry;i++) + { + buffer = atom_getfloatarg(i,MAXENTRIES,x->x_map.map); + SETFLOAT(&x->x_map.map[i-1],buffer); + if(buffer!=0) + { + SETFLOAT(&x->x_map.nomap[i-1],0); + } + else + { + SETFLOAT(&x->x_map.nomap[i-1],1); + } + } + SETFLOAT(&x->x_map.map[maxentry],0); + x->max--; + } + else if(loc==x->max) + { + x->max--; + SETFLOAT(&x->x_map.map[maxentry],0); + } +} + +void sieve_shunt(t_sieve *x, t_floatarg loc) /* move down + and decrement subsequent */ +{ + int addloc = (int)loc + 1; + int maxentry = (int)x->max; + int i; + float buffer, shunt; + if(locmax && loc>=0) + { + for(i=addloc;i<=maxentry;i++) + { + buffer = atom_getfloatarg(i,MAXENTRIES,x->x_map.map); + shunt = buffer - 1; + SETFLOAT(&x->x_map.map[i-1],shunt); + if(shunt!=0) + { + SETFLOAT(&x->x_map.nomap[i-1],0); + } + else + { + SETFLOAT(&x->x_map.nomap[i-1],1); + } + } + SETFLOAT(&x->x_map.map[maxentry],0); + x->max--; + } + else if(loc==x->max) + { + x->max--; + SETFLOAT(&x->x_map.map[maxentry],0); + } +} + +void sieve_shift(t_sieve *x, t_floatarg loc) /* move up and + increment subsequent */ +{ + int location = (int)loc; + int addloc; + int maxentry = (int)x->max+1; + int i; + float buffer, shift; + if(location>=0 && maxentry < MAXENTRIES) + { + for(i=maxentry;i>=location;i--) + { + buffer = atom_getfloatarg(i-1,MAXENTRIES,x->x_map.map); + shift = buffer + 1; + SETFLOAT(&x->x_map.map[i],shift); + if(shift!=0) + { + SETFLOAT(&x->x_map.nomap[i],0); + } + else + { + SETFLOAT(&x->x_map.nomap[i],1); + } + } + x->max++; + } +} + +void sieve_insert(t_sieve *x, t_floatarg loc, t_floatarg val) +/* insert a value at specific location, moving subsequent values up */ +{ + int location = (int)loc; + int maxentry = (int)x->max+1; + int i; + float buffer; + if(loc>=0 && maxentry < MAXENTRIES) + { + for(i=maxentry;i>=location;i--) + { + buffer = atom_getfloatarg(i-1,MAXENTRIES,x->x_map.map); + SETFLOAT(&x->x_map.map[i],buffer); + if(buffer!=0) + { + SETFLOAT(&x->x_map.nomap[i],0); + } + else + { + SETFLOAT(&x->x_map.nomap[i],1); + } + } + x->max++; + SETFLOAT(&x->x_map.map[location], val); + if(val) + { + SETFLOAT(&x->x_map.nomap[location],0); + } + else + { + SETFLOAT(&x->x_map.nomap[location],1); + } + } +} + +void sieve_get(t_sieve *x, t_floatarg inv) /* outlet to map or inverse */ { if(inv!=0) { @@ -164,21 +294,17 @@ void sieve_get(t_sieve *x, t_floatarg inv) void sieve_clear(t_sieve *x) { - //memset(x->x_map.map, 0, MAXENTRIES); int i; for(i=0;ix_map.map[i], 0); SETFLOAT(&x->x_map.nomap[i], 1); } - //memset(x->x_map.nomap, 1, MAXENTRIES); x->max = 0; } -void sieve_map(t_sieve *x, t_symbol *s, int argc, t_atom *argv) +void sieve_map(t_sieve *x, t_symbol *s, int argc, t_atom *argv) /* set the whole map */ { - //memset(x->x_map.map, 0, MAXENTRIES); - //memset(x->x_map.nomap, 1, MAXENTRIES); int i; for(i=0;ix_map.nomap); nle8 = atom_getfloatarg(8, MAXENTRIES, x->x_map.nomap); nle9 = atom_getfloatarg(9, MAXENTRIES, x->x_map.nomap); - /* post("blocksize = %d, scales = %d, vectorsize = %d, offset = %d", - x->N, x->scales, x->vecsize, x->offset); */ - post("mode = %d, max = %d", x->mode, x->max); - post("first 10 elements = %d, %d, %d, %d, %d, %d, %d, %d, %d, %d", ele0, ele1, ele2, ele3, ele4, ele5, ele6, ele7, ele8, ele9); - post("first 10 elements = %d, %d, %d, %d, %d, %d, %d, %d, %d, %d", nle0, nle1, nle2, nle3, nle4, nle5, nle6, nle7, nle8, nle9); + post("mode = %f, max = %f", x->mode, x->max); + post("first 10 elements = %f, %f, %f, %f, %f, %f, %f, %f, %f, %f", ele0, ele1, ele2, ele3, ele4, ele5, ele6, ele7, ele8, ele9); + post("first 10 elements = %f, %f, %f, %f, %f, %f, %f, %f, %f, %f", nle0, nle1, nle2, nle3, nle4, nle5, nle6, nle7, nle8, nle9); } void *sieve_new(t_floatarg f) @@ -249,8 +373,6 @@ void *sieve_new(t_floatarg f) x->mode = f; x->max = 0; x->outmap = 0; - //memset(x->x_map.map, 0, MAXENTRIES); - //memset(x->x_map.nomap, 1, MAXENTRIES); int i; for(i=0;i