# HG changeset patch
# User Rod Selfridge <r.selfridge@qmul.ac.uk>
# Date 1433523722 -3600
# Node ID 819d71fa7fac2f808225bd5fc9cc298147e8b443
# Parent  4b14b2a355e998fdc23a7fd90745b12224657c75
Processing sketch added

diff -r 4b14b2a355e9 -r 819d71fa7fac .DS_Store
Binary file .DS_Store has changed
diff -r 4b14b2a355e9 -r 819d71fa7fac June/.DS_Store
Binary file June/.DS_Store has changed
diff -r 4b14b2a355e9 -r 819d71fa7fac June/Gen2_D2.pd
--- a/June/Gen2_D2.pd	Mon Jun 01 20:16:46 2015 +0100
+++ b/June/Gen2_D2.pd	Fri Jun 05 18:02:02 2015 +0100
@@ -1,4 +1,5 @@
-#N canvas 598 55 830 745 10;
+#N canvas 157 74 1102 758 10;
+#X declare -lib mrpeach;
 #N canvas 236 158 426 423 windspeed 0;
 #X obj 3 -19 +~ 1;
 #X obj 3 76 +~;
@@ -84,12 +85,12 @@
 #X obj 56 429 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0;
 #X obj 119 429 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0;
 #X obj 210 429 vsl 15 128 0 127 0 0 empty empty empty 0 -9 0 10 -262144
--1 -1 9000 1;
+-1 -1 500 1;
 #X text 239 448 Gain;
 #X obj 210 365 loadbang;
 #X obj 260 78 delwrite~ varwind 3000;
 #X obj 343 -114 hsl 128 15 0 50 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 3100 1;
+-1 -1 0 1;
 #X obj 303 -11 snapshot~;
 #X obj 303 -36 metro 100;
 #X obj 303 -58 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
@@ -132,7 +133,7 @@
 #X msg 210 393 5;
 #X text 300 34 Wind Speed;
 #X text 487 -70 Diameter;
-#X obj 374 431 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+#X obj 374 431 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0
 1;
 #X obj 374 457 cursor;
 #X obj 374 481 route motion;
@@ -315,6 +316,17 @@
 #X obj 528 374 thisFreq;
 #X obj 673 218 thisFreq;
 #X obj 405 217 thisFreq;
+#X msg 877 -99 connect localhost 9001;
+#X obj 877 4 udpsend;
+#X obj 981 -20 packOSC;
+#X obj 793 -140 import mrpeach;
+#X floatatom 982 -67 5 0 0 0 - - -;
+#X msg 982 -45 send /test \$1;
+#X obj 761 -79 udpreceive 9000;
+#X obj 761 -52 unpackOSC;
+#X obj 794 -20 print;
+#X obj 766 5 OSCroute /test1;
+#X floatatom 767 41 5 0 0 0 - - -;
 #X connect 0 0 25 0;
 #X connect 16 0 31 0;
 #X connect 18 0 33 0;
@@ -376,3 +388,11 @@
 #X connect 71 0 57 0;
 #X connect 72 0 52 0;
 #X connect 73 0 46 0;
