Skip to content
Browse files

minor updates

  • Loading branch information...
1 parent 972b496 commit 8f0ae0d0806c4ac0740bf34250841d5feefdb2a5 @k7f committed Jan 27, 2012
Showing with 121 additions and 71 deletions.
  1. +8 −8 pd/fudi-io.pd
  2. +16 −4 pd/fudi-panel.pd
  3. +18 −15 pd/fudi-scenes.pd
  4. +61 −37 pd/fudi-track.pd
  5. +7 −5 pd/test-multitrack.pd
  6. +7 −0 work/om/series/series-docs.factor
  7. +4 −2 work/om/series/series.factor
View
16 pd/fudi-io.pd
@@ -1,4 +1,4 @@
-#N canvas 91 156 537 415 24;
+#N canvas 106 174 471 394 24;
#X obj 28 281 netsend;
#X msg 45 176 connect localhost 3000;
#X msg 28 227 disconnect;
@@ -11,23 +11,23 @@
#X obj 180 338 s ff>;
#X obj 236 18 r ff>;
#X obj 235 123 print ff>;
-#X obj 339 227 s start-ff;
#X obj 339 173 del 500;
#X obj 123 123 t b;
#X obj 236 70 spigot;
#X obj 330 17 r monitor;
+#X obj 339 227 s ff-init;
#X connect 0 0 6 0;
#X connect 1 0 0 0;
#X connect 2 0 0 0;
#X connect 3 0 0 0;
#X connect 4 0 5 0;
#X connect 5 0 2 0;
-#X connect 5 1 14 0;
+#X connect 5 1 13 0;
#X connect 7 0 9 0;
#X connect 7 1 8 0;
-#X connect 10 0 15 0;
+#X connect 10 0 14 0;
+#X connect 12 0 16 0;
#X connect 13 0 12 0;
-#X connect 14 0 13 0;
-#X connect 14 0 1 0;
-#X connect 15 0 11 0;
-#X connect 16 0 15 1;
+#X connect 13 0 1 0;
+#X connect 14 0 11 0;
+#X connect 15 0 14 1;
View
20 pd/fudi-panel.pd
@@ -1,12 +1,24 @@
-#N canvas 101 292 341 240 24;
-#X obj 50 30 cnv 28 130 145 empty empty \$1 100 65 1 20 -162280 -262144
+#N canvas 147 260 405 310 24;
+#X obj 50 30 cnv 28 130 145 empty \$1-bg \$1 100 65 1 20 -166441 -262144
0;
-#X obj 54 33 bng 28 250 50 0 \$1-capture! empty capture 35 12 1 20 -1
--257985 -1;
+#X obj 54 33 bng 28 250 50 0 \$1-capture! empty capture 35 12 1 20
+-1 -257985 -1;
#X obj 54 93 bng 28 250 50 0 \$1-play! empty play 35 12 1 20 -1 -257985
-1;
#X floatatom 114 124 5 0 0 3 recall #1-recall-id #1-recall;
#X floatatom 54 124 5 0 0 3 clone #1-clone-id #1-clone;
#X obj 54 63 bng 28 250 50 0 \$1-recall! empty recall 35 12 1 20 -1
-257985 -1;
+#X obj 234 256 s \$1-bg;
+#X obj 236 74 v \$1-mode;
+#X obj 236 123 sel;
+#X obj 236 24 r \$1-update!;
+#X msg 235 172 color 1;
+#X msg 269 213 color 12;
+#X connect 7 0 8 0;
+#X connect 8 0 10 0;
+#X connect 8 1 11 0;
+#X connect 9 0 7 0;
+#X connect 10 0 6 0;
+#X connect 11 0 6 0;
#X coords 0 -1 1 1 130 145 2 50 30;
View
33 pd/fudi-scenes.pd
@@ -1,4 +1,4 @@
-#N canvas 134 231 753 363 24;
+#N canvas 146 270 753 363 24;
#X obj 514 320 s >ff;
#X obj 20 319 s >ff;
#X obj 517 70 route float;
@@ -10,33 +10,36 @@
#X obj 203 175 symbol \$1;
#X obj 204 126 t b 0;
#X obj 204 227 pack s 0;
-#X obj 339 174 s ff-\$1-mode;
#X msg 338 125 0;
#X obj 517 19 r \$1-clone;
#X obj 20 19 r \$1-recall!;
#X obj 203 18 r \$1-recall;
#X obj 21 71 t b b;
-#X obj 204 72 t 0 b;
#X msg 72 274 send recall \$2-\$1 \$1;
#X msg 515 274 send clone \$2-\$1 \$1;
+#X obj 339 174 v \$1-mode;
+#X obj 204 72 t 0 b b;
+#X obj 42 127 s \$1-update!;
#X connect 2 0 4 0;
#X connect 3 0 5 0;
#X connect 4 0 3 0;
#X connect 4 1 5 1;
-#X connect 5 0 19 0;
+#X connect 5 0 17 0;
#X connect 6 0 7 0;
#X connect 7 0 1 0;
#X connect 8 0 10 0;
#X connect 9 0 8 0;
#X connect 9 1 10 1;
-#X connect 10 0 18 0;
-#X connect 12 0 11 0;
-#X connect 13 0 2 0;
-#X connect 14 0 16 0;
-#X connect 15 0 17 0;
-#X connect 16 0 6 0;
-#X connect 16 1 12 0;
-#X connect 17 0 9 0;
-#X connect 17 1 12 0;
-#X connect 18 0 1 0;
-#X connect 19 0 0 0;
+#X connect 10 0 16 0;
+#X connect 11 0 18 0;
+#X connect 12 0 2 0;
+#X connect 13 0 15 0;
+#X connect 14 0 19 0;
+#X connect 15 0 6 0;
+#X connect 15 0 20 0;
+#X connect 15 1 11 0;
+#X connect 16 0 1 0;
+#X connect 17 0 0 0;
+#X connect 19 0 9 0;
+#X connect 19 1 20 0;
+#X connect 19 2 11 0;
View
98 pd/fudi-track.pd
@@ -1,10 +1,10 @@
-#N canvas 159 230 662 481 24;
-#X obj 70 437 s >ff;
-#X obj 106 289 timer;
-#X obj 19 233 t b a;
-#X obj 482 20 r ff>;
-#X obj 344 388 qlist;
-#X msg 551 283 clear;
+#N canvas 67 172 757 526 24;
+#X obj 68 484 s >ff;
+#X obj 134 336 timer;
+#X obj 17 280 t b a;
+#X obj 580 14 r ff>;
+#X obj 442 333 qlist;
+#X msg 649 279 clear;
#N canvas 250 147 210 441 add 0;
#X obj 21 126 until;
#X obj 22 181 list append;
@@ -28,25 +28,43 @@
#X connect 7 0 8 0;
#X connect 8 0 6 0;
#X connect 9 0 7 2;
-#X restore 482 232 pd add;
-#X msg 551 331 print;
-#X obj 481 127 t l b b;
-#X obj 106 340 pack 0 0 s;
-#X obj 106 233 t b b 0 b;
-#X msg 105 387 send event \$3 \$1 \$2;
-#X obj 18 132 symbol \$1;
-#X obj 200 289 symbol \$1;
-#X obj 482 75 route \$1;
-#X obj 103 77 spigot;
-#X obj 17 77 t b b;
-#X msg 202 131 1;
-#X msg 18 182 send track \$1;
-#X obj 194 22 r \$1>>;
-#X obj 293 21 r \$1-mode;
-#X obj 202 182 s \$1-mode;
-#X obj 518 182 symbol >>\$1;
-#X obj 18 23 r \$1-capture!;
-#X obj 343 76 r \$1-play!;
+#X restore 580 228 pd add;
+#X msg 520 332 print;
+#X obj 579 123 t l b b;
+#X obj 134 387 pack 0 0 s;
+#X obj 134 280 t b b 0 b;
+#X msg 133 434 send event \$3 \$1 \$2;
+#X obj 16 126 symbol \$1;
+#X obj 228 336 symbol \$1;
+#X obj 580 70 route \$1;
+#X obj 135 178 spigot;
+#X msg 17 231 send track \$1;
+#X obj 192 16 r \$1>>;
+#X obj 616 177 symbol >>\$1;
+#X obj 16 17 r \$1-capture!;
+#X obj 441 15 r \$1-play!;
+#X obj 184 124 v \$1-mode;
+#X obj 134 70 t 0 b;
+#X obj 297 233 spigot;
+#X obj 298 70 t b b;
+#X obj 359 124 v \$1-mode;
+#N canvas 123 174 248 366 update 0;
+#X obj 22 20 inlet;
+#X msg 115 124 1;
+#X obj 115 173 v \$1-mode;
+#X obj 84 220 s \$1-update!;
+#X obj 21 74 t b b b b;
+#X obj 22 322 outlet;
+#X obj 51 272 s ff-play!;
+#X connect 0 0 4 0;
+#X connect 1 0 2 0;
+#X connect 4 0 5 0;
+#X connect 4 1 6 0;
+#X connect 4 2 3 0;
+#X connect 4 3 1 0;
+#X restore 16 71 pd update;
+#X obj 360 177 ==;
+#X obj 298 16 r ff-play!;
#X connect 1 0 9 0;
#X connect 2 0 1 0;
#X connect 2 1 0 0;
@@ -55,24 +73,30 @@
#X connect 6 0 4 0;
#X connect 7 0 4 0;
#X connect 8 0 6 0;
-#X connect 8 1 22 0;
+#X connect 8 1 18 0;
#X connect 8 2 5 0;
#X connect 9 0 11 0;
#X connect 10 0 1 0;
#X connect 10 1 1 1;
#X connect 10 2 9 1;
#X connect 10 3 13 0;
#X connect 11 0 0 0;
-#X connect 12 0 18 0;
+#X connect 12 0 16 0;
#X connect 13 0 9 2;
#X connect 14 0 8 0;
#X connect 15 0 10 0;
-#X connect 16 0 12 0;
-#X connect 16 1 17 0;
-#X connect 17 0 21 0;
-#X connect 18 0 2 0;
-#X connect 19 0 15 0;
-#X connect 20 0 15 1;
-#X connect 22 0 6 1;
-#X connect 23 0 16 0;
-#X connect 24 0 4 0;
+#X connect 16 0 2 0;
+#X connect 17 0 22 0;
+#X connect 18 0 6 1;
+#X connect 19 0 26 0;
+#X connect 20 0 4 0;
+#X connect 21 0 15 1;
+#X connect 22 0 15 0;
+#X connect 22 1 21 0;
+#X connect 23 0 4 0;
+#X connect 24 0 23 0;
+#X connect 24 1 25 0;
+#X connect 25 0 27 0;
+#X connect 26 0 12 0;
+#X connect 27 0 23 1;
+#X connect 28 0 24 0;
View
12 pd/test-multitrack.pd
@@ -1,12 +1,12 @@
-#N canvas 150 498 964 223 24;
+#N canvas 109 484 964 223 24;
#X floatatom 15 124 5 0 0 0 - - -;
#X floatatom 88 124 5 0 0 0 - - -;
-#X obj 16 17 tgl 28 0 empty empty empty 17 7 0 10 -262144 -1 -1 0 1
-;
+#X obj 16 17 tgl 28 0 empty empty connect 35 12 1 20 -262144 -1 -1
+0 1;
#X floatatom 705 167 5 0 0 0 - - -;
#X obj 705 17 vsl 55 140 0 127 0 0 p1>> >>p1 empty -2 -8 0 10 -262144
-1 -1 0 0;
-#N canvas 100 202 331 228 tracks 0;
+#N canvas 110 258 331 228 tracks 0;
#X obj 35 31 fudi-track p1;
#X obj 35 75 fudi-track p2;
#X obj 34 116 fudi-track q1;
@@ -22,7 +22,7 @@
#X connect 0 0 2 0;
#X connect 2 0 1 0;
#X restore 19 178 pd init;
-#N canvas 97 135 321 228 scenes 0;
+#N canvas 102 163 321 228 scenes 0;
#X obj 33 32 fudi-scenes p1;
#X obj 33 77 fudi-scenes p2;
#X obj 31 123 fudi-scenes q1;
@@ -46,6 +46,8 @@
#X obj 888 17 vsl 55 140 0 127 0 0 q2>> >>q2 empty -2 -8 0 10 -262144
-1 -1 0 0;
#X obj 15 71 fudi-io;
+#X obj 541 178 bng 28 250 50 0 ff-play! empty play_all 35 12 1 20 -1
+-257985 -1;
#X connect 2 0 19 0;
#X connect 4 0 3 0;
#X connect 14 0 13 0;
View
7 work/om/series/series-docs.factor
@@ -78,6 +78,13 @@ HELP: prime-ser
$nl
"The optional parametre " { $snippet "numelem" } " limits the number of elements." } ;
+HELP: prime-factors
+{ $values
+ { "num" number }
+ { "seq" sequence }
+}
+{ $description "Returns the prime decomposition of " { $snippet "number" } " in the form " { $snippet "{ ... { prime exponent } ... }" } "." } ;
+
HELP: inharm-ser
{ $values
{ "start" number }
View
6 work/om/series/series.factor
@@ -2,8 +2,8 @@
! See http://factorcode.org/license.txt for BSD license.
USING: arrays classes ff.errors fry kernel layouts locals macros make
- math math.functions math.order math.primes math.ranges om.support
- prettyprint quotations sequences ;
+ math math.functions math.order math.primes math.primes.factors
+ math.ranges om.support prettyprint quotations sequences ;
IN: om.series
! _____________________________________
@@ -119,6 +119,8 @@ PRIVATE>
: prime-ser ( max-value &optionals -- seq )
unpack1 [ 2 -rot (prime-ser) ] [ primes-upto { } like ] if* ;
+ALIAS: prime-factors group-factors
+
! __________
! inharm-ser

0 comments on commit 8f0ae0d

Please sign in to comment.
Something went wrong with that request. Please try again.