Mercurial > hg > weather-synthesis-prototyping
changeset 173:71f175713201
sword model updated to latest source model and evaluating. Seems averaging takes too long to give and output gain.
| author | Rod Selfridge <r.selfridge@qmul.ac.uk> |
|---|---|
| date | Fri, 05 Feb 2016 20:13:05 +0000 |
| parents | 3347e1284123 |
| children | e14dc303db68 |
| files | .DS_Store newSwordAuto/centreAngles.pd newSwordAuto/newSwordAuto.pd |
| diffstat | 3 files changed, 146 insertions(+), 519 deletions(-) [+] |
line wrap: on
line diff
--- a/newSwordAuto/centreAngles.pd Fri Feb 05 18:56:57 2016 +0000 +++ b/newSwordAuto/centreAngles.pd Fri Feb 05 20:13:05 2016 +0000 @@ -82,10 +82,10 @@ #X obj 658 219 r postsweepElev; #X floatatom 405 21 0 0 0 0 - - -; #X msg 69 163 180 \$1; -#X obj 231 198 vline~; #X obj 231 222 outlet~; #X obj 1029 258 outlet~; -#X obj 1029 232 vline~; +#X obj 231 198 line~; +#X obj 1029 232 line~; #X connect 0 0 75 0; #X connect 1 0 0 0; #X connect 2 0 0 1; @@ -97,7 +97,7 @@ #X connect 9 0 12 0; #X connect 11 0 12 1; #X connect 12 0 13 0; -#X connect 13 0 76 0; +#X connect 13 0 78 0; #X connect 14 0 15 1; #X connect 14 1 15 0; #X connect 15 0 20 0; @@ -109,7 +109,7 @@ #X connect 20 0 21 0; #X connect 21 0 23 0; #X connect 22 0 20 1; -#X connect 23 0 76 0; +#X connect 23 0 78 0; #X connect 24 0 12 0; #X connect 26 0 50 0; #X connect 27 0 26 0; @@ -154,8 +154,8 @@ #X connect 72 0 63 0; #X connect 72 0 62 0; #X connect 73 0 72 1; -#X connect 75 0 76 0; -#X connect 76 0 6 0; -#X connect 76 0 77 0; +#X connect 75 0 78 0; +#X connect 78 0 6 0; +#X connect 78 0 76 0; #X connect 79 0 32 0; -#X connect 79 0 78 0; +#X connect 79 0 77 0;
--- a/newSwordAuto/newSwordAuto.pd Fri Feb 05 18:56:57 2016 +0000 +++ b/newSwordAuto/newSwordAuto.pd Fri Feb 05 20:13:05 2016 +0000 @@ -1,5 +1,4 @@ -#N canvas 44 23 1360 805 10; -#X obj 587 237 freqCalcCyl3No_D2Mach; +#N canvas 286 28 1360 805 10; #X obj 315 22 loadbang; #X obj 315 44 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1 1; @@ -8,7 +7,7 @@ #X obj -259 60 s NoOfSources; #X obj -221 455 s topSpeed; #X obj -273 429 hsl 100 20 0 100 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 3465 1; +-1 -1 8165 1; #X floatatom -276 455 8 0 0 0 - - -; #X text -24 27 Blade Length; #X text -25 93 Arm Length; @@ -18,9 +17,9 @@ -1 -1 2475 1; #X floatatom 18 280 8 0 0 0 - - -; #X obj -279 516 hsl 100 20 0 0.03 0 0 empty empty empty -2 -8 0 10 --262144 -1 -1 7500 1; +-262144 -1 -1 6600 1; #X obj -280 601 hsl 100 20 0.0001 0.01 0 0 empty empty empty -2 -8 -0 10 -262144 -1 -1 1700 1; +0 10 -262144 -1 -1 7900 1; #X floatatom -282 546 8 0 0 0 - - -; #X floatatom -283 629 8 0 0 0 - - -; #X obj -225 628 s tipThick; @@ -116,7 +115,7 @@ #X msg 175 222 10; #X msg 109 492 0; #X obj 404 148 sweepTime; -#X obj 623 97 centreAngles; +#X obj 628 97 centreAngles; #N canvas 474 470 426 335 thickCalc 0; #X obj 173 139 r NoOfSources; #X obj 158 115 -; @@ -269,7 +268,7 @@ #X connect 68 0 48 0; #X connect 68 0 53 0; #X restore 403 212 pd maxCircCalc; -#X obj 421 97 sourceSpeed; +#X obj 483 79 sourceSpeed; #X text 837 5 Diameter; #X text 839 25 Length; #X text 838 48 Distance; @@ -280,169 +279,6 @@ #X text 838 154 Y Rot; #X text 839 174 Z Rot; #X text 836 193 TurbInt; -#N canvas 116 93 786 420 motion 0; -#X obj 60 202 s bladeLen; -#X obj 165 202 s hiltThick; -#X obj 299 121 route motion; -#X obj 299 143 route x y; -#X obj 299 100 cursor; -#X obj 299 82 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1 -1; -#X obj 299 61 loadbang; -#X obj 90 40 key; -#X obj 90 64 select 113 97 111 112; -#X obj 75 131 +; -#X obj 61 97 f; -#X msg 90 96 1; -#X floatatom 21 202 5 0 0 0 - - -; -#X msg 120 95 -1; -#X obj 165 130 +; -#X obj 151 96 f; -#X floatatom 129 202 5 0 0 0 - - -; -#X msg 180 95 -1; -#X msg 210 94 1; -#X obj 165 152 / 1000; -#X obj 165 175 max; -#X obj 209 152 r tipThick; -#X floatatom 362 309 0 0 0 0 - - -; -#X obj 75 151 / 100; -#X obj 75 174 max 0; -#X text 496 48 Q - Increase blade length; -#X text 497 63 A - Decrease blade length; -#X text 498 78 P - Increase blade thickness; -#X text 498 92 O - Decrease blade thickness; -#X obj 299 296 s azimuth; -#X obj 423 311 s elevation; -#X obj 299 203 - 1; -#X obj 299 226 * 3.1415; -#X floatatom 242 296 0 0 0 0 - - -; -#X obj 423 220 - 1; -#X obj 423 243 * 3.1415; -#X obj 423 198 * -1; -#X obj 423 176 / 899; -#X obj 423 267 cos; -#X obj 423 289 * -90; -#X obj 299 180 / 1439; -#X obj 299 250 cos; -#X obj 299 272 * 180; -#X connect 2 0 3 0; -#X connect 3 0 40 0; -#X connect 3 1 37 0; -#X connect 4 0 2 0; -#X connect 5 0 4 0; -#X connect 6 0 5 0; -#X connect 7 0 8 0; -#X connect 8 0 11 0; -#X connect 8 0 10 0; -#X connect 8 1 13 0; -#X connect 8 1 10 0; -#X connect 8 2 15 0; -#X connect 8 2 17 0; -#X connect 8 3 15 0; -#X connect 8 3 18 0; -#X connect 9 0 10 1; -#X connect 9 0 23 0; -#X connect 10 0 9 0; -#X connect 11 0 9 1; -#X connect 13 0 9 1; -#X connect 14 0 15 1; -#X connect 14 0 19 0; -#X connect 15 0 14 0; -#X connect 17 0 14 1; -#X connect 18 0 14 1; -#X connect 19 0 20 0; -#X connect 20 0 1 0; -#X connect 20 0 16 0; -#X connect 21 0 20 1; -#X connect 23 0 24 0; -#X connect 24 0 0 0; -#X connect 24 0 12 0; -#X connect 31 0 32 0; -#X connect 32 0 41 0; -#X connect 34 0 35 0; -#X connect 35 0 38 0; -#X connect 36 0 34 0; -#X connect 37 0 36 0; -#X connect 38 0 39 0; -#X connect 39 0 30 0; -#X connect 39 0 22 0; -#X connect 40 0 31 0; -#X connect 41 0 42 0; -#X connect 42 0 33 0; -#X connect 42 0 29 0; -#X restore 217 57 pd motion; -#N canvas 464 138 714 620 speedCalc 0; -#X obj -11 22 r azimuth; -#X obj 134 18 r elevation; -#X floatatom 218 40 5 0 0 0 - - -; -#X obj 250 19 r bladeLen; -#X obj 466 18 r hiltThick; -#X floatatom 161 41 5 0 0 0 - - -; -#X floatatom -80 46 0 0 0 0 - - -; -#X floatatom 484 42 5 0 0 0 - - -; -#X obj 543 19 r tipThick; -#X floatatom 556 43 5 0 0 0 - - -; -#X obj 265 38 r start_armLength; -#X floatatom 285 62 5 0 0 0 - - -; -#X obj 250 63 +; -#X floatatom 250 89 5 0 0 0 - - -; -#X obj 312 108 s totLength; -#X obj -11 118 -; -#X obj 4 45 t f b; -#X floatatom -56 164 5 0 0 0 - - -; -#X obj 31 68 delay 20; -#X obj -11 141 abs; -#X obj 136 144 -; -#X obj 151 71 t f b; -#X floatatom 91 190 5 0 0 0 - - -; -#X obj 178 94 delay 20; -#X obj 136 167 abs; -#X obj -11 167 *; -#X obj 137 192 *; -#X obj 10 218 +; -#X obj 16 261 sqrt; -#X floatatom -13 294 0 0 0 0 - - -; -#X obj 19 297 outlet; -#X obj 27 189 t f b; -#X obj 58 231 delay 10; -#X connect 0 0 6 0; -#X connect 0 0 15 0; -#X connect 0 0 16 0; -#X connect 1 0 5 0; -#X connect 1 0 20 0; -#X connect 1 0 21 0; -#X connect 3 0 2 0; -#X connect 3 0 12 0; -#X connect 4 0 7 0; -#X connect 8 0 9 0; -#X connect 10 0 11 0; -#X connect 10 0 12 1; -#X connect 12 0 13 0; -#X connect 12 0 14 0; -#X connect 15 0 19 0; -#X connect 16 0 15 1; -#X connect 16 1 18 0; -#X connect 18 0 15 0; -#X connect 19 0 17 0; -#X connect 19 0 25 0; -#X connect 19 0 25 1; -#X connect 20 0 24 0; -#X connect 21 0 20 1; -#X connect 21 1 23 0; -#X connect 23 0 20 0; -#X connect 24 0 22 0; -#X connect 24 0 26 0; -#X connect 24 0 26 1; -#X connect 25 0 27 0; -#X connect 26 0 31 0; -#X connect 27 0 28 0; -#X connect 28 0 29 0; -#X connect 28 0 30 0; -#X connect 31 0 27 1; -#X connect 31 1 27 0; -#X connect 31 1 32 0; -#X connect 32 0 27 0; -#X restore 218 80 pd speedCalc; #X obj 326 541 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0; #X obj 389 541 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0; #X text 386 450 Gain; @@ -484,7 +320,7 @@ #X restore 325 498 pd opLevels; #X msg 334 444 5; #X obj 328 469 hsl 100 25 0.1 1e+06 0 0 empty empty empty -2 -8 0 10 --262144 -1 -1 3203 1; +-262144 -1 -1 8700 1; #X obj 445 472 hsl 100 25 1 127 0 0 empty empty empty -2 -8 0 10 -262144 -1 -1 0 1; #X obj 442 426 loadbang; @@ -492,236 +328,16 @@ #X obj 325 398 r GAIN; #X msg 442 449 1; #X floatatom 268 499 8 0 0 0 - - -; -#N canvas 916 347 450 300 PlayCont 0; -#X obj 206 41 hid; -#X msg 206 13 print; -#X obj 179 14 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0 -1; -#X obj 206 65 route abs; -#X obj 206 88 route abs_x abs_y; -#X floatatom 8 133 5 0 0 0 - - -; -#X obj 191 185 -; -#X obj 173 137 t f b; -#X floatatom 165 236 5 0 0 0 - - -; -#X obj 191 207 abs; -#X floatatom 141 186 5 0 0 0 - - -; -#X obj 200 159 delay 20; -#X obj 289 189 -; -#X obj 271 141 t f b; -#X floatatom 263 240 5 0 0 0 - - -; -#X obj 289 211 abs; -#X floatatom 239 190 5 0 0 0 - - -; -#X obj 298 163 delay 20; -#X msg 251 13 open 4; -#X connect 0 0 3 0; -#X connect 1 0 0 0; -#X connect 2 0 0 0; -#X connect 3 0 4 0; -#X connect 4 0 5 0; -#X connect 4 0 7 0; -#X connect 4 0 6 1; -#X connect 4 1 13 0; -#X connect 4 1 12 1; -#X connect 6 0 9 0; -#X connect 7 0 10 0; -#X connect 7 0 6 0; -#X connect 7 1 11 0; -#X connect 9 0 8 0; -#X connect 11 0 6 0; -#X connect 12 0 15 0; -#X connect 13 0 16 0; -#X connect 13 0 12 0; -#X connect 13 1 17 0; -#X connect 15 0 14 0; -#X connect 17 0 12 0; -#X connect 18 0 0 0; -#X restore 217 103 pd PlayCont; -#X msg 716 201 0; -#X obj 599 -8 r deltaThick; -#N canvas 112 23 1347 721 Distance 0; -#X obj 51 47 r Xobs; -#X obj 103 47 r Yobs; -#X obj 152 47 r Zobs; -#X obj 51 73 *; -#X obj 103 71 *; -#X obj 152 71 *; -#X obj 88 99 +; -#X obj 88 131 +; -#X obj 88 158 sqrt; -#X floatatom 45 180 0 0 0 0 - - -; -#X text 26 23 Distance between observer and centre of arc; -#X obj 378 24 r azimuth; -#X obj 638 11 r elevation; -#X obj 378 105 cos; -#X obj 378 79 * 0.01745; -#X obj 638 50 - 90; -#X floatatom 558 182 5 0 0 0 - - -; -#X obj 638 71 * -1; -#X obj 638 120 cos; -#X obj 638 94 * 0.01745; -#X obj 638 164 *; -#X obj 653 141 r totLength; -#X text 693 168 z coordinate of tip; -#X obj 393 131 sin; -#X floatatom 408 230 5 0 0 0 - - -; -#X obj 393 176 *; -#X obj 408 153 r totLength; -#X obj 378 204 *; -#X obj 486 34 r azimuth; -#X obj 486 75 * 0.01745; -#X obj 501 127 sin; -#X floatatom 516 219 5 0 0 0 - - -; -#X obj 501 172 *; -#X obj 516 149 r totLength; -#X obj 486 200 *; -#X obj 486 101 sin; -#X text 465 17 x coordinate of tip; -#X text 248 153 y coordinate of tip; -#X obj 556 200 r Zobs; -#X obj 327 293 *; -#X obj 459 288 *; -#X obj 583 263 *; -#X obj 444 318 +; -#X obj 444 350 +; -#X obj 444 377 sqrt; -#X floatatom 401 399 0 0 0 0 - - -; -#X obj 327 264 -; -#X obj 342 241 t f b; -#X obj 459 264 -; -#X obj 474 241 t f b; -#X obj 583 239 -; -#X obj 598 216 t f b; -#X obj 355 397 outlet; -#X obj 623 347 r Zobs; -#X obj 623 393 -; -#X obj 638 370 t f b; -#X floatatom 664 416 5 0 0 0 - - -; -#X obj 623 419 /; -#X obj 623 444 atan; -#X obj 624 471 * 57.296; -#X floatatom 583 497 5 0 0 0 - - -; -#X obj 624 496 outlet; -#X obj 977 73 r elevation; -#X obj 884 74 r azimuth; -#X obj 1004 170 -; -#X obj 977 96 t f f; -#X obj 1004 119 t f b; -#X obj 1031 141 delay 25; -#X obj 911 171 -; -#X obj 884 97 t f f; -#X obj 911 120 t f b; -#X obj 938 142 delay 25; -#X obj 911 194 *; -#X obj 1004 192 *; -#X obj 989 216 +; -#X obj 989 239 sqrt; -#X floatatom 926 261 0 0 0 0 - - -; -#X obj 989 261 outlet; -#X obj 327 209 r Yobs; -#X obj 440 199 r Xobs; -#X connect 0 0 3 0; -#X connect 0 0 3 1; -#X connect 1 0 4 0; -#X connect 1 0 4 1; -#X connect 2 0 5 0; -#X connect 2 0 5 1; -#X connect 3 0 6 0; -#X connect 4 0 6 1; -#X connect 5 0 7 1; -#X connect 6 0 7 0; -#X connect 7 0 8 0; -#X connect 8 0 9 0; -#X connect 11 0 14 0; -#X connect 12 0 15 0; -#X connect 13 0 27 0; -#X connect 14 0 13 0; -#X connect 15 0 17 0; -#X connect 17 0 19 0; -#X connect 18 0 20 0; -#X connect 19 0 18 0; -#X connect 19 0 23 0; -#X connect 19 0 30 0; -#X connect 20 0 16 0; -#X connect 20 0 54 1; -#X connect 20 0 51 0; -#X connect 21 0 20 1; -#X connect 23 0 25 0; -#X connect 25 0 27 1; -#X connect 26 0 25 1; -#X connect 27 0 24 0; -#X connect 27 0 47 0; -#X connect 28 0 29 0; -#X connect 29 0 35 0; -#X connect 30 0 32 0; -#X connect 32 0 34 1; -#X connect 33 0 32 1; -#X connect 34 0 31 0; -#X connect 34 0 49 0; -#X connect 35 0 34 0; -#X connect 38 0 50 0; -#X connect 39 0 42 0; -#X connect 40 0 42 1; -#X connect 41 0 43 1; -#X connect 42 0 43 0; -#X connect 43 0 44 0; -#X connect 44 0 45 0; -#X connect 44 0 52 0; -#X connect 44 0 57 1; -#X connect 46 0 39 0; -#X connect 46 0 39 1; -#X connect 47 0 46 1; -#X connect 47 1 46 0; -#X connect 48 0 40 0; -#X connect 48 0 40 1; -#X connect 49 0 48 1; -#X connect 49 1 48 0; -#X connect 50 0 41 0; -#X connect 50 0 41 1; -#X connect 51 0 50 1; -#X connect 51 1 50 0; -#X connect 53 0 54 0; -#X connect 54 0 56 0; -#X connect 54 0 57 0; -#X connect 55 0 54 1; -#X connect 55 1 54 0; -#X connect 57 0 58 0; -#X connect 58 0 59 0; -#X connect 59 0 60 0; -#X connect 59 0 61 0; -#X connect 62 0 65 0; -#X connect 63 0 69 0; -#X connect 64 0 73 0; -#X connect 64 0 73 1; -#X connect 65 0 64 1; -#X connect 65 1 66 0; -#X connect 66 0 64 0; -#X connect 66 1 67 0; -#X connect 67 0 64 0; -#X connect 67 0 74 0; -#X connect 68 0 72 0; -#X connect 68 0 72 1; -#X connect 69 0 68 1; -#X connect 69 1 70 0; -#X connect 70 0 68 0; -#X connect 70 1 71 0; -#X connect 71 0 68 0; -#X connect 71 0 74 0; -#X connect 72 0 74 0; -#X connect 73 0 74 1; -#X connect 74 0 75 0; -#X connect 75 0 76 0; -#X connect 75 0 77 0; -#X connect 78 0 46 0; -#X connect 79 0 48 0; -#X restore 217 123 pd Distance; +#X msg 696 214 0; +#X obj 600 -8 r deltaThick; #X obj -227 545 s hiltThick; #X obj -58 48 s bladeLen; #X msg -259 37 1; #X obj 315 63 metro 25; -#X obj 716 179 r setUp; +#X obj 722 148 r setUp; #X text 834 -12 Speed; #X msg 206 221 100; -#N canvas 214 145 734 658 positions 1; +#N canvas 214 145 734 658 positions 0; #X obj -9101 54 bng 50 250 50 0 empty empty empty 17 7 0 10 -4034 -1 -1; #X obj -9101 107 s GO; @@ -820,11 +436,11 @@ #X connect 44 0 45 0; #X connect 46 0 16 1; #X connect 47 0 19 0; -#X restore 623 124 pd positions; -#X msg 461 55 1; -#X obj 432 33 r setUp; -#X obj 599 37 +; -#X obj 614 14 r tipThick; +#X restore 628 124 pd positions; +#X msg 523 37 1; +#X obj 494 15 r setUp; +#X obj 600 37 +; +#X obj 615 14 r tipThick; #N canvas 39 23 1218 834 arcDist 0; #X obj 118 59 bng 50 250 50 0 empty empty empty 17 7 0 10 -4034 -1 -1; @@ -976,129 +592,140 @@ #X msg 126 416 60; #X msg 89 307 270; #X msg 170 416 90; -#X msg 661 208 0.5; -#X msg 432 55 0; -#X obj 611 60 r bladeLen; -#X msg 648 182 90; -#X msg 633 166 0; +#X msg 669 195 0.5; +#X msg 494 37 0; +#X obj 614 60 r bladeLen; +#X msg 655 167 90; +#X msg 641 146 0; #X obj 521 277 sig~; #X obj 589 318 hsl 128 15 0 40 0 0 empty empty empty -2 -8 0 10 -262144 -1 -1 0 1; -#X connect 1 0 2 0; -#X connect 2 0 138 0; -#X connect 4 0 136 0; -#X connect 7 0 6 0; -#X connect 7 0 8 0; -#X connect 13 0 14 0; -#X connect 13 0 59 0; +#X obj 587 237 freqCalcCyl3No_D3Mach; +#N canvas 615 307 344 123 machCalc 0; +#X text 107 15 Speed of Sound (dry air 20 Degs C); +#X obj 26 33 s~ MY_MACH; +#X obj 26 9 /~ 343.21; +#X obj 26 -14 inlet~; +#X connect 2 0 1 0; +#X connect 3 0 2 0; +#X restore 402 100 pd machCalc; +#X connect 0 0 1 0; +#X connect 1 0 133 0; +#X connect 3 0 131 0; +#X connect 6 0 5 0; +#X connect 6 0 7 0; +#X connect 12 0 13 0; +#X connect 12 0 58 0; +#X connect 14 0 16 0; +#X connect 14 0 130 0; #X connect 15 0 17 0; -#X connect 15 0 135 0; -#X connect 16 0 18 0; -#X connect 16 0 19 0; -#X connect 22 0 23 0; -#X connect 24 0 25 0; -#X connect 25 0 22 0; -#X connect 26 0 25 1; -#X connect 27 0 28 0; -#X connect 29 0 7 0; -#X connect 30 0 13 0; +#X connect 15 0 18 0; +#X connect 21 0 22 0; +#X connect 23 0 24 0; +#X connect 24 0 21 0; +#X connect 25 0 24 1; +#X connect 26 0 27 0; +#X connect 28 0 6 0; +#X connect 29 0 12 0; +#X connect 30 0 14 0; #X connect 31 0 15 0; -#X connect 32 0 16 0; -#X connect 33 0 4 0; -#X connect 34 0 62 0; -#X connect 35 0 137 0; -#X connect 36 0 7 0; +#X connect 32 0 3 0; +#X connect 33 0 61 0; +#X connect 34 0 132 0; +#X connect 35 0 6 0; +#X connect 36 0 14 0; #X connect 37 0 15 0; -#X connect 38 0 16 0; -#X connect 39 0 137 0; -#X connect 40 0 62 0; -#X connect 41 0 4 0; -#X connect 42 0 43 0; -#X connect 43 0 27 0; -#X connect 44 0 45 0; -#X connect 44 0 60 0; -#X connect 46 0 44 0; -#X connect 47 0 48 0; -#X connect 47 0 53 0; -#X connect 49 0 47 0; -#X connect 50 0 51 0; -#X connect 50 0 54 0; -#X connect 52 0 50 0; -#X connect 62 0 61 0; +#X connect 38 0 132 0; +#X connect 39 0 61 0; +#X connect 40 0 3 0; +#X connect 41 0 42 0; +#X connect 42 0 26 0; +#X connect 43 0 44 0; +#X connect 43 0 59 0; +#X connect 45 0 43 0; +#X connect 46 0 47 0; +#X connect 46 0 52 0; +#X connect 48 0 46 0; +#X connect 49 0 50 0; +#X connect 49 0 53 0; +#X connect 51 0 49 0; +#X connect 61 0 60 0; +#X connect 62 0 65 0; +#X connect 62 0 68 0; #X connect 63 0 66 0; #X connect 63 0 69 0; #X connect 64 0 67 0; #X connect 64 0 70 0; -#X connect 65 0 68 0; -#X connect 65 0 71 0; -#X connect 72 0 63 0; -#X connect 73 0 65 0; -#X connect 74 0 64 0; +#X connect 71 0 62 0; +#X connect 72 0 64 0; +#X connect 73 0 63 0; +#X connect 74 0 62 0; #X connect 75 0 63 0; #X connect 76 0 64 0; -#X connect 77 0 65 0; -#X connect 78 0 64 0; -#X connect 79 0 13 0; -#X connect 80 0 65 0; -#X connect 81 0 63 0; -#X connect 82 0 47 0; -#X connect 83 0 64 0; -#X connect 84 0 64 0; -#X connect 85 0 64 0; -#X connect 86 0 7 0; -#X connect 87 0 63 0; -#X connect 88 0 65 0; +#X connect 77 0 63 0; +#X connect 78 0 12 0; +#X connect 79 0 64 0; +#X connect 80 0 62 0; +#X connect 81 0 46 0; +#X connect 82 0 63 0; +#X connect 83 0 63 0; +#X connect 84 0 63 0; +#X connect 85 0 6 0; +#X connect 86 0 62 0; +#X connect 87 0 64 0; +#X connect 88 0 14 0; #X connect 89 0 15 0; -#X connect 90 0 16 0; -#X connect 91 0 7 0; +#X connect 90 0 6 0; +#X connect 91 0 62 0; #X connect 92 0 63 0; #X connect 93 0 64 0; -#X connect 94 0 65 0; -#X connect 95 0 13 0; -#X connect 97 0 47 0; -#X connect 98 0 50 0; -#X connect 99 0 13 0; -#X connect 100 0 50 0; -#X connect 102 0 142 0; -#X connect 102 1 142 1; -#X connect 105 0 0 0; -#X connect 121 0 123 0; -#X connect 122 0 118 0; -#X connect 122 1 119 0; -#X connect 123 0 124 0; -#X connect 124 0 122 0; -#X connect 124 0 130 0; -#X connect 125 0 122 1; -#X connect 126 0 129 0; -#X connect 128 0 124 0; -#X connect 129 0 125 0; -#X connect 132 0 0 10; -#X connect 132 0 0 9; -#X connect 132 0 0 8; -#X connect 132 0 0 7; -#X connect 133 0 145 0; -#X connect 137 0 5 0; -#X connect 138 0 3 0; -#X connect 139 0 132 0; -#X connect 139 0 154 0; -#X connect 141 0 13 0; -#X connect 142 0 0 3; -#X connect 143 0 105 1; -#X connect 144 0 155 0; -#X connect 144 0 143 0; -#X connect 145 0 0 1; -#X connect 146 0 145 1; -#X connect 147 0 101 0; -#X connect 148 0 13 0; -#X connect 149 0 13 0; -#X connect 150 0 50 0; -#X connect 151 0 47 0; -#X connect 152 0 44 0; -#X connect 153 0 47 0; -#X connect 153 0 50 0; -#X connect 154 0 0 6; -#X connect 155 0 105 0; -#X connect 156 0 0 2; -#X connect 157 0 0 5; -#X connect 158 0 0 4; -#X connect 160 0 159 0; +#X connect 94 0 12 0; +#X connect 96 0 46 0; +#X connect 97 0 49 0; +#X connect 98 0 12 0; +#X connect 99 0 49 0; +#X connect 101 0 137 0; +#X connect 101 1 137 1; +#X connect 104 0 156 0; +#X connect 104 0 157 0; +#X connect 118 0 120 0; +#X connect 119 0 115 0; +#X connect 119 1 116 0; +#X connect 120 0 121 0; +#X connect 121 0 119 0; +#X connect 121 0 127 0; +#X connect 122 0 119 1; +#X connect 123 0 126 0; +#X connect 125 0 121 0; +#X connect 126 0 122 0; +#X connect 128 0 156 9; +#X connect 128 0 156 8; +#X connect 128 0 156 7; +#X connect 129 0 140 0; +#X connect 132 0 4 0; +#X connect 133 0 2 0; +#X connect 134 0 128 0; +#X connect 134 0 149 0; +#X connect 134 0 152 0; +#X connect 134 0 153 0; +#X connect 136 0 12 0; +#X connect 137 0 156 3; +#X connect 138 0 104 1; +#X connect 139 0 150 0; +#X connect 139 0 138 0; +#X connect 140 0 156 1; +#X connect 141 0 140 1; +#X connect 142 0 100 0; +#X connect 143 0 12 0; +#X connect 144 0 12 0; +#X connect 145 0 49 0; +#X connect 146 0 46 0; +#X connect 147 0 43 0; +#X connect 148 0 46 0; +#X connect 148 0 49 0; +#X connect 149 0 156 6; +#X connect 150 0 104 0; +#X connect 151 0 156 2; +#X connect 152 0 156 5; +#X connect 153 0 156 4; +#X connect 155 0 154 0;