+#X connect 74 0 75 0;
+#X connect 76 0 75 0;
+#X connect 78 0 79 0;
+#X connect 79 0 76 0;
+#X connect 80 0 81 0;
+#X connect 81 0 82 0;
+#X connect 81 0 83 0;
+#X connect 83 0 84 0;
diff -r 4b14b2a355e9 -r 819d71fa7fac June/Gen2_Tree.pd
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/June/Gen2_Tree.pd	Fri Jun 05 18:02:02 2015 +0100
@@ -0,0 +1,435 @@
+#N canvas 287 23 830 745 10;
+#N canvas 236 158 426 423 windspeed 0;
+#X obj 3 -19 +~ 1;
+#X obj 3 76 +~;
+#X obj 3 3 *~ 0.25;
+#X obj 19 53 +~;
+#X obj 3 98 clip~ 0 1;
+#N canvas 548 156 136 193 squall 0;
+#X obj 63 20 noise~;
+#X obj 63 83 hip~ 0;
+#X obj 63 41 lop~ 3;
+#X obj 63 62 lop~ 3;
+#X obj 0 86 *~;
+#X obj 22 130 *~;
+#X obj 0 20 max~ 0.4;
+#X obj 0 42 -~ 0.4;
+#X obj 0 64 *~ 8;
+#X obj 63 104 *~ 20;
+#X obj 0 0 inlet~;
+#X obj 22 154 outlet~;
+#X connect 0 0 2 0;
+#X connect 1 0 9 0;
+#X connect 2 0 3 0;
+#X connect 3 0 1 0;
+#X connect 4 0 5 0;
+#X connect 5 0 11 0;
+#X connect 6 0 7 0;
+#X connect 7 0 8 0;
+#X connect 8 0 4 0;
+#X connect 8 0 4 1;
+#X connect 9 0 5 1;
+#X connect 10 0 6 0;
+#X restore 77 28 pd squall;
+#N canvas 398 157 136 192 gust 0;
+#X obj 0 0 noise~;
+#X obj 0 63 hip~ 0;
+#X obj 0 106 *~;
+#X obj 67 44 *~;
+#X obj 67 21 +~ 0.5;
+#X obj 67 67 -~ 0.125;
+#X obj 0 42 lop~ 0.5;
+#X obj 0 21 lop~ 0.5;
+#X obj 0 84 *~ 50;
+#X obj 67 0 inlet~;
+#X obj 0 131 outlet~;
+#X connect 0 0 7 0;
+#X connect 1 0 8 0;
+#X connect 2 0 10 0;
+#X connect 3 0 5 0;
+#X connect 4 0 3 0;
+#X connect 4 0 3 1;
+#X connect 5 0 2 1;
+#X connect 6 0 1 0;
+#X connect 7 0 6 0;
+#X connect 8 0 2 0;
+#X connect 9 0 4 0;
+#X restore 18 29 pd gust;
+#X obj 3 120 outlet~;
+#X obj 3 -41 osc~ 0.01;
+#X connect 0 0 2 0;
+#X connect 1 0 4 0;
+#X connect 2 0 5 0;
+#X connect 2 0 6 0;
+#X connect 2 0 1 0;
+#X connect 3 0 1 1;
+#X connect 4 0 7 0;
+#X connect 5 0 3 1;
+#X connect 6 0 3 0;
+#X connect 8 0 0 0;
+#X restore 260 -116 pd windspeed;
+#X text 24 15 Light air = 0.56 m/s - 1.39 m/s;
+#X text 24 37 Light Breeze = 1.67 m/s - 3.33 m/s;
+#X text 24 57 Gentle Breeze = 3.61 m/s - 5.56 m/s;
+#X text 24 77 Moderate Breeze = 5.83 m/s - 8.33 m/s;
+#X text 25 98 Fresh Breeze = 8.61 m/s - 11.11 m/s;
+#X text 24 119 Strong Breeze = 11.39 m/s - 13.89 m/s;
+#X text 25 139 Moderate Gale = 14.17 m/s - 16.94 m/s;
+#X text 26 159 Fresh Gale = 17.22 m/s - 20.56 m/s;
+#X text 25 179 Strong Gale = 20.83 m/s - 24.72 m/s;
+#X text 25 197 Whole Gale = 25 m/s - 28.61 m/s;
+#X text 25 217 Storm = 28.89 m/s - 33.06 m/s;
+#X text 26 235 Hurricane = 33.33 -;
+#X text 62 -16 Beaufort Scale Chart;
+#X obj 56 429 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0;
+#X obj 119 429 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0;
+#X obj 210 429 vsl 15 128 0 127 0 0 empty empty empty 0 -9 0 10 -262144
+-1 -1 4300 1;
+#X text 239 448 Gain;
+#X obj 210 365 loadbang;
+#X obj 260 78 delwrite~ varwind 3000;
+#X obj 343 -114 hsl 128 15 0 50 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 1000 1;
+#X obj 303 -11 snapshot~;
+#X obj 303 -36 metro 100;
+#X obj 303 -58 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X floatatom 303 16 10 0 0 0 - - -;
+#X obj 260 -82 *~ 1;
+#X obj 260 -56 +~ 1;
+#X text 107 274 Equations from Chanaud 2010;
+#X text 20 339 Frequency = (Strouhal Number * Velocity) / Distance
+;
+#X text 19 299 Reynolds Number = (Density * Velocity * Length) / Viscosity
+;
+#X text 19 319 Strouhal Number = 0.198 * (1 - (19.7/ Reynolds Number))
+;
+#N canvas 865 368 293 255 opLevels 0;
+#X obj 88 129 dac~;
+#X obj 64 70 catch~ l;
+#X obj 128 70 catch~ r;
+#X obj 129 104 *~ 0.45;
+#X obj 65 104 *~ 0.45;
+#X obj 65 154 prvu~;
+#X obj 129 155 prvu~;
+#X obj 186 75 / 127;
+#X obj 186 40 inlet;
+#X obj 65 183 outlet;
+#X obj 129 183 outlet;
+#X connect 1 0 4 0;
+#X connect 2 0 3 0;
+#X connect 3 0 0 1;
+#X connect 3 0 6 0;
+#X connect 4 0 0 0;
+#X connect 4 0 5 0;
+#X connect 5 0 9 0;
+#X connect 6 0 10 0;
+#X connect 7 0 3 1;
+#X connect 7 0 4 1;
+#X connect 8 0 7 0;
+#X restore 55 386 pd opLevels;
+#X obj 303 -83 loadbang;
+#X msg 210 393 5;
+#X text 300 34 Wind Speed;
+#X text 487 -70 Diameter;
+#X obj 374 431 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X obj 374 457 cursor;
+#X obj 374 481 route motion;
+#X obj 374 509 route x y;
+#X floatatom 334 562 5 0 0 0 - - -;
+#X floatatom 466 539 5 0 0 0 - - -;
+#X obj 374 563 s xCurs;
+#X obj 399 543 s yCurs;
+#X obj 363 182 unpack f f;
+#X obj 429 100 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
+-1 -1;
+#X floatatom 405 242 8 0 0 0 - - -;
+#X msg 325 148 0;
+#X msg 320 171 1;
+#X obj 631 183 unpack f f;
+#X obj 697 101 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
+-1 -1;
+#X floatatom 673 243 8 0 0 0 - - -;
+#X msg 593 149 0;
+#X msg 588 172 1;
+#X obj 486 339 unpack f f;
+#X obj 558 274 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
+-1 -1;
+#X floatatom 528 399 8 0 0 0 - - -;
+#X msg 448 305 0;
+#X msg 443 328 1;
+#N canvas 704 41 255 612 posCalc 1;
+#X obj 104 19 r xCurs;
+#X obj 160 19 r yCurs;
+#X obj 119 50 inlet;
+#X obj 175 46 inlet;
+#X obj 104 80 -;
+#X obj 160 80 -;
+#X obj 105 141 *;
+#X obj 161 139 *;
+#X obj 131 199 sqrt;
+#X obj 131 173 +;
+#X floatatom 188 234 5 0 0 0 - - -;
+#X obj 131 232 outlet;
+#X obj 77 236 /;
+#X floatatom 46 147 5 0 0 0 - - -;
+#X obj 119 485 * 360;
+#X floatatom 180 537 5 0 0 0 - - -;
+#X obj 119 542 outlet;
+#X obj 119 509 / 6.28319;
+#X obj 160 104 / 20;
+#X obj 104 104 / 20;
+#X obj 77 277 *;
+#X obj 77 309 swap 1;
+#X obj 77 342 -;
+#X obj 134 274 + 1;
+#X obj 77 371 sqrt;
+#X obj 119 402 /;
+#X obj 119 430 atan;
+#X obj 119 455 * 2;
+#X floatatom 170 481 5 0 0 0 - - -;
+#X connect 0 0 4 0;
+#X connect 1 0 5 0;
+#X connect 2 0 4 1;
+#X connect 3 0 5 1;
+#X connect 4 0 19 0;
+#X connect 5 0 18 0;
+#X connect 6 0 9 0;
+#X connect 7 0 9 1;
+#X connect 8 0 10 0;
+#X connect 8 0 11 0;
+#X connect 8 0 12 1;
+#X connect 9 0 8 0;
+#X connect 12 0 20 0;
+#X connect 12 0 20 1;
+#X connect 12 0 23 0;
+#X connect 14 0 17 0;
+#X connect 17 0 15 0;
+#X connect 17 0 16 0;
+#X connect 18 0 7 0;
+#X connect 18 0 7 1;
+#X connect 19 0 6 0;
+#X connect 19 0 6 1;
+#X connect 19 0 12 0;
+#X connect 19 0 13 0;
+#X connect 20 0 21 0;
+#X connect 21 0 22 0;
+#X connect 21 1 22 1;
+#X connect 22 0 24 0;
+#X connect 23 0 25 1;
+#X connect 24 0 25 0;
+#X connect 25 0 26 0;
+#X connect 26 0 27 0;
+#X connect 27 0 28 0;
+#X connect 27 0 14 0;
+#X restore 558 338 pd posCalc;
+#X msg 435 155 100.5;
+#X msg 492 155 100.5;
+#X msg 703 156 1100.5;
+#X msg 760 156 150.5;
+#X msg 558 312 640.5;
+#X msg 615 312 650.5;
+#X msg 363 154 300 0.0035;
+#X msg 631 155 300 0.0012;
+#X msg 486 311 300 0.035;
+#X obj 405 217 thisFreq;
+#N canvas 704 41 255 612 posCalc 1;
+#X obj 104 19 r xCurs;
+#X obj 160 19 r yCurs;
+#X obj 119 50 inlet;
+#X obj 175 46 inlet;
+#X obj 104 80 -;
+#X obj 160 80 -;
+#X obj 105 141 *;
+#X obj 161 139 *;
+#X obj 131 199 sqrt;
+#X obj 131 173 +;
+#X floatatom 188 234 5 0 0 0 - - -;
+#X obj 131 232 outlet;
+#X obj 77 236 /;
+#X floatatom 46 147 5 0 0 0 - - -;
+#X obj 119 485 * 360;
+#X floatatom 180 537 5 0 0 0 - - -;
+#X obj 119 542 outlet;
+#X obj 119 509 / 6.28319;
+#X obj 160 104 / 20;
+#X obj 104 104 / 20;
+#X obj 77 277 *;
+#X obj 77 309 swap 1;
+#X obj 77 342 -;
+#X obj 134 274 + 1;
+#X obj 77 371 sqrt;
+#X obj 119 402 /;
+#X obj 119 430 atan;
+#X obj 119 455 * 2;
+#X floatatom 170 481 5 0 0 0 - - -;
+#X connect 0 0 4 0;
+#X connect 1 0 5 0;
+#X connect 2 0 4 1;
+#X connect 3 0 5 1;
+#X connect 4 0 19 0;
+#X connect 5 0 18 0;
+#X connect 6 0 9 0;
+#X connect 7 0 9 1;
+#X connect 8 0 10 0;
+#X connect 8 0 11 0;
+#X connect 8 0 12 1;
+#X connect 9 0 8 0;
+#X connect 12 0 20 0;
+#X connect 12 0 20 1;
+#X connect 12 0 23 0;
+#X connect 14 0 17 0;
+#X connect 17 0 15 0;
+#X connect 17 0 16 0;
+#X connect 18 0 7 0;
+#X connect 18 0 7 1;
+#X connect 19 0 6 0;
+#X connect 19 0 6 1;
+#X connect 19 0 12 0;
+#X connect 19 0 13 0;
+#X connect 20 0 21 0;
+#X connect 21 0 22 0;
+#X connect 21 1 22 1;
+#X connect 22 0 24 0;
+#X connect 23 0 25 1;
+#X connect 24 0 25 0;
+#X connect 25 0 26 0;
+#X connect 26 0 27 0;
+#X connect 27 0 28 0;
+#X connect 27 0 14 0;
+#X restore 435 184 pd posCalc;
+#N canvas 704 41 255 612 posCalc 1;
+#X obj 104 19 r xCurs;
+#X obj 160 19 r yCurs;
+#X obj 119 50 inlet;
+#X obj 175 46 inlet;
+#X obj 104 80 -;
+#X obj 160 80 -;
+#X obj 105 141 *;
+#X obj 161 139 *;
+#X obj 131 199 sqrt;
+#X obj 131 173 +;
+#X floatatom 188 234 5 0 0 0 - - -;
+#X obj 131 232 outlet;
+#X obj 77 236 /;
+#X floatatom 46 147 5 0 0 0 - - -;
+#X obj 119 485 * 360;
+#X floatatom 180 537 5 0 0 0 - - -;
+#X obj 119 542 outlet;
+#X obj 119 509 / 6.28319;
+#X obj 160 104 / 20;
+#X obj 104 104 / 20;
+#X obj 77 277 *;
+#X obj 77 309 swap 1;
+#X obj 77 342 -;
+#X obj 134 274 + 1;
+#X obj 77 371 sqrt;
+#X obj 119 402 /;
+#X obj 119 430 atan;
+#X obj 119 455 * 2;
+#X floatatom 170 481 5 0 0 0 - - -;
+#X connect 0 0 4 0;
+#X connect 1 0 5 0;
+#X connect 2 0 4 1;
+#X connect 3 0 5 1;
+#X connect 4 0 19 0;
+#X connect 5 0 18 0;
+#X connect 6 0 9 0;
+#X connect 7 0 9 1;
+#X connect 8 0 10 0;
+#X connect 8 0 11 0;
+#X connect 8 0 12 1;
+#X connect 9 0 8 0;
+#X connect 12 0 20 0;
+#X connect 12 0 20 1;
+#X connect 12 0 23 0;
+#X connect 14 0 17 0;
+#X connect 17 0 15 0;
+#X connect 17 0 16 0;
+#X connect 18 0 7 0;
+#X connect 18 0 7 1;
+#X connect 19 0 6 0;
+#X connect 19 0 6 1;
+#X connect 19 0 12 0;
+#X connect 19 0 13 0;
+#X connect 20 0 21 0;
+#X connect 21 0 22 0;
+#X connect 21 1 22 1;
+#X connect 22 0 24 0;
+#X connect 23 0 25 1;
+#X connect 24 0 25 0;
+#X connect 25 0 26 0;
+#X connect 26 0 27 0;
+#X connect 27 0 28 0;
+#X connect 27 0 14 0;
+#X restore 703 185 pd posCalc;
+#X floatatom 492 215 5 0 0 0 - - -;
+#X floatatom 760 216 5 0 0 0 - - -;
+#X floatatom 615 371 5 0 0 0 - - -;
+#X obj 673 218 thisFreq;
+#X obj 528 374 thisFreq;
+#X connect 0 0 25 0;
+#X connect 16 0 31 0;
+#X connect 18 0 33 0;
+#X connect 20 0 25 1;
+#X connect 20 0 26 1;
+#X connect 21 0 24 0;
+#X connect 22 0 21 0;
+#X connect 23 0 22 0;
+#X connect 25 0 26 0;
+#X connect 26 0 19 0;
+#X connect 26 0 21 0;
+#X connect 31 0 14 0;
+#X connect 31 1 15 0;
+#X connect 32 0 23 0;
+#X connect 33 0 16 0;
+#X connect 36 0 37 0;
+#X connect 37 0 38 0;
+#X connect 38 0 39 0;
+#X connect 39 0 40 0;
+#X connect 39 0 42 0;
+#X connect 39 1 41 0;
+#X connect 39 1 43 0;
+#X connect 44 0 69 2;
+#X connect 44 1 69 3;
+#X connect 45 0 66 0;
+#X connect 45 0 60 0;
+#X connect 45 0 61 0;
+#X connect 47 0 69 1;
+#X connect 48 0 69 1;
+#X connect 49 0 75 2;
+#X connect 49 1 75 3;
+#X connect 50 0 67 0;
+#X connect 50 0 62 0;
+#X connect 50 0 63 0;
+#X connect 52 0 75 1;
+#X connect 53 0 75 1;
+#X connect 54 0 76 2;
+#X connect 54 1 76 3;
+#X connect 55 0 68 0;
+#X connect 55 0 64 0;
+#X connect 55 0 65 0;
+#X connect 57 0 76 1;
+#X connect 58 0 76 1;
+#X connect 59 0 76 4;
+#X connect 59 1 74 0;
+#X connect 59 1 76 5;
+#X connect 60 0 70 0;
+#X connect 61 0 70 1;
+#X connect 62 0 71 0;
+#X connect 63 0 71 1;
+#X connect 64 0 59 0;
+#X connect 65 0 59 1;
+#X connect 66 0 44 0;
+#X connect 67 0 49 0;
+#X connect 68 0 54 0;
+#X connect 69 0 46 0;
+#X connect 70 0 69 4;
+#X connect 70 1 69 5;
+#X connect 70 1 72 0;
+#X connect 71 0 75 4;
+#X connect 71 1 73 0;
+#X connect 71 1 75 5;
+#X connect 75 0 51 0;
+#X connect 76 0 56 0;
diff -r 4b14b2a355e9 -r 819d71fa7fac June/processingD1/processingD1.pde
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/June/processingD1/processingD1.pde	Fri Jun 05 18:02:02 2015 +0100
@@ -0,0 +1,23 @@
+// Example 05-02 from "Getting Started with Processing" 
+// by Reas & Fry. O'Reilly / Make 2010
+
+int position;
+
+void setup() {
+  size(1420, 900);
+  background(128);
+  position = 0;
+}
+
+void draw() {
+  background(128);
+  fill(0);      // fill changes the color of the interior of the shape
+  noStroke();   // noStroke removes the outer line
+
+  // Does position represent the horizontal or the vertical location?
+  ellipse(80.5, 100.5, 30, 30);
+  ellipse(1080.5, 150.5, 30, 30);
+  ellipse(620.5, 650.5, 30, 30);
+
+}
+
diff -r 4b14b2a355e9 -r 819d71fa7fac June/thisFreq.pd
--- a/June/thisFreq.pd	Mon Jun 01 20:16:46 2015 +0100
+++ b/June/thisFreq.pd	Fri Jun 05 18:02:02 2015 +0100
@@ -151,7 +151,6 @@
 #X text 519 579 Reynolds Number;
 #X obj 843 53 vcf~ 1000 10;
 #X obj 861 361 vcf~ 1000 10;
