From a9b090ece22662138f70720e996a409296a97dce Mon Sep 17 00:00:00 2001 From: Franz Zotter Date: Tue, 22 Aug 2006 15:28:49 +0000 Subject: corrected bug in mtx_fill_col_grid and ...row..: object was not responding to third inlet without 2nd inlet. svn path=/trunk/externals/iem/iemmatrix/; revision=5710 --- abs/mtx_fill_col_grid.pd | 12 ++++++++++-- abs/mtx_fill_row_grid.pd | 44 ++++++++++++++++++++++++++------------------ 2 files changed, 36 insertions(+), 20 deletions(-) diff --git a/abs/mtx_fill_col_grid.pd b/abs/mtx_fill_col_grid.pd index 9bcca98..117e016 100644 --- a/abs/mtx_fill_col_grid.pd +++ b/abs/mtx_fill_col_grid.pd @@ -1,4 +1,4 @@ -#N canvas 597 0 516 388 10; +#N canvas 657 553 516 388 10; #X obj 70 20 inlet; #X obj 70 41 t a a; #X obj 119 87 mtx_size; @@ -29,13 +29,16 @@ #X text 291 98 fills in elements into; #X text 302 120 the given columns; #X text 331 145 of a matrix; +#X obj 139 60 spigot 0; +#X obj 200 60 t a a; +#X obj 173 40 > 0; #X connect 0 0 1 0; #X connect 1 0 2 0; #X connect 1 1 26 1; #X connect 2 0 15 0; #X connect 2 1 18 1; #X connect 3 0 5 0; -#X connect 5 0 6 1; +#X connect 5 0 31 0; #X connect 6 0 7 0; #X connect 7 0 8 0; #X connect 8 0 12 0; @@ -47,6 +50,7 @@ #X connect 12 0 26 2; #X connect 15 0 6 0; #X connect 15 1 20 0; +#X connect 15 1 32 0; #X connect 16 0 17 0; #X connect 17 0 18 0; #X connect 18 0 11 0; @@ -55,3 +59,7 @@ #X connect 21 0 10 0; #X connect 22 0 26 0; #X connect 26 0 13 0; +#X connect 30 0 6 0; +#X connect 31 0 30 0; +#X connect 31 1 6 1; +#X connect 32 0 30 1; diff --git a/abs/mtx_fill_row_grid.pd b/abs/mtx_fill_row_grid.pd index 80c96ef..c072293 100644 --- a/abs/mtx_fill_row_grid.pd +++ b/abs/mtx_fill_row_grid.pd @@ -7,36 +7,39 @@ #X text 74 3 matrix; #X obj 200 40 mtx_:; #X obj 200 78 mtx_- 1; -#X obj 184 100 mtx; -#X obj 184 120 mtx_* 1; -#X obj 184 140 mtx_repmat; -#X msg 249 118 1 \$1; +#X obj 184 141 mtx; +#X obj 184 161 mtx_* 1; +#X obj 184 181 mtx_repmat; +#X msg 249 159 1 \$1; #X obj 200 59 mtx_transpose; -#X obj 184 159 t a a; -#X obj 223 159 mtx_size; -#X obj 223 218 mtx_:; -#X obj 223 238 mtx_repmat; -#X obj 223 198 pack 1 f; -#X obj 222 178 t b f; -#X msg 262 178 \$1 1; +#X obj 184 200 t a a; +#X obj 223 200 mtx_size; +#X obj 223 259 mtx_:; +#X obj 223 279 mtx_repmat; +#X obj 223 239 pack 1 f; +#X obj 222 219 t b f; +#X msg 262 219 \$1 1; #X obj 151 81 t b f; -#X obj 184 266 mtx_+; -#X obj 9 328 outlet; +#X obj 184 307 mtx_+; +#X obj 9 369 outlet; #X text 73 -9 orig; #X obj 9 19 inlet; #X text 11 -10 fill; #X text 13 1 matrix; -#X obj 9 304 mtx_fill; -#X text 293 98 fills in elements; -#X text 302 120 into given rows; -#X text 310 142 of a matrix; +#X obj 9 345 mtx_fill; +#X text 293 139 fills in elements; +#X text 302 161 into given rows; +#X text 310 183 of a matrix; +#X obj 184 121 spigot 0; +#X obj 240 100 > 0; +#X obj 200 98 t a a; #X connect 0 0 1 0; #X connect 1 0 27 1; #X connect 1 1 2 0; #X connect 2 1 20 0; #X connect 3 0 6 0; #X connect 6 0 12 0; -#X connect 7 0 8 1; +#X connect 7 0 33 0; #X connect 8 0 9 0; #X connect 9 0 10 0; #X connect 10 0 13 0; @@ -55,6 +58,11 @@ #X connect 20 0 8 0; #X connect 20 1 11 0; #X connect 20 1 9 1; +#X connect 20 1 32 0; #X connect 21 0 27 2; #X connect 24 0 27 0; #X connect 27 0 22 0; +#X connect 31 0 8 0; +#X connect 32 0 31 1; +#X connect 33 0 31 0; +#X connect 33 1 8 1; -- cgit v1.2.1