[Gridflow-cvs] [svn] commit: r6560 - in /trunk/tests: #expr-test.pd is.pd

svn-gridflow at artengine.ca svn-gridflow at artengine.ca
Sat Feb 5 21:33:12 EST 2011


Author: matju
Date: Sat Feb  5 21:33:10 2011
New Revision: 6560

Log:
add abstraction [is]

Added:
    trunk/tests/is.pd
Modified:
    trunk/tests/#expr-test.pd

Modified: trunk/tests/#expr-test.pd
==============================================================================
--- trunk/tests/#expr-test.pd (original)
+++ trunk/tests/#expr-test.pd Sat Feb  5 21:33:10 2011
@@ -1,276 +1,261 @@
-#N canvas 615 0 620 693 10;
-#X obj 57 11 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
--1;
-#X obj 57 47 display;
-#X obj 57 28 #expr 2+2;
-#X obj 309 11 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
--1;
-#X obj 309 47 display;
-#X obj 309 28 #expr 5+5*12+12;
-#X text 79 47 4;
-#X text 212 47 889;
-#X obj 117 11 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
--1;
-#X obj 117 47 display;
-#X text 139 47 4;
-#X obj 117 28 #expr (2+2);
-#X text 332 47 77;
-#X obj 405 10 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
--1;
-#X obj 405 46 display;
-#X text 428 46 169;
-#X obj 405 27 #expr 5*5+12*12;
-#X obj 9 81 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
--1;
-#X obj 9 98 #expr 73%15;
-#X obj 9 117 display;
-#X obj 81 80 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
--1;
-#X obj 81 116 display;
-#X obj 81 97 #expr 0x5555 | 0xAAAA;
-#X text 35 117 13;
-#X text 117 116 65535;
-#X obj 213 80 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
--1;
-#X obj 213 116 display;
-#X obj 213 97 #expr 4<5;
-#X obj 273 79 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
--1;
-#X obj 273 115 display;
-#X obj 273 96 #expr 4<<5;
-#X obj 339 79 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
--1;
-#X obj 339 115 display;
-#X obj 339 96 #expr 0||3;
-#X obj 407 146 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
--1 -1;
-#X obj 407 182 display;
-#X obj 9 11 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
--1;
-#X obj 9 28 #expr 2;
-#X obj 7 293 display;
-#X obj 9 47 display;
-#X text 236 116 1;
-#X text 308 115 128;
-#X text 368 115 3;
-#X obj 189 11 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
--1;
-#X obj 189 47 display;
-#X obj 189 28 #expr 1000-100-10-1;
-#X obj 405 78 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
--1;
-#X obj 405 114 display;
-#X obj 405 95 #expr 42!=43;
-#X obj 9 146 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
--1;
-#X obj 9 182 display;
-#X obj 9 163 #expr -5+3;
-#X text 29 182 -2;
-#X obj 75 145 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
--1;
-#X obj 75 181 display;
-#X obj 75 162 #expr + + + 4;
-#X text 105 181 4;
-#X obj 159 145 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
--1 -1;
-#X obj 159 181 display;
-#X obj 159 162 #expr - - + - - + - 4;
-#X text 189 181 -4;
-#X obj 299 147 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
--1 -1;
-#X obj 299 183 display;
-#X obj 299 164 #expr ~9;
-#X obj 353 147 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
--1 -1;
-#X obj 353 183 display;
-#X obj 353 164 #expr !0;
-#X obj 407 163 #expr -14%13.51;
-#X obj 501 26 #expr 2 \; 3 \; 5 \; 7;
-#X obj 501 106 print;
-#X obj 501 9 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
--1;
-#X obj 7 240 unpack 0 0 0 0 0;
-#X msg 7 221 \$1 3 5 7 11;
-#X floatatom 7 203 5 0 0 0 - - -;
-#X obj 7 274 #expr $f4+($f5-$f4)*($f1-$f2)/($f3-$f2);
-#X floatatom 460 215 5 0 0 0 - - -;
-#X obj 460 252 display;
-#X text 327 182 -10;
-#X text 379 182 1;
-#X obj 460 233 #expr log($f1*3);
-#X obj 458 294 #expr weight($f1);
-#X floatatom 458 276 5 0 0 0 - - -;
-#X obj 458 313 display;
-#X floatatom 359 216 5 0 0 0 - - -;
-#X obj 359 253 display;
-#X obj 359 234 #expr tanh($f1);
-#X floatatom 259 216 5 0 0 0 - - -;
-#X obj 259 253 display;
-#X obj 259 234 #expr sqrt($f1);
+#N canvas 615 0 909 746 10;
+#X obj 57 88 #expr 2+2;
+#X obj 309 88 #expr 5+5*12+12;
+#X obj 117 88 #expr (2+2);
+#X obj 405 87 #expr 5*5+12*12;
+#X obj 9 141 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
+-1;
+#X obj 9 158 #expr 73%15;
+#X obj 9 177 display;
+#X obj 81 140 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
+-1;
+#X obj 81 176 display;
+#X obj 81 157 #expr 0x5555 | 0xAAAA;
+#X text 35 177 13;
+#X text 117 176 65535;
+#X obj 213 140 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
+-1 -1;
+#X obj 213 176 display;
+#X obj 213 157 #expr 4<5;
+#X obj 273 139 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
+-1 -1;
+#X obj 273 175 display;
+#X obj 273 156 #expr 4<<5;
+#X obj 339 139 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
+-1 -1;
+#X obj 339 175 display;
+#X obj 339 156 #expr 0||3;
+#X obj 407 206 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
+-1 -1;
+#X obj 407 242 display;
+#X obj 9 88 #expr 2;
+#X obj 7 353 display;
+#X text 236 176 1;
+#X text 308 175 128;
+#X text 368 175 3;
+#X obj 189 88 #expr 1000-100-10-1;
+#X obj 405 138 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
+-1 -1;
+#X obj 405 174 display;
+#X obj 405 155 #expr 42!=43;
+#X obj 9 206 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
+-1;
+#X obj 9 242 display;
+#X obj 9 223 #expr -5+3;
+#X text 29 242 -2;
+#X obj 75 205 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
+-1;
+#X obj 75 241 display;
+#X obj 75 222 #expr + + + 4;
+#X text 105 241 4;
+#X obj 159 205 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
+-1 -1;
+#X obj 159 241 display;
+#X obj 159 222 #expr - - + - - + - 4;
+#X text 189 241 -4;
+#X obj 299 207 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
+-1 -1;
+#X obj 299 243 display;
+#X obj 299 224 #expr ~9;
+#X obj 353 207 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
+-1 -1;
+#X obj 353 243 display;
+#X obj 353 224 #expr !0;
+#X obj 407 223 #expr -14%13.51;
+#X obj 691 326 #expr 2 \; 3 \; 5 \; 7;
+#X obj 691 406 print;
+#X obj 691 309 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
+-1 -1;
+#X obj 7 300 unpack 0 0 0 0 0;
+#X msg 7 281 \$1 3 5 7 11;
+#X floatatom 7 263 5 0 0 0 - - -;
+#X obj 7 334 #expr $f4+($f5-$f4)*($f1-$f2)/($f3-$f2);
+#X floatatom 460 275 5 0 0 0 - - -;
+#X obj 460 312 display;
+#X text 327 242 -10;
+#X text 379 242 1;
+#X obj 460 293 #expr log($f1*3);
+#X obj 458 354 #expr weight($f1);
+#X floatatom 458 336 5 0 0 0 - - -;
+#X obj 458 373 display;
+#X floatatom 359 276 5 0 0 0 - - -;
+#X obj 359 313 display;
+#X obj 359 294 #expr tanh($f1);
 #X floatatom 259 276 5 0 0 0 - - -;
 #X obj 259 313 display;