-#X obj 559 162 - 90;
 #X obj 19 -59 spigot~;
 #X obj 90 -60 spigot~;
 #X obj 48 -108 inlet;
@@ -177,6 +176,8 @@
 #X obj 969 -67 *~ -0.003;
 #X obj 969 -42 +~ 20;
 #X obj 987 266 +~ 20;
+#X obj 559 162 + 90;
+#X floatatom 581 1 5 0 0 0 - - -;
 #X connect 4 0 40 0;
 #X connect 5 0 8 0;
 #X connect 6 0 15 1;
@@ -205,17 +206,18 @@
 #X connect 31 0 35 0;
 #X connect 32 0 33 0;
 #X connect 32 0 33 1;
+#X connect 32 0 142 0;
 #X connect 33 0 34 0;
 #X connect 34 0 35 1;
 #X connect 35 0 45 0;
 #X connect 35 0 69 0;
-#X connect 36 0 116 0;
-#X connect 36 0 121 0;
+#X connect 36 0 120 0;
 #X connect 36 0 53 0;
-#X connect 36 0 123 0;
+#X connect 36 0 122 0;
+#X connect 36 0 141 0;
 #X connect 37 0 42 0;
 #X connect 37 0 42 1;
-#X connect 38 0 132 0;
+#X connect 38 0 131 0;
 #X connect 39 0 51 0;
 #X connect 40 0 50 1;
 #X connect 42 0 41 0;
