From 9b768ee48c7388f491842fc895dc613fa3076064 Mon Sep 17 00:00:00 2001 From: "N.N." Date: Sat, 7 Jan 2006 06:57:12 +0000 Subject: using [list append] svn path=/trunk/abstractions/pureunity/; revision=4367 --- generics/associative-test.pd | 32 +++++++++++++------------------ generics/commutative-test.pd | 44 +++++++++++++++++++------------------------ generics/distributive-test.pd | 35 ++++++++++++++-------------------- generics/invertible-test.pd | 31 ++++++++++++------------------ 4 files changed, 58 insertions(+), 84 deletions(-) diff --git a/generics/associative-test.pd b/generics/associative-test.pd index 4e33596..1994c4e 100644 --- a/generics/associative-test.pd +++ b/generics/associative-test.pd @@ -7,32 +7,26 @@ #X text 167 9 This test verifies that (1+2)+3=1+(2+3); #X msg 40 34 1 2 3; #X obj 40 74 unpack 0 0 0; -#X obj 40 236 outlet; -#X obj 104 155 loadbang; -#X obj 104 193 unpack s s s; -#X obj 40 217 pack 0 0 -1 s s s; -#X obj 104 174 3times symbol associative \$1 \$2; +#X obj 40 245 outlet; #X obj 40 131 * 2; #X obj 40 112 \$1.norm; #X obj 147 112 \$1.norm; #X obj 40 93 associator \$1 \$2; +#X obj 40 226 list append associative \$1 \$2; +#X obj 40 207 pack 0 0 -1; #X connect 0 0 6 0; #X connect 1 0 2 0; #X connect 2 0 4 0; -#X connect 2 1 11 1; -#X connect 4 0 11 0; +#X connect 2 1 14 1; +#X connect 4 0 14 0; #X connect 6 0 7 0; -#X connect 7 0 16 0; -#X connect 7 1 16 1; -#X connect 7 2 16 2; -#X connect 9 0 12 0; -#X connect 10 0 11 3; -#X connect 10 1 11 4; -#X connect 10 2 11 5; -#X connect 11 0 8 0; +#X connect 7 0 12 0; +#X connect 7 1 12 1; +#X connect 7 2 12 2; +#X connect 9 0 1 0; +#X connect 10 0 9 0; +#X connect 11 0 1 1; #X connect 12 0 10 0; -#X connect 13 0 1 0; +#X connect 12 1 11 0; +#X connect 13 0 8 0; #X connect 14 0 13 0; -#X connect 15 0 1 1; -#X connect 16 0 14 0; -#X connect 16 1 15 0; diff --git a/generics/commutative-test.pd b/generics/commutative-test.pd index 3787276..ec67417 100644 --- a/generics/commutative-test.pd +++ b/generics/commutative-test.pd @@ -5,14 +5,10 @@ #X msg 40 34 1 3; #X text 216 9 This test verifies that 1+3=3+1; #X obj 101 202 t a a; -#X obj 101 284 outlet; +#X obj 101 278 outlet; #X text 217 44 with tolerance 0; #X obj 101 221 <= 0; #X text 218 23 and 1*3=3*1 and...; -#X obj 165 188 loadbang; -#X obj 165 207 3times symbol commutative \$1 \$2; -#X obj 165 226 unpack s s s; -#X obj 101 250 pack 0 0 -1 s s s; #X obj 101 164 * 2; #X obj 101 145 \$1.norm; #X obj 208 145 \$1.norm; @@ -20,26 +16,24 @@ #X obj 41 53 t b l b; #X obj 43 95 rtimer; #X floatatom 44 125 5 0 0 0 - - -; +#X obj 101 259 list append commutative \$1 \$2; +#X obj 101 240 pack 0 0 -1; #X connect 0 0 3 0; -#X connect 1 0 17 0; -#X connect 1 1 17 1; +#X connect 1 0 13 0; +#X connect 1 1 13 1; #X connect 2 0 5 0; -#X connect 3 0 18 0; +#X connect 3 0 14 0; #X connect 5 0 8 0; -#X connect 5 1 13 1; -#X connect 8 0 13 0; -#X connect 10 0 11 0; -#X connect 11 0 12 0; -#X connect 12 0 13 3; -#X connect 12 1 13 4; -#X connect 12 2 13 5; -#X connect 13 0 6 0; -#X connect 14 0 2 0; -#X connect 15 0 14 0; -#X connect 16 0 2 1; -#X connect 17 0 15 0; -#X connect 17 1 16 0; -#X connect 18 0 19 1; -#X connect 18 1 1 0; -#X connect 18 2 19 0; -#X connect 19 0 20 0; +#X connect 5 1 18 1; +#X connect 8 0 18 0; +#X connect 10 0 2 0; +#X connect 11 0 10 0; +#X connect 12 0 2 1; +#X connect 13 0 11 0; +#X connect 13 1 12 0; +#X connect 14 0 15 1; +#X connect 14 1 1 0; +#X connect 14 2 15 0; +#X connect 15 0 16 0; +#X connect 17 0 6 0; +#X connect 18 0 17 0; diff --git a/generics/distributive-test.pd b/generics/distributive-test.pd index 96d5407..8f6692a 100644 --- a/generics/distributive-test.pd +++ b/generics/distributive-test.pd @@ -7,33 +7,26 @@ #X text 156 9 This test verifies that 3*(4+5)=3*4+3*5; #X msg 40 34 3 4 5; #X obj 40 82 unpack 0 0 0; -#X obj 37 236 outlet; -#X obj 101 155 loadbang; -#X obj 101 174 4times symbol distributive \$1 \$2 \$3; -#X obj 101 193 unpack s s s s; -#X obj 37 217 pack 0 0 -1 s s s s; +#X obj 37 255 outlet; #X obj 37 141 * 2; #X obj 37 122 \$1.norm; #X obj 172 122 \$1.norm; #X obj 37 103 distributor \$1 \$2 \$3; +#X obj 37 236 list append distributive \$1 \$2 \$3; +#X obj 37 217 pack 0 0 -1; #X connect 0 0 6 0; #X connect 1 0 2 0; #X connect 2 0 4 0; -#X connect 2 1 12 1; -#X connect 4 0 12 0; +#X connect 2 1 14 1; +#X connect 4 0 14 0; #X connect 6 0 7 0; -#X connect 7 0 16 0; -#X connect 7 1 16 1; -#X connect 7 2 16 2; -#X connect 9 0 10 0; -#X connect 10 0 11 0; -#X connect 11 0 12 3; -#X connect 11 1 12 4; -#X connect 11 2 12 5; -#X connect 11 3 12 6; -#X connect 12 0 8 0; -#X connect 13 0 1 0; +#X connect 7 0 12 0; +#X connect 7 1 12 1; +#X connect 7 2 12 2; +#X connect 9 0 1 0; +#X connect 10 0 9 0; +#X connect 11 0 1 1; +#X connect 12 0 10 0; +#X connect 12 1 11 0; +#X connect 13 0 8 0; #X connect 14 0 13 0; -#X connect 15 0 1 1; -#X connect 16 0 14 0; -#X connect 16 1 15 0; diff --git a/generics/invertible-test.pd b/generics/invertible-test.pd index 8702743..d08abe9 100644 --- a/generics/invertible-test.pd +++ b/generics/invertible-test.pd @@ -7,32 +7,25 @@ #X text 217 24 with tolerance 0; #X obj 33 198 <= 0; #X text 215 9 This test verifies that 1+3-3=1; -#X obj 33 236 outlet; -#X obj 97 155 loadbang; -#X obj 97 193 unpack s s s s; -#X obj 33 217 pack 0 0 -1 s s s s; -#X obj 97 174 4times symbol invertible \$1 \$2 \$3; +#X obj 33 255 outlet; #X obj 33 141 * 2; #X obj 33 122 \$1.norm; #X obj 147 123 \$1.norm; #X obj 33 103 invertor \$1 \$2 \$3; +#X obj 33 236 list append invertible \$1 \$2 \$3; +#X obj 33 217 pack 0 0 -1; #X connect 0 0 3 0; -#X connect 1 0 16 0; -#X connect 1 1 16 1; +#X connect 1 0 12 0; +#X connect 1 1 12 1; #X connect 2 0 4 0; #X connect 3 0 1 0; #X connect 4 0 6 0; -#X connect 4 1 11 1; -#X connect 6 0 11 0; -#X connect 9 0 12 0; -#X connect 10 0 11 3; -#X connect 10 1 11 4; -#X connect 10 2 11 5; -#X connect 10 3 11 6; -#X connect 11 0 8 0; +#X connect 4 1 14 1; +#X connect 6 0 14 0; +#X connect 9 0 2 0; +#X connect 10 0 9 0; +#X connect 11 0 2 1; #X connect 12 0 10 0; -#X connect 13 0 2 0; +#X connect 12 1 11 0; +#X connect 13 0 8 0; #X connect 14 0 13 0; -#X connect 15 0 2 1; -#X connect 16 0 14 0; -#X connect 16 1 15 0; -- cgit v1.2.1