-#X obj 259 294 #expr abs($f1);
-#X floatatom 362 276 5 0 0 0 - - -;
-#X obj 362 313 display;
-#X obj 362 294 #expr rand($f1);
-#X obj 187 511 ../doc/numop;
-#X obj 11 350 expr a+b*c;
-#X obj 11 333 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
--1;
-#X floatatom 11 369 5 0 0 0 - - -;
-#X obj 124 418 v a;
-#X obj 149 418 v b;
-#X obj 175 418 v c;
-#X floatatom 175 400 5 0 0 0 - - -;
-#X floatatom 149 382 5 0 0 0 - - -;
-#X floatatom 124 364 5 0 0 0 - - -;
-#X floatatom 581 332 5 0 0 0 - - -;
-#X floatatom 458 332 5 0 0 0 - - -;
-#X obj 458 369 display;
-#X obj 62 454 #expr 1 \, 2 \, 3 \; 4 \; 5 \, 6 \; 7 \, 8 \, 9;
-#X text 67 436 yark;
-#X obj 143 515 print;
-#X obj 45 454 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
--1;
-#X obj 458 350 #expr atan2($f1 \, $f2);
-#X obj 341 351 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
--1 -1;
-#X obj 358 369 print;
-#X floatatom 358 332 5 0 0 0 - - -;
-#X obj 124 319 #expr 37 \; 42 \; 69;
-#X obj 124 300 loadbang;
-#X obj 107 300 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
--1 -1;
-#X obj 27 387 #expr a+b*c;
-#X floatatom 27 406 5 0 0 0 - - -;
-#X floatatom 288 439 5 0 0 0 - - -;
-#X obj 288 403 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
--1 -1;
-#X obj 288 420 #expr (1 \, 2);
-#X text 434 114 1;
-#X obj 366 402 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
--1 -1;
-#X floatatom 366 439 5 0 0 0 - - -;
-#X obj 467 480 table foo 10;
-#X obj 413 480 loadbang;
-#X msg 413 499 0 2 3 5 7 11 13 17 19 23 29;
-#X obj 413 518 s foo;
-#X obj 366 420 #expr foo[$f1];
-#X floatatom 385 401 5 0 0 0 - - -;
-#X floatatom 288 494 5 0 0 0 - - -;
-#X obj 288 458 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
--1 -1;
-#X obj 288 475 #expr 1 \, 2;
-#X obj 358 350 #expr max(1 \, 3);
-#X obj 272 643 #expr tan($f1);
-#X obj 246 556 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
--1 -1;
-#X obj 244 598 display;
-#X obj 247 575 #expr grumble+2;
-#X obj 105 555 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
--1 -1;
-#X obj 105 594 display;
-#X obj 414 539 table grumble 444;
-#X obj 105 575 expr size("grumble");
-#X obj 415 588 #expr log10($f1);
-#X floatatom 415 569 8 0 0 0 - - -;
-#X floatatom 418 612 8 0 0 0 - - -;
-#X connect 0 0 2 0;
-#X connect 2 0 1 0;
-#X connect 3 0 5 0;
-#X connect 5 0 4 0;
-#X connect 8 0 11 0;
-#X connect 11 0 9 0;
-#X connect 13 0 16 0;
-#X connect 16 0 14 0;
-#X connect 17 0 18 0;
-#X connect 18 0 19 0;
-#X connect 20 0 22 0;
-#X connect 22 0 21 0;
-#X connect 25 0 27 0;
-#X connect 27 0 26 0;
-#X connect 28 0 30 0;
-#X connect 30 0 29 0;
-#X connect 31 0 33 0;
-#X connect 33 0 32 0;
-#X connect 34 0 67 0;
-#X connect 36 0 37 0;
-#X connect 37 0 39 0;
-#X connect 43 0 45 0;
-#X connect 45 0 44 0;
-#X connect 46 0 48 0;
-#X connect 48 0 47 0;
-#X connect 49 0 51 0;
-#X connect 51 0 50 0;
-#X connect 53 0 55 0;
+#X obj 259 294 #expr sqrt($f1);
+#X floatatom 259 336 5 0 0 0 - - -;
+#X obj 259 373 display;
+#X obj 259 354 #expr abs($f1);
+#X floatatom 362 336 5 0 0 0 - - -;
+#X obj 362 373 display;
+#X obj 362 354 #expr rand($f1);
+#X obj 187 571 ../doc/numop;
+#X obj 11 410 expr a+b*c;
+#X obj 11 393 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
+-1;
+#X floatatom 11 429 5 0 0 0 - - -;
+#X obj 124 478 v a;
+#X obj 149 478 v b;
+#X obj 175 478 v c;
+#X floatatom 175 460 5 0 0 0 - - -;
+#X floatatom 149 442 5 0 0 0 - - -;
+#X floatatom 124 424 5 0 0 0 - - -;
+#X floatatom 581 392 5 0 0 0 - - -;
+#X floatatom 458 392 5 0 0 0 - - -;
+#X obj 458 429 display;
+#X obj 62 514 #expr 1 \, 2 \, 3 \; 4 \; 5 \, 6 \; 7 \, 8 \, 9;
+#X text 67 496 yark;
+#X obj 143 575 print;
+#X obj 45 514 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
+-1;
+#X obj 458 410 #expr atan2($f1 \, $f2);
+#X obj 341 411 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
+-1 -1;
+#X obj 358 429 print;
+#X floatatom 358 392 5 0 0 0 - - -;
+#X obj 124 379 #expr 37 \; 42 \; 69;
+#X obj 124 360 loadbang;
+#X obj 107 360 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
+-1 -1;
+#X obj 27 447 #expr a+b*c;
+#X floatatom 27 466 5 0 0 0 - - -;
+#X floatatom 288 499 5 0 0 0 - - -;
+#X obj 288 463 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
+-1 -1;
+#X obj 288 480 #expr (1 \, 2);
+#X text 434 174 1;
+#X obj 366 462 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
+-1 -1;
+#X floatatom 366 499 5 0 0 0 - - -;
+#X obj 467 540 table foo 10;
+#X obj 413 540 loadbang;
+#X msg 413 559 0 2 3 5 7 11 13 17 19 23 29;
+#X obj 413 578 s foo;
+#X obj 366 480 #expr foo[$f1];
+#X floatatom 385 461 5 0 0 0 - - -;
+#X floatatom 288 554 5 0 0 0 - - -;
+#X obj 288 518 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
+-1 -1;
+#X obj 288 535 #expr 1 \, 2;
+#X obj 358 410 #expr max(1 \, 3);
+#X obj 272 703 #expr tan($f1);
+#X obj 246 616 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
+-1 -1;
+#X obj 244 658 display;
+#X obj 247 635 #expr grumble+2;
+#X obj 105 615 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
+-1 -1;
+#X obj 105 654 display;
+#X obj 414 599 table grumble 444;
+#X obj 105 635 expr size("grumble");
+#X obj 415 648 #expr log10($f1);
+#X floatatom 415 629 8 0 0 0 - - -;
+#X floatatom 418 672 8 0 0 0 - - -;
+#X obj 9 107 is 2;
+#X obj 9 71 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
+-1;
+#X obj 57 107 is 4;
+#X obj 117 107 is 4;
+#X obj 189 107 is 889;
+#X obj 309 107 is 77;
+#X obj 405 106 is 169;
+#X connect 0 0 133 0;
+#X connect 1 0 136 0;
+#X connect 2 0 134 0;
+#X connect 3 0 137 0;
+#X connect 4 0 5 0;
+#X connect 5 0 6 0;
+#X connect 7 0 9 0;
+#X connect 9 0 8 0;
+#X connect 12 0 14 0;
+#X connect 14 0 13 0;
+#X connect 15 0 17 0;
+#X connect 17 0 16 0;
+#X connect 18 0 20 0;
+#X connect 20 0 19 0;
+#X connect 21 0 50 0;
+#X connect 23 0 131 0;
+#X connect 28 0 135 0;
+#X connect 29 0 31 0;
+#X connect 31 0 30 0;
+#X connect 32 0 34 0;
+#X connect 34 0 33 0;
+#X connect 36 0 38 0;
+#X connect 38 0 37 0;
+#X connect 40 0 42 0;
+#X connect 42 0 41 0;
+#X connect 44 0 46 0;
+#X connect 46 0 45 0;
+#X connect 47 0 49 0;
+#X connect 49 0 48 0;
+#X connect 50 0 22 0;
+#X connect 51 0 52 0;
+#X connect 51 1 52 0;
+#X connect 51 2 52 0;
+#X connect 51 3 52 0;
+#X connect 53 0 51 0;
+#X connect 54 0 57 0;
+#X connect 54 1 57 1;
+#X connect 54 2 57 2;
+#X connect 54 3 57 3;
+#X connect 54 4 57 4;
 #X connect 55 0 54 0;