@@ -224,11 +226,11 @@
 #X connect 47 0 48 0;
 #X connect 48 0 49 0;
 #X connect 49 0 50 0;
-#X connect 50 0 122 0;
+#X connect 50 0 121 0;
 #X connect 51 0 76 0;
 #X connect 52 0 55 0;
 #X connect 52 0 55 1;
-#X connect 53 0 133 0;
+#X connect 53 0 132 0;
 #X connect 55 0 54 0;
 #X connect 55 0 57 1;
 #X connect 56 0 58 0;
@@ -248,12 +250,12 @@
 #X connect 75 0 10 0;
 #X connect 77 0 40 1;
 #X connect 78 0 79 0;
-#X connect 79 0 118 0;
+#X connect 79 0 117 0;
 #X connect 80 0 78 0;
 #X connect 81 0 114 1;
 #X connect 82 0 114 0;
-#X connect 85 0 134 0;
-#X connect 86 0 126 0;
+#X connect 85 0 133 0;
+#X connect 86 0 125 0;
 #X connect 87 0 90 0;
 #X connect 88 0 87 0;
 #X connect 89 0 88 0;
@@ -264,45 +266,45 @@
 #X connect 95 0 94 0;
 #X connect 97 0 98 0;
 #X connect 98 0 95 0;
