1 files changed, 46 insertions, 110 deletions

diff --git a/gfsm/src/gfsm_markov.pd b/gfsm/src/gfsm_markov.pd
index ab7142d..fa2ea8b 100644
--- a/gfsm/src/gfsm_markov.pd
+++ b/gfsm/src/gfsm_markov.pd
@@ -284,127 +284,63 @@ clear fsm alph state add2;
 #X connect 35 0 34 1;
 #X connect 36 0 34 1;
 #X restore 21 186 pd gfsm_markov_add_guts;
-#N canvas 27 0 738 524 gfsm_markov_next_guts 0;
-#X obj 86 25 r \$0-next;
+#N canvas 29 370 662 532 gfsm_markov_next_guts 0;
+#X obj 28 4 r \$0-next;
 #X obj 243 464 outlet;
-#X obj 86 47 route bang;
-#X obj 151 158 * -1;
-#X obj 151 136 * 1;
-#X obj 559 376 t b b;
-#N canvas 75 18 312 424 weight_sum 0;
-#X obj 24 9 inlet;
-#X msg 24 114 arc_next;
-#X obj 24 319 f 0;
-#X obj 199 92 0;
-#X obj 89 238 unpack 0 0 0 0;
-#X obj 183 262 + 0;
-#X obj 88 263 t f f;
-#X obj 24 350 outlet;
-#X obj 60 146 r \$0-state;
-#X obj 24 90 until;
-#X obj 24 214 route bang;
-#X obj 24 235 t b b;
-#X obj 24 192 route arc_next;
-#X obj 24 43 t b b b b;
-#X msg 91 114 arc_reset;
-#X obj 24 167 gfsm_state \$1-fsm 0;
-#X connect 0 0 13 0;
-#X connect 1 0 15 0;
-#X connect 2 0 7 0;
-#X connect 3 0 5 1;
-#X connect 4 3 5 0;
-#X connect 5 0 6 0;
-#X connect 6 0 5 1;
-#X connect 6 1 2 1;
-#X connect 8 0 15 0;
-#X connect 9 0 1 0;
-#X connect 10 0 11 0;
-#X connect 10 1 4 0;
-#X connect 11 0 2 0;
-#X connect 11 1 9 1;
-#X connect 12 0 10 0;
-#X connect 13 0 9 0;
-#X connect 13 1 3 0;
-#X connect 13 2 14 0;
-#X connect 13 3 9 1;
-#X connect 14 0 15 0;
-#X connect 15 0 12 0;
-#X restore 167 115 pd weight_sum;
-#X obj 25 95 random 131072;
-#X obj 25 116 / 131072;
-#X obj 86 69 t b b b;
-#X obj 151 69 t f b b;
-#X msg 559 227 arc_next;
-#X obj 594 269 r \$0-state;
-#X obj 559 205 until;
-#X obj 559 349 route bang;
-#X obj 559 326 route arc_next;
-#X msg 625 226 arc_reset;
-#X obj 151 180 t b b f;
+#X obj 28 26 route bang;
+#X obj 167 138 * 1;
+#X obj 28 70 random 131072;
+#X obj 28 91 / 131072;
 #X obj 405 461 outlet;
 #X obj 101 429 gfsm_alphabet \$1-alph;
 #X msg 101 407 char2atom! \$1;
-#X obj 179 296 moses 0;
-#X obj 179 251 + 0;
-#X obj 179 274 t f f;
 #X obj 86 225 unpack 0 0 0 0;
-#X obj 18 386 f 0;
 #X msg 18 411 set \$1;
 #X obj 18 432 s \$0-state;
-#X obj 559 292 gfsm_state \$1-fsm 0;
-#X obj 559 457 outlet;
+#X obj 512 461 outlet;
 #X obj 263 428 gfsm_alphabet \$1-alph;
 #X msg 263 406 char2atom! \$1;
-#X obj 263 384 f 0;
-#X obj 101 385 f 0;
-#X obj 225 316 t b b b b;
+#X obj 424 101 gfsm_state \$1-fsm 0;
+#X obj 424 20 r \$0-state;
+#X obj 512 150 route bang;
+#X obj 512 172 t b;
+#X obj 424 124 route total_weight arc_gen;
+#X obj 28 48 t b;
+#X obj 153 71 t b f;
+#X obj 167 115 f 0;
+#X obj 196 114 t b f;
+#X msg 167 160 arc_gen \$1;
+#X msg 153 91 arc_reset \, total_weight;
+#X obj 153 187 s \$0-state;
 #X connect 0 0 2 0;
-#X connect 2 0 9 0;
-#X connect 2 1 10 0;
-#X connect 3 0 17 0;
-#X connect 4 0 3 0;
-#X connect 5 0 29 0;
-#X connect 5 1 13 1;
-#X connect 6 0 4 1;
-#X connect 7 0 8 0;
-#X connect 8 0 4 0;
-#X connect 9 0 7 0;
-#X connect 9 1 6 0;
-#X connect 9 2 13 1;
-#X connect 10 0 4 0;
-#X connect 10 1 6 0;
-#X connect 10 2 13 1;
-#X connect 11 0 28 0;
-#X connect 12 0 28 0;
-#X connect 13 0 11 0;
-#X connect 14 0 5 0;
-#X connect 14 1 24 0;
-#X connect 15 0 14 0;
-#X connect 16 0 28 0;
-#X connect 17 0 13 0;
-#X connect 17 1 16 0;
-#X connect 17 2 22 1;
-#X connect 19 1 1 0;
-#X connect 20 0 19 0;
-#X connect 21 1 34 0;
-#X connect 22 0 23 0;
-#X connect 23 0 21 0;
-#X connect 23 1 22 1;
-#X connect 24 0 25 1;
-#X connect 24 1 33 1;
-#X connect 24 2 32 1;
-#X connect 24 3 22 0;
+#X connect 2 0 20 0;
+#X connect 2 1 21 0;
+#X connect 3 0 24 0;
+#X connect 4 0 5 0;
+#X connect 5 0 21 0;
+#X connect 7 1 1 0;
+#X connect 8 0 7 0;
+#X connect 9 0 10 0;
+#X connect 9 1 8 0;
+#X connect 9 2 14 0;
+#X connect 10 0 11 0;
+#X connect 13 1 6 0;
+#X connect 14 0 13 0;
+#X connect 15 0 19 0;
+#X connect 16 0 15 0;
+#X connect 17 0 18 0;
+#X connect 17 1 9 0;
+#X connect 18 0 12 0;
+#X connect 19 0 23 0;
+#X connect 19 1 17 0;
+#X connect 20 0 4 0;
+#X connect 21 0 25 0;
+#X connect 21 1 22 1;
+#X connect 22 0 3 0;
+#X connect 23 0 22 0;
+#X connect 23 1 3 1;
+#X connect 24 0 26 0;
 #X connect 25 0 26 0;
-#X connect 26 0 27 0;
-#X connect 28 0 15 0;
-#X connect 30 1 18 0;
-#X connect 31 0 30 0;
-#X connect 32 0 31 0;
-#X connect 33 0 20 0;
-#X connect 34 0 25 0;
-#X connect 34 1 33 0;
-#X connect 34 2 32 0;
-#X connect 34 3 13 1;
 #X restore 22 216 pd gfsm_markov_next_guts;
 #X obj 185 260 outlet;
 #X connect 3 0 6 0;