-#X connect 57 0 59 0;
-#X connect 59 0 58 0;
-#X connect 61 0 63 0;
-#X connect 63 0 62 0;
-#X connect 64 0 66 0;
-#X connect 66 0 65 0;
-#X connect 67 0 35 0;
-#X connect 68 0 69 0;
-#X connect 68 1 69 0;
-#X connect 68 2 69 0;
-#X connect 68 3 69 0;
-#X connect 70 0 68 0;
-#X connect 71 0 74 0;
-#X connect 71 1 74 1;
-#X connect 71 2 74 2;
-#X connect 71 3 74 3;
-#X connect 71 4 74 4;
-#X connect 72 0 71 0;
-#X connect 73 0 72 0;
-#X connect 74 0 38 0;
-#X connect 75 0 79 0;
-#X connect 79 0 76 0;
-#X connect 80 0 82 0;
-#X connect 81 0 80 0;
-#X connect 83 0 85 0;
+#X connect 56 0 55 0;
+#X connect 57 0 24 0;
+#X connect 58 0 62 0;
+#X connect 62 0 59 0;
+#X connect 63 0 65 0;
+#X connect 64 0 63 0;
+#X connect 66 0 68 0;
+#X connect 68 0 67 0;
+#X connect 69 0 71 0;
+#X connect 71 0 70 0;
+#X connect 72 0 74 0;
+#X connect 74 0 73 0;
+#X connect 75 0 77 0;
+#X connect 77 0 76 0;
+#X connect 79 0 81 0;
+#X connect 80 0 79 0;
+#X connect 80 0 102 0;
 #X connect 85 0 84 0;