-#X connect 99 0 139 0;
+#X connect 99 0 138 0;
 #X connect 100 0 112 0;
 #X connect 101 0 115 0;
-#X connect 104 0 129 0;
+#X connect 104 0 128 0;
 #X connect 105 0 107 0;
 #X connect 105 0 115 2;
 #X connect 106 0 105 0;
 #X connect 108 0 109 0;
 #X connect 109 0 106 0;
-#X connect 110 0 138 0;
-#X connect 111 0 135 0;
+#X connect 110 0 137 0;
+#X connect 111 0 134 0;
 #X connect 112 0 115 1;
 #X connect 114 0 86 0;
 #X connect 115 0 104 0;
-#X connect 116 0 38 0;
-#X connect 117 0 63 0;
-#X connect 118 1 63 0;
-#X connect 119 0 117 1;
-#X connect 119 0 118 1;
-#X connect 120 0 117 0;
-#X connect 122 0 2 0;
-#X connect 122 1 3 0;
-#X connect 124 0 125 0;
-#X connect 125 0 122 1;
-#X connect 126 0 83 0;
-#X connect 126 1 84 0;
-#X connect 127 0 128 0;
-#X connect 128 0 126 1;
-#X connect 129 0 102 0;
-#X connect 129 1 103 0;
-#X connect 130 0 131 0;
-#X connect 131 0 129 1;
-#X connect 132 0 37 0;
-#X connect 133 0 52 0;
-#X connect 134 0 86 1;
-#X connect 135 0 104 1;
-#X connect 136 0 105 0;
-#X connect 137 0 94 0;
-#X connect 138 0 141 0;
-#X connect 139 0 140 0;
-#X connect 140 0 137 0;
-#X connect 141 0 136 0;
+#X connect 116 0 63 0;
+#X connect 117 1 63 0;
+#X connect 118 0 116 1;
+#X connect 118 0 117 1;
+#X connect 119 0 116 0;
+#X connect 121 0 2 0;
+#X connect 121 1 3 0;
+#X connect 123 0 124 0;
+#X connect 124 0 121 1;
+#X connect 125 0 83 0;
+#X connect 125 1 84 0;
+#X connect 126 0 127 0;
+#X connect 127 0 125 1;
+#X connect 128 0 102 0;
+#X connect 128 1 103 0;
+#X connect 129 0 130 0;
+#X connect 130 0 128 1;
+#X connect 131 0 37 0;
+#X connect 132 0 52 0;
+#X connect 133 0 86 1;
+#X connect 134 0 104 1;
+#X connect 135 0 105 0;
+#X connect 136 0 94 0;
+#X connect 137 0 140 0;
+#X connect 138 0 139 0;
+#X connect 139 0 136 0;
+#X connect 140 0 135 0;
+#X connect 141 0 38 0;