diff --git a/help/fluid.concataudiofiles-help.pd b/help/fluid.concataudiofiles-help.pd index 45f5330..49b6d04 100644 --- a/help/fluid.concataudiofiles-help.pd +++ b/help/fluid.concataudiofiles-help.pd @@ -1,4 +1,4 @@ -#N canvas 52 80 700 650 12; +#N canvas 30 42 704 649 12; #X obj 17 13 cnv 15 660 42 empty empty fluid.concataudiofiles 1 22 0 36 #4ba3fb #ffffff 0; #X obj 17 60 cnv 15 488 17 empty empty A\\\ utility\\\ to\\\ concatenate\\\ audio\\\ files. @@ -131,13 +131,17 @@ count., f 65; #X connect 26 0 10 0; #X connect 27 0 23 0; #X restore 43 288 pd drawdisplay; +#X text 22 429 See the concatenated files:; +#X obj 539 221 note_on_multiarrays; +#X obj 18 167 cnv 15 15 15 empty empty empty 20 12 0 14 #c6ffc7 #404040 +0; +#X obj 185 351 cnv 15 15 15 empty empty empty 20 12 0 14 #c6ffc7 #404040 +0; #X text 18 166 1) Click here to load all the FluCoMa demo audio files in one 'multiarray', f 74; -#X text 183 350 2) open the text to see the items in order. Each line +#X text 184 349 2) open the text to see the items in order. Each line is a file with its path / sampling_rate / nbChans / startFrame / endframe , f 63; -#X text 22 429 See the concatenated files:; -#X obj 539 221 note_on_multiarrays; #X connect 2 0 6 0; #X connect 5 0 2 0; #X connect 6 0 13 0; diff --git a/help/fluid.dataset-help.pd b/help/fluid.dataset-help.pd index 0a4d8c0..da8525a 100644 --- a/help/fluid.dataset-help.pd +++ b/help/fluid.dataset-help.pd @@ -73,8 +73,8 @@ to an array., f 26; #X text 136 265 1) Store a list of numbers in an array. These numbers could be anything \, including audio-descriptor data \, synthesiser parameters or anything!, f 54; -#X obj 475 687 cnv 15 202 156 empty empty More\ information 4 10 0 -13 #e0e0e0 #404040 0; +#X obj 475 687 cnv 15 202 156 empty empty More\\\ information 4 10 +0 13 #e0e0e0 #404040 0; #N canvas 312 64 693 961 audio-descriptor_example 0; #X obj 17 13 cnv 15 660 42 empty empty fluid.dataset 1 22 0 36 #4ba3fb #ffffff 0; @@ -156,7 +156,7 @@ and stored in the dataset with the identity "scratch-synth", f 42 #X connect 30 0 16 0; #X connect 31 0 30 0; #X restore 478 707 pd audio-descriptor_example; -#N canvas 183 157 703 609 other_messages 0; +#N canvas 110 98 703 609 other_messages 0; #X obj 17 13 cnv 15 660 42 empty empty fluid.dataset 1 22 0 36 #4ba3fb #ffffff 0; #X text 17 79 Other useful messages that can be used with fluid.dataset~ @@ -187,36 +187,49 @@ and stored in the dataset with the identity "scratch-synth", f 42 #X connect 7 0 1 0; #X connect 10 0 2 1; #X restore 57 154 pd make_dummy_dataset; -#X text 193 187 write a fluid.dataset to disk; -#X text 213 217 Read a fluid.dataset~ from disk; #X msg 94 248 size; #X msg 114 288 cols; #X msg 134 358 print; -#X text 203 387 Completely empty and reset a fluid.dataset~; #X msg 154 388 clear; -#X text 143 247 Get the size (the number of pairs -in the dataset) \, which is reported out the left outlet.; -#X text 163 287 Get the number of columns \, or dimensions of the data -points. Since all points must have the same number of dimensions \, -this is just a single number. It is reported out the left outlet.; #X msg 74 218 read myfile.json; #X msg 54 188 write myfile.json; -#X text 183 357 Dump the contents of the fluid.dataset~ to the console -; #X obj 51 490 fluid.dataset help.other; #X obj 51 514 print left; #X obj 215 514 print right; +#X obj 195 190 cnv 15 15 15 empty empty empty 20 12 0 14 #c6ffc7 #404040 +0; +#X obj 213 218 cnv 15 15 15 empty empty empty 20 12 0 14 #c6ffc7 #404040 +0; +#X obj 144 248 cnv 15 15 15 empty empty empty 20 12 0 14 #c6ffc7 #404040 +0; +#X obj 163 288 cnv 15 15 15 empty empty empty 20 12 0 14 #c6ffc7 #404040 +0; +#X obj 184 358 cnv 15 15 15 empty empty empty 20 12 0 14 #c6ffc7 #404040 +0; +#X obj 204 390 cnv 15 15 15 empty empty empty 20 12 0 14 #c6ffc7 #404040 +0; +#X text 195 188 1) write a fluid.dataset to disk; +#X text 212 217 2) Read a fluid.dataset~ from disk; +#X text 143 246 3) Get the size (the number of +pairs in the dataset) \, which is reported out the left outlet.; +#X text 162 286 4) Get the number of columns \, or dimensions of the +data points. Since all points must have the same number of dimensions +\, this is just a single number. It is reported out the left outlet. +; +#X text 183 357 5) Dump the contents of the fluid.dataset~ to the console +; +#X text 204 388 6) Completely empty and reset a fluid.dataset~; #X connect 2 0 3 0; -#X connect 6 0 16 0; -#X connect 7 0 16 0; -#X connect 8 0 16 0; -#X connect 10 0 16 0; -#X connect 13 0 16 0; -#X connect 14 0 16 0; -#X connect 16 0 17 0; -#X connect 16 1 18 0; +#X connect 4 0 10 0; +#X connect 5 0 10 0; +#X connect 6 0 10 0; +#X connect 7 0 10 0; +#X connect 8 0 10 0; +#X connect 9 0 10 0; +#X connect 10 0 11 0; +#X connect 10 1 12 0; #X restore 478 729 pd other_messages; -#N canvas 899 23 692 549 merging 0; +#N canvas 131 150 695 549 merging 0; #X obj 401 199 cnv 15 218 42 empty empty empty 20 12 0 14 #faad8b #404040 0; #X obj 17 13 cnv 15 660 42 empty empty fluid.dataset 1 22 0 36 #4ba3fb @@ -305,6 +318,14 @@ not found in the dataset to merge will be added to the caller., f #X obj 291 486 text define help.dataset.merge.text.2; #X f 27; #X obj 51 210 t b b; +#X obj 490 492 cnv 15 15 15 empty empty empty 20 12 0 14 #c6ffc7 #404040 +0; +#X obj 384 167 cnv 15 15 15 empty empty empty 20 12 0 14 #c6ffc7 #404040 +0; +#X text 385 165 2) click the message to merge and inspect again the +text below to see the effect, f 41; +#X text 490 491 1) open the text objects to see the sources, f 25 +; #X connect 3 0 16 0; #X connect 4 0 6 0; #X connect 5 0 7 0; @@ -443,7 +464,7 @@ across all channels as the columns of a given identifier.; ; #X obj 19 784 text define help.dataset.text.1; #X text 41 678 8) store dataset into a text object; -#N canvas 1009 23 691 591 using_text 0; +#N canvas 126 91 691 591 using_text 0; #X obj 17 13 cnv 15 660 42 empty empty fluid.dataset 1 22 0 36 #4ba3fb #ffffff 0; #X obj 27 542 fluid.dataset help.dataset.4; diff --git a/help/fluid.datasetquery-help.pd b/help/fluid.datasetquery-help.pd index ee6b68f..49202e4 100644 --- a/help/fluid.datasetquery-help.pd +++ b/help/fluid.datasetquery-help.pd @@ -2,8 +2,8 @@ #X obj 245 621 fluid.datasetquery; #X obj 17 13 cnv 15 660 42 empty empty fluid.datasetquery 1 22 0 36 #4ba3fb #ffffff 0; -#X obj 457 867 cnv 15 222 132 empty empty More\ information 4 10 0 -13 #e0e0e0 #404040 0; +#X obj 457 867 cnv 15 222 132 empty empty More\\\ information 4 10 +0 13 #e0e0e0 #404040 0; #X obj 509 60 fluid.referencelauncher fluid.datasetquery.html reference/datasetquery/ ; #X obj 47 211 cnv 15 15 15 empty empty empty 20 12 0 14 #c6ffc7 #404040 @@ -12,7 +12,7 @@ #X text 17 129 A selection of columns and a set of conditions that match rows of a FluidDataSet. Use to filter and search in a database of descriptors.; -#N canvas 376 244 705 845 operators 0; +#N canvas 376 244 697 802 operators 0; #X obj 17 13 cnv 15 660 42 empty empty fluid.datasetquery 1 22 0 36 #4ba3fb #ffffff 0; #X text 17 79 We can also combine multiple operators to refine the @@ -150,8 +150,6 @@ filter for the query.; 0; #X obj 157 739 cnv 15 15 15 empty empty empty 20 12 0 14 #c6ffc7 #404040 0; -#X text 158 738 6) double-click text object to see the data, f 16 -; #X text 277 751 ->; #X obj 349 181 cnv 15 15 15 empty empty empty 20 12 0 14 #c6ffc7 #404040 0; @@ -173,22 +171,24 @@ to constrain the search, f 21; #X obj 295 664 fluid.ds2text dsq.help.dest.2 dsq.help.dest.text.2, f 20; #X msg 370 419 addcolumn 3, f 13; +#X text 158 738 7) double-click text object to see the data, f 16 +; #X connect 4 0 5 0; #X connect 5 0 7 0; #X connect 5 1 8 0; #X connect 7 0 6 0; -#X connect 9 0 31 0; +#X connect 9 0 30 0; #X connect 10 0 9 0; #X connect 13 0 9 0; +#X connect 25 0 9 0; #X connect 26 0 9 0; #X connect 27 0 9 0; #X connect 28 0 9 0; -#X connect 29 0 9 0; -#X connect 30 0 32 0; -#X connect 31 0 30 0; -#X connect 33 0 9 0; +#X connect 29 0 31 0; +#X connect 30 0 29 0; +#X connect 32 0 9 0; #X restore 472 887 pd operators; -#N canvas 228 57 712 946 column_ranges 0; +#N canvas 228 57 698 808 column_ranges 0; #X obj 17 13 cnv 15 660 42 empty empty fluid.datasetquery 1 22 0 36 #4ba3fb #ffffff 0; #X text 17 79 Only copy a range of columns using addrange; @@ -356,7 +356,7 @@ f 30; #X connect 23 0 8 0; #X connect 27 0 8 0; #X restore 472 909 pd column_ranges; -#N canvas 363 72 688 840 combining_columns 0; +#N canvas 363 72 693 787 combining_columns 0; #X obj 17 13 cnv 15 660 42 empty empty fluid.datasetquery 1 22 0 36 #4ba3fb #ffffff 0; #X text 17 79 The transformjoin message allows filtering the contents @@ -838,12 +838,12 @@ the filter is satisfied copy THIS column to our destination., f 25 #X obj 245 698 fluid.ds2text dsq.help.dest dsq.help.dest.text, f 20 ; #X obj 245 650 route transform; -#N canvas 899 23 964 917 transformjoin_in_practice 0; +#N canvas 230 35 694 988 transformjoin_in_practice 0; #X obj 17 13 cnv 15 660 42 empty empty fluid.datasetquery 1 22 0 36 #4ba3fb #ffffff 0; #X text 17 79 The transformjoin message allows filtering the contents of a dataset based on the contents found in another.; -#X obj 502 665 cnv 15 243 33 empty empty empty 20 12 0 14 #e0e0e0 #404040 +#X obj 311 933 cnv 15 243 33 empty empty empty 20 12 0 14 #e0e0e0 #404040 0; #X obj 51 675 cnv 15 179 33 empty empty empty 20 12 0 14 #e0e0e0 #404040 0; @@ -859,7 +859,7 @@ dsq.help.src.5; #X connect 1 0 2 0; #X connect 2 0 0 0; #X restore 38 162 pd loadsrc; -#X obj 484 162 array define dsq.help.src.5; +#X obj 477 154 array define dsq.help.src.5; #X obj 38 212 bng 15 250 50 0 empty empty empty 17 7 0 10 #fcfcfc #000000 #000000; #N canvas 1814 -956 687 668 analysis 0; @@ -886,10 +886,10 @@ dsq.help.src.5; #X obj 247 306 fluid.datasetquery; #X obj 247 335 route transform; #X obj 247 393 fluid.dataset dsq.help.pitch.filtered, f 25; -#X obj 497 442 fluid.datasetquery; -#X msg 497 385 clear \, filter 1 > 0.9 \, transformjoin dsq.help.pitch +#X obj 306 710 fluid.datasetquery; +#X msg 306 653 clear \, filter 1 > 0.9 \, transformjoin dsq.help.pitch dsq.help.specshape dsq.help.specshape.filtered, f 37; -#X obj 497 472 route transformjoin; +#X obj 306 740 route transformjoin; #X obj 38 360 bng 15 250 50 0 empty empty empty 17 7 0 10 #fcfcfc #000000 #000000; #X obj 38 388 fluid.ds2text dsq.help.pitch dsq.help.pitch.text, f @@ -901,12 +901,12 @@ dsq.help.specshape dsq.help.specshape.filtered, f 37; , f 30; #X obj 252 542 text define dsq.help.pitch.filtered.text; #X f 29; -#X obj 497 588 bng 15 250 50 0 empty empty empty 17 7 0 10 #fcfcfc +#X obj 306 856 bng 15 250 50 0 empty empty empty 17 7 0 10 #fcfcfc #000000 #000000; -#X obj 497 530 fluid.dataset dsq.help.specshape.filtered; -#X obj 497 613 fluid.ds2text dsq.help.specshape.filtered dsq.help.specshape.filtered.text +#X obj 306 798 fluid.dataset dsq.help.specshape.filtered; +#X obj 306 881 fluid.ds2text dsq.help.specshape.filtered dsq.help.specshape.filtered.text , f 32; -#X obj 502 665 text define dsq.help.specshape.filtered.text; +#X obj 311 933 text define dsq.help.specshape.filtered.text; #X f 34; #X obj 45 526 fluid.dataset dsq.help.specshape, f 20; #X obj 45 598 bng 15 250 50 0 empty empty empty 17 7 0 10 #fcfcfc #000000 @@ -922,7 +922,7 @@ dsq.help.specshape dsq.help.specshape.filtered, f 37; #X msg 247 249 clear \, filter 1 > 0.9 \, addrange 0 2 \, transform dsq.help.pitch dsq.help.pitch.filtered, f 37; #X floatatom 301 465 5 0 0 0 - - - 0; -#X floatatom 551 588 5 0 0 0 - - - 0; +#X floatatom 360 856 5 0 0 0 - - - 0; #X obj 56 212 cnv 15 15 15 empty empty empty 20 12 0 14 #c6ffc7 #404040 0; #X text 57 211 1) Generate some pitch and spectral analyses, f 23 @@ -930,26 +930,26 @@ dsq.help.pitch dsq.help.pitch.filtered, f 37; #X obj 356 212 cnv 15 15 15 empty empty empty 20 12 0 14 #c6ffc7 #404040 0; #X text 357 211 2) Filter the pitch analyses by confidence, f 22; -#X obj 526 329 cnv 15 15 15 empty empty empty 20 12 0 14 #c6ffc7 #404040 +#X obj 302 619 cnv 15 15 15 empty empty empty 20 12 0 14 #c6ffc7 #404040 0; -#X text 527 328 3) Filter the spectral shape analyses by the pitch -confidence values of the pitch dataset., f 33; +#X text 303 618 3) Filter the spectral shape analyses by the pitch +confidence values of the pitch dataset.; #X obj 47 741 cnv 15 15 15 empty empty empty 20 12 0 14 #c6ffc7 #404040 0; #X text 48 740 4) Double click the text objects to see the data., f 26; #X text 48 780 Note the size (number of rows) in each dataset., f 26; -#X text 313 595 Once we filter the data based on pitch confidence there +#X text 470 431 Once we filter the data based on pitch confidence there are fewer rows in the dataset. Any identifier where the confidence was lower than 0.9 in the pitch dataset is removed from both., f 20 ; #X obj 38 331 route size; #X obj 45 569 route size; #X obj 247 436 route size; -#X obj 497 559 route size; +#X obj 306 827 route size; #X msg 247 364 size; -#X msg 497 501 size; +#X msg 306 769 size; #X connect 8 0 9 0; #X connect 9 0 10 0; #X connect 9 1 32 0; diff --git a/help/fluid.ds2text-help.pd b/help/fluid.ds2text-help.pd index 3dbcde8..0e931f2 100644 --- a/help/fluid.ds2text-help.pd +++ b/help/fluid.ds2text-help.pd @@ -1,4 +1,4 @@ -#N canvas 205 135 693 724 12; +#N canvas 103 77 693 724 12; #X obj 309 289 array define input 10; #X obj 53 313 array set input; #X msg 40 389 print; @@ -52,19 +52,27 @@ #X obj 17 60 cnv 15 488 17 empty empty Convert\\\ FluCoMa\\\ DataSet\\\ into\\\ text 4 8 0 13 #e0e0e0 #404040 0; #X text 17 79 A utility object to convert a dataset into text.; -#X text 18 134 1) Click these to populate an array with values and -save those in dataset myDS.; #X text 19 194 Message '-1' will store a dataset point with an identifier 'entry--1' and data which is the list of values in the array., f 61 ; #X text 169 285 create values in array 'input', f 16; -#X text 87 388 2) Click to see the DataSet printed in the console, -f 28; -#X text 42 535 3) Click to convert the myDS dataset and save it in -text object myText, f 36; -#X text 19 651 Click on Text object to see its content; #X obj 571 679 fluid.ls2text; #X text 495 679 see also:; +#X obj 19 135 cnv 15 15 15 empty empty empty 20 12 0 14 #c6ffc7 #404040 +0; +#X obj 87 387 cnv 15 15 15 empty empty empty 20 12 0 14 #c6ffc7 #404040 +0; +#X obj 42 535 cnv 15 15 15 empty empty empty 20 12 0 14 #c6ffc7 #404040 +0; +#X text 18 134 1) Click these to populate an array with values and +save those in dataset myDS.; +#X text 42 535 3) Click to convert the myDS dataset and save it in +text object myText, f 36; +#X text 87 388 2) Click to see the DataSet printed in the Pd window +, f 28; +#X obj 19 651 cnv 15 15 15 empty empty empty 20 12 0 14 #c6ffc7 #404040 +0; +#X text 20 650 4) Click on Text object to see its content; #X connect 2 0 11 0; #X connect 3 0 7 0; #X connect 4 0 7 0; diff --git a/help/fluid.hpss~-help.pd b/help/fluid.hpss~-help.pd index c0f2811..7af92f9 100644 --- a/help/fluid.hpss~-help.pd +++ b/help/fluid.hpss~-help.pd @@ -1,4 +1,4 @@ -#N canvas 77 60 691 1000 12; +#N canvas 28 35 691 1000 12; #X text 18 91 Harmonic-Percussive Source Separation (HPSS) on the an audio input., f 69; #X obj 511 199 array define hpss_drums; @@ -44,7 +44,6 @@ audio input., f 69; #X text 51 802 source; #X msg 140 396 getlatency; #X text 17 179 2) Play a sound; -#X text 33 779 select which components to hear:; #X obj 523 867 cnv 15 152 65 empty empty More\\\ information 4 10 0 13 #e0e0e0 #404040 0; #N canvas 511 107 694 1021 masking_mode1 0; @@ -79,7 +78,6 @@ greater separation \, but can have more audible artefacts., f 93; #X obj 17 980 fluid.out~ hpsshelp; #X text 53 901 harmonic; #X text 151 900 perc; -#X obj 17 953 *~ 1; #N canvas 282 71 1390 1006 calculatethreshold 0; #X floatatom 66 435 5 0 0 0 - - - 0; #X obj 98 479 s nf1; @@ -291,26 +289,26 @@ greater separation \, but can have more audible artefacts., f 93; #X text 197 900 3) select which component or components to hear; #X listbox 278 594 40 0 0 0 - - - 0; #X obj 18 871 fluid.hpss~ -maskingmode 1, f 43; -#X connect 2 0 31 0; -#X connect 7 0 31 0; -#X connect 10 0 17 0; +#X connect 2 0 30 0; +#X connect 7 0 30 0; +#X connect 10 0 14 0; +#X connect 10 0 14 1; #X connect 11 0 10 1; -#X connect 12 0 17 0; +#X connect 12 0 14 0; +#X connect 12 0 14 1; #X connect 13 0 12 1; -#X connect 17 0 14 1; -#X connect 17 0 14 0; -#X connect 18 0 2 0; +#X connect 17 0 2 0; +#X connect 17 0 29 0; #X connect 18 0 30 0; -#X connect 19 0 31 0; -#X connect 20 0 19 0; -#X connect 21 0 22 0; -#X connect 22 0 31 0; +#X connect 19 0 18 0; +#X connect 20 0 21 0; +#X connect 21 0 30 0; +#X connect 22 0 19 0; #X connect 23 0 20 0; -#X connect 24 0 21 0; -#X connect 25 0 23 0; -#X connect 25 0 24 0; -#X connect 31 0 10 0; -#X connect 31 1 12 0; +#X connect 24 0 22 0; +#X connect 24 0 23 0; +#X connect 30 0 10 0; +#X connect 30 1 12 0; #X restore 526 887 pd masking_mode1; #N canvas 335 107 701 941 masking_mode2 0; #X text 15 74 use mode 2 for more extreme separation and fine-tuning @@ -342,7 +340,6 @@ pairs. frequency is normalised (0-1) \, amp in dB, f 53; #000000 0 1; #X text 53 771 harmonic; #X text 176 771 perc; -#X obj 18 863 *~ 1; #X obj 18 739 fluid.hpss~ -maskingmode 2 -fftsettings 4096 1024 4096 ; #X obj 268 793 *~; @@ -781,30 +778,31 @@ pairs. frequency is normalised (0-1) \, amp in dB, f 53; #000000 #000000 0; #X text 198 664 percthresh; #X text 198 652 harmthresh; -#X connect 6 0 16 0; -#X connect 9 0 15 0; +#X connect 6 0 15 0; +#X connect 9 0 5 0; +#X connect 9 0 5 1; #X connect 10 0 9 1; -#X connect 11 0 15 0; +#X connect 11 0 5 0; +#X connect 11 0 5 1; #X connect 12 0 11 1; -#X connect 15 0 5 0; -#X connect 15 0 5 1; -#X connect 16 0 9 0; -#X connect 16 1 11 0; -#X connect 16 2 17 0; -#X connect 17 0 15 0; -#X connect 18 0 17 1; +#X connect 15 0 9 0; +#X connect 15 1 11 0; +#X connect 15 2 16 0; +#X connect 16 0 5 0; +#X connect 16 0 5 1; +#X connect 17 0 16 1; +#X connect 18 0 21 0; +#X connect 18 0 20 0; #X connect 19 0 22 0; -#X connect 19 0 21 0; -#X connect 20 0 23 0; -#X connect 20 0 21 0; -#X connect 21 0 16 0; -#X connect 25 0 34 1; -#X connect 26 0 34 3; -#X connect 27 0 34 2; -#X connect 28 0 34 4; +#X connect 19 0 20 0; +#X connect 20 0 15 0; +#X connect 24 0 33 1; +#X connect 25 0 33 3; +#X connect 26 0 33 2; +#X connect 27 0 33 4; +#X connect 33 0 32 0; +#X connect 33 0 20 0; #X connect 34 0 33 0; -#X connect 34 0 21 0; -#X connect 35 0 34 0; #X restore 526 909 pd masking_mode2; #X obj 97 961 cnv 15 15 15 empty empty empty 20 12 0 14 #c6ffc7 #404040 0; @@ -824,6 +822,7 @@ pairs. frequency is normalised (0-1) \, amp in dB, f 53; #X connect 4 0 5 0; #X connect 4 1 2 0; #X restore 139 372 pd getsr; +#X text 33 779 3) Select which components to hear:; #X connect 8 0 18 1; #X connect 8 0 18 0; #X connect 9 0 8 1; @@ -831,8 +830,8 @@ pairs. frequency is normalised (0-1) \, amp in dB, f 53; #X connect 10 0 18 0; #X connect 11 0 10 1; #X connect 12 0 17 0; +#X connect 12 0 39 0; #X connect 12 0 40 0; -#X connect 12 0 41 0; #X connect 13 0 23 0; #X connect 14 0 13 0; #X connect 15 0 16 0; @@ -850,6 +849,6 @@ pairs. frequency is normalised (0-1) \, amp in dB, f 53; #X connect 29 0 18 1; #X connect 30 0 29 1; #X connect 32 0 23 0; -#X connect 40 0 14 0; -#X connect 41 0 15 0; -#X connect 42 0 32 0; +#X connect 39 0 14 0; +#X connect 40 0 15 0; +#X connect 41 0 32 0; diff --git a/help/fluid.kdtree-help.pd b/help/fluid.kdtree-help.pd index 81b22b0..81a19ef 100644 --- a/help/fluid.kdtree-help.pd +++ b/help/fluid.kdtree-help.pd @@ -1,10 +1,10 @@ -#N struct 18297-rectangle float x float c; -#N struct 18297-pixel float x0 float y0 float x1 float y1; -#N struct 18298-rectangle float x float c; -#N struct 18298-pixel float x0 float y0 float x1 float y1; -#N struct 18312-rectangle float x float c; -#N struct 18312-pixel float x0 float y0 float x1 float y1; -#N canvas 110 80 698 714 12; +#N struct 1101-rectangle float x float c; +#N struct 1101-pixel float x0 float y0 float x1 float y1; +#N struct 1102-rectangle float x float c; +#N struct 1102-pixel float x0 float y0 float x1 float y1; +#N struct 1116-rectangle float x float c; +#N struct 1116-pixel float x0 float y0 float x1 float y1; +#N canvas 58 66 698 714 12; #X obj 18 19 cnv 15 660 42 empty empty fluid.kdtree 1 22 0 36 #4ba3fb #ffffff 0; #X obj 510 66 fluid.referencelauncher fluid.kdtree.html reference/kdtree/ @@ -13,7 +13,7 @@ 13 #e0e0e0 #404040 0; #X obj 18 66 cnv 15 488 17 empty empty A\\\ K-D\\\ tree. 4 8 0 13 #e0e0e0 #404040 0; -#N canvas 191 170 698 804 radius_&_neighbours 0; +#N canvas 139 103 698 804 radius_&_neighbours 0; #X obj 19 17 cnv 15 660 42 empty empty fluid.kdtree 1 22 0 36 #4ba3fb #ffffff 0; #X obj 19 64 cnv 15 488 17 empty empty A\\\ K-D\\\ tree. 4 8 0 13 #e0e0e0 @@ -73,9 +73,6 @@ kd_tree_h3_query[1] = random(0 \, 101) * 0.01; #X obj 21 707 list trim; #X obj 21 731 s kd_tree_h3_plotter; #X obj 31 206 r kd_tree_h3_plotter; -#X text 40 141 1) Generate random data to be stored in the fluid.dataset -, f 30; -#X text 237 186 2) Click and drag around this space, f 17; #X obj 34 611 r kd_tree_h3_tree; #X obj 356 235 cnv 15 330 135 empty empty Radius\\\ vs\\\ Number\\\ of\\\ Neighbours 4 8 0 13 #dfdfdf #404040 0; @@ -104,8 +101,17 @@ radius is searched \; number of returned points is uncapped, f 45 ; #X msg 362 687 \; kd_tree_h3_tree numneighbours 0 \, radius 0.3; #X msg 362 722 \; kd_tree_h3_tree numneighbours 0 \, radius 0.09; -#X text 395 197 3) Experiment with the numneighbours and radius constraints. -, f 37; +#X obj 40 143 cnv 15 15 15 empty empty empty 20 12 0 14 #c6ffc7 #404040 +0; +#X obj 237 188 cnv 15 15 15 empty empty empty 20 12 0 14 #c6ffc7 #404040 +0; +#X obj 395 187 cnv 15 15 15 empty empty empty 20 12 0 14 #c6ffc7 #404040 +0; +#X text 40 141 1) Generate random data to be stored in the fluid.dataset +, f 30; +#X text 237 186 2) Click and drag around this space, f 17; +#X text 395 186 3) Experiment with changing the numneighbours and radius +constraints \, then browse again the 2d space., f 37; #X connect 3 0 4 0; #X connect 4 0 5 0; #X connect 5 0 6 0; @@ -117,20 +123,15 @@ radius is searched \; number of returned points is uncapped, f 45 #X connect 12 0 13 0; #X connect 13 0 14 0; #X connect 15 0 5 0; -#X connect 18 0 10 0; +#X connect 16 0 10 0; #X restore 491 653 pd radius_&_neighbours; -#N canvas 112 98 698 764 stripping_it_back 0; +#N canvas 175 102 698 764 stripping_it_back 0; #X obj 19 17 cnv 15 660 42 empty empty fluid.kdtree 1 22 0 36 #4ba3fb #ffffff 0; #X obj 19 64 cnv 15 488 17 empty empty A\\\ K-D\\\ tree. 4 8 0 13 #e0e0e0 #404040 0; #X text 20 96 A stripped back example for how to fluid.kdtree works ; -#X text 317 213 2) Fit a kdtree to the dataset that was just made; -#X text 67 135 1) Create a dataset with four \, two-dimensional points -; -#X text 234 342 3) Move the knob around to create a "query" for the -kdtree, f 34; #X obj 46 137 bng 15 250 50 0 empty empty empty 17 7 0 10 #fcfcfc #000000 #000000; #X obj 46 157 t b b b b b, f 23; @@ -202,30 +203,41 @@ stored point in the dataset is closest to this., f 31; to the input to see how "close" they are., f 40; #X text 24 677 This is the identifier of the point as it was entered in the dataset., f 27; -#X connect 6 0 7 0; -#X connect 7 0 9 0; -#X connect 7 1 10 0; -#X connect 7 2 11 0; -#X connect 7 3 12 0; -#X connect 7 4 8 1; -#X connect 9 0 8 0; -#X connect 10 0 8 0; -#X connect 11 0 8 0; -#X connect 12 0 8 0; -#X connect 17 0 18 0; -#X connect 19 0 21 0; -#X connect 20 0 22 0; -#X connect 21 0 20 0; -#X connect 21 1 20 0; -#X connect 22 0 23 0; -#X connect 22 0 30 0; -#X connect 23 0 24 0; +#X obj 67 136 cnv 15 15 15 empty empty empty 20 12 0 14 #c6ffc7 #404040 +0; +#X obj 316 215 cnv 15 15 15 empty empty empty 20 12 0 14 #c6ffc7 #404040 +0; +#X obj 234 343 cnv 15 15 15 empty empty empty 20 12 0 14 #c6ffc7 #404040 +0; +#X text 317 213 2) Fit a kdtree to the dataset that was just made; +#X text 67 135 1) Create a dataset with four \, two-dimensional points +; +#X text 234 342 3) Move the knob around to create a "query" for the +kdtree, f 34; +#X connect 3 0 4 0; +#X connect 4 0 6 0; +#X connect 4 1 7 0; +#X connect 4 2 8 0; +#X connect 4 3 9 0; +#X connect 4 4 5 1; +#X connect 6 0 5 0; +#X connect 7 0 5 0; +#X connect 8 0 5 0; +#X connect 9 0 5 0; +#X connect 14 0 15 0; +#X connect 16 0 18 0; +#X connect 17 0 19 0; +#X connect 18 0 17 0; +#X connect 18 1 17 0; +#X connect 19 0 20 0; +#X connect 19 0 27 0; +#X connect 20 0 21 0; +#X connect 21 0 22 0; +#X connect 22 0 26 0; +#X connect 22 0 24 0; #X connect 24 0 25 0; -#X connect 25 0 29 0; -#X connect 25 0 27 0; +#X connect 26 0 23 0; #X connect 27 0 28 0; -#X connect 29 0 26 0; -#X connect 30 0 31 0; #X restore 491 631 pd stripping_it_back; #X text 18 85 A K-dimensional tree for efficient neighbourhood searches of multi-dimensional data.; @@ -313,10 +325,6 @@ of multi-dimensional data.; #X obj 119 177 r kd_tree_h1_plotter; #X msg 326 644 highlight \$1; #X obj 326 668 s kd_tree_h1_plotter; -#X text 327 203 2) Click and drag around this space.; -#X text 41 142 1) For demonstrative purposes much of this first example -is preanalused and pretrained data. This button loads in this subpatch -when the helpfle is opened, f 86; #X text 330 266 Each of these points on this space represents a small segment of a large sound file. Using audio descriptors each segment is assigned two values \, loudness and spectral centroid \, that attempt @@ -354,6 +362,14 @@ space., f 49; #X restore 108 644 pd player; #X obj 108 668 fluid.out~; #X obj 491 676 note_on_automatic_datasets; +#X obj 41 144 cnv 15 15 15 empty empty empty 20 12 0 14 #c6ffc7 #404040 +0; +#X obj 326 204 cnv 15 15 15 empty empty empty 20 12 0 14 #c6ffc7 #404040 +0; +#X text 327 203 2) Click and drag around this space.; +#X text 41 142 1) For demonstrative purposes much of this first example +is preanalused and pretrained data. This button loads in this subpatch +when the helpfle is opened, f 86; #X connect 7 0 8 0; #X connect 8 0 9 0; #X connect 9 0 11 0; @@ -362,11 +378,11 @@ space., f 49; #X connect 12 0 13 0; #X connect 13 0 15 0; #X connect 15 0 16 0; -#X connect 15 0 25 0; +#X connect 15 0 23 0; #X connect 16 0 18 0; #X connect 17 0 9 0; #X connect 18 0 19 0; -#X connect 24 0 26 0; -#X connect 25 0 24 0; -#X connect 26 0 27 0; -#X connect 26 0 27 1; +#X connect 22 0 24 0; +#X connect 23 0 22 0; +#X connect 24 0 25 0; +#X connect 24 0 25 1; diff --git a/help/fluid.labelset-help.pd b/help/fluid.labelset-help.pd index b68d451..630cead 100644 --- a/help/fluid.labelset-help.pd +++ b/help/fluid.labelset-help.pd @@ -14,7 +14,7 @@ with labels.; 0; #X text 252 174 1) Add labels with the addlabel