-#X connect 86 0 88 0;
-#X connect 88 0 87 0;
-#X connect 89 0 91 0;
-#X connect 91 0 90 0;
-#X connect 92 0 94 0;
-#X connect 94 0 93 0;
-#X connect 96 0 98 0;
-#X connect 97 0 96 0;
-#X connect 97 0 119 0;
-#X connect 102 0 101 0;
-#X connect 103 0 100 0;
-#X connect 104 0 99 0;
-#X connect 105 0 112 1;
-#X connect 106 0 112 0;
-#X connect 108 0 110 0;
-#X connect 108 1 110 0;
-#X connect 108 2 110 0;
-#X connect 108 3 110 0;
-#X connect 111 0 108 0;
-#X connect 112 0 107 0;
-#X connect 113 0 136 0;
-#X connect 115 0 136 0;
-#X connect 116 0 104 0;
-#X connect 116 1 103 0;
-#X connect 116 2 102 0;
-#X connect 117 0 116 0;
+#X connect 86 0 83 0;
+#X connect 87 0 82 0;
+#X connect 88 0 95 1;
+#X connect 89 0 95 0;
+#X connect 91 0 93 0;
+#X connect 91 1 93 0;
+#X connect 91 2 93 0;
+#X connect 91 3 93 0;
+#X connect 94 0 91 0;
+#X connect 95 0 90 0;
+#X connect 96 0 119 0;
+#X connect 98 0 119 0;
+#X connect 99 0 87 0;
+#X connect 99 1 86 0;
+#X connect 99 2 85 0;
+#X connect 100 0 99 0;
+#X connect 101 0 99 0;
+#X connect 102 0 103 0;
+#X connect 105 0 106 0;
+#X connect 106 0 104 0;
+#X connect 108 0 114 0;
+#X connect 111 0 112 0;
+#X connect 112 0 113 0;
+#X connect 114 0 109 0;
+#X connect 115 0 114 0;
+#X connect 117 0 118 0;
 #X connect 118 0 116 0;
-#X connect 119 0 120 0;
-#X connect 122 0 123 0;
-#X connect 123 0 121 0;
-#X connect 125 0 131 0;
-#X connect 128 0 129 0;
-#X connect 129 0 130 0;
-#X connect 131 0 126 0;
-#X connect 132 0 131 0;
-#X connect 134 0 135 0;
-#X connect 135 0 133 0;
-#X connect 136 0 114 0;
-#X connect 138 0 140 0;
-#X connect 140 0 139 0;
-#X connect 141 0 144 0;
-#X connect 144 0 142 0;
-#X connect 145 0 147 0;
-#X connect 146 0 145 0;
+#X connect 119 0 97 0;
+#X connect 121 0 123 0;
+#X connect 123 0 122 0;
+#X connect 124 0 127 0;
+#X connect 127 0 125 0;
+#X connect 128 0 130 0;
+#X connect 129 0 128 0;
+#X connect 131 1 0 0;
+#X connect 132 0 23 0;
+#X connect 133 1 2 0;
+#X connect 134 1 28 0;
+#X connect 135 1 1 0;
+#X connect 136 1 3 0;



More information about the Gridflow-cvs mailing list