Pd-cvs May 2005

pd-cvs@lists.iem.at

14 participants
407 discussions

externals/build/doc standardize-help.sh,1.1,NONE
by Hans-Christoph Steiner 21 May '05

21 May '05

Update of /cvsroot/pure-data/externals/build/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27540 Removed Files: standardize-help.sh Log Message: moved to scripts section --- standardize-help.sh DELETED ---

1 0

externals/hcs/hid README, NONE, 1.1 TODO, 1.15, 1.16 hid_graph.pd, 1.5, 1.6 hid_polar-help.pd, 1.2, 1.3 hid_polar.pd, 1.1, 1.2 joystick-help.pd, 1.9, 1.10
by Hans-Christoph Steiner 21 May '05

21 May '05

Update of /cvsroot/pure-data/externals/hcs/hid In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25545 Modified Files: TODO hid_graph.pd hid_polar-help.pd hid_polar.pd joystick-help.pd Added Files: README Log Message: added and updated comments Index: hid_graph.pd =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/hid/hid_graph.pd,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** hid_graph.pd 16 Dec 2004 04:42:27 -0000 1.5 --- hid_graph.pd 21 May 2005 02:41:51 -0000 1.6 *************** *** 1,8 **** ! #N canvas 161 50 507 536 10; #X obj 20 178 inlet; ! #N canvas 0 22 462 312 graph5 0; ! #X array \$0-hid_graph_array 100 float 2; #X coords 0 1 100 0 100 100 1; ! #X restore 2 46 graph; #X obj 115 368 outlet; #X text 155 301 gives a range of 0-100; --- 1,8 ---- ! #N canvas 606 208 515 544 10; #X obj 20 178 inlet; ! #N canvas 0 22 466 316 graph5 0; ! #X array \$0-hid 100 float 2; #X coords 0 1 100 0 100 100 1; ! #X restore -1 20 graph; #X obj 115 368 outlet; #X text 155 301 gives a range of 0-100; --- NEW FILE: README --- BINARIES -------- There are two included binaries: hid.pd_darwin = Darwin/PowerPC and Mac OS X hid.pd_linux = Linux/PowerPC COMPILING --------- The compiler needs to know where the Pd source is to find the headers, and the linker needs to know where the Pd binary is to check symbols. You can either set these on the command line or edit the Makefile make INCLUDE=/path/to/pd/src PDEXECUTABLE=/path/to/pd/bin/pd On GNU/Linux, this is likely to look like: make INCLUDE=/usr/local/src/pd-0.38-2/src PDEXECUTABLE=/usr/local/bin/pd On Darwin/Mac OS X, this is like to look like: make INCLUDE=/usr/local/src/pd/src PDEXECUTABLE=/Applications/Pd.app/Contents/Resources/bin/pd COMPILING A DEBUG VERSION ------------------------- To compile a debug version, edit these lines in hid.c (about line 32): //#define DEBUG(x) #define DEBUG(x) x Swap the commented lines so it looks like the lines above then recompile. INSTALL ------- To install, you can add these lines to your .pdrc: -path /path/to/hid-0.5 -helppath /path/to/hid-0.5 Or you can copy the files to another place: mv *-help.pd examples/*.pd /path/to/doc/5.reference mv *.pd *.pd_* /path/to/extra .hc Index: hid_polar-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/hid/hid_polar-help.pd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** hid_polar-help.pd 26 Apr 2005 03:50:24 -0000 1.2 --- hid_polar-help.pd 21 May 2005 02:41:51 -0000 1.3 *************** *** 1,3 **** ! #N canvas 601 232 478 451 10; #X obj 5 2 cnv 15 450 20 empty empty [hid_polar] 2 11 1 18 -233017 -66577 0; --- 1,3 ---- ! #N canvas 601 232 482 455 10; #X obj 5 2 cnv 15 450 20 empty empty [hid_polar] 2 11 1 18 -233017 -66577 0; *************** *** 6,18 **** #X floatatom 100 248 5 0 0 0 - - -; #X floatatom 100 335 7 0 0 0 radius-> - -; ! #X text 175 375 For more info:; ! #X obj 279 373 pddp_open all_about_hid_mapping; #X obj 100 295 hid_polar; #X text 27 397 (C) Copyright 2005 Hans-Christoph Steiner <hans(a)at.or.at> ; #X obj 101 161 hsl 128 15 0 1 0 0 empty empty x-axis 133 7 1 10 -225280 ! -1 -1 6350 0; #X obj 157 103 vsl 15 128 0 1 0 0 empty empty y-axis -6 -9 1 10 -261681 ! -1 -1 6350 0; #X floatatom 159 335 7 0 0 1 <-angle - -; #X floatatom 158 248 5 0 0 0 - - -; --- 6,18 ---- #X floatatom 100 248 5 0 0 0 - - -; #X floatatom 100 335 7 0 0 0 radius-> - -; ! #X text 124 370 For more info:; ! #X obj 228 368 pddp_open all_about_hid_mapping; #X obj 100 295 hid_polar; #X text 27 397 (C) Copyright 2005 Hans-Christoph Steiner <hans(a)at.or.at> ; #X obj 101 161 hsl 128 15 0 1 0 0 empty empty x-axis 133 7 1 10 -225280 ! -1 -1 0 0; #X obj 157 103 vsl 15 128 0 1 0 0 empty empty y-axis -6 -9 1 10 -261681 ! -1 -1 0 0; #X floatatom 159 335 7 0 0 1 <-angle - -; #X floatatom 158 248 5 0 0 0 - - -; Index: hid_polar.pd =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/hid/hid_polar.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** hid_polar.pd 13 Apr 2005 03:47:19 -0000 1.1 --- hid_polar.pd 21 May 2005 02:41:51 -0000 1.2 *************** *** 1,15 **** ! #N canvas 328 234 464 407 10; #X obj 30 58 inlet; ! #X obj 25 323 outlet; ! #X text 73 323 output range: 0 to 1; #X text 72 57 input range: 0 to 1; #X text 11 5 [hid_polar]; ! #X obj 232 322 outlet; #X obj 224 56 inlet; #X text 264 57 input range: 0 to 1; #X text 29 29 x-axis value; #X text 221 26 y-axis value; ! #X obj 25 292 / 1.41421; ! #X text 92 292 (sqrt 2); #X obj 104 220 cart2pol; #X obj 223 85 t b f; --- 1,15 ---- ! #N canvas 328 234 468 411 10; #X obj 30 58 inlet; ! #X obj 25 313 outlet; ! #X text 73 313 output range: 0 to 1; #X text 72 57 input range: 0 to 1; #X text 11 5 [hid_polar]; ! #X obj 232 312 outlet; #X obj 224 56 inlet; #X text 264 57 input range: 0 to 1; #X text 29 29 x-axis value; #X text 221 26 y-axis value; ! #X obj 25 282 / 1.41421; ! #X text 92 282 (sqrt 2); #X obj 104 220 cart2pol; #X obj 223 85 t b f; *************** *** 20,28 **** #X obj 29 120 * 2; #X text 61 125 convert range to -1 to 1; ! #X text 280 322 output range: 0 to 1; #X text 245 371 released under the GNU GPL; #X text 28 357 (C) Copyright 2005 Hans-Christoph Steiner <hans(a)at.or.at> ; ! #X obj 231 290 rad2hid; #X connect 0 0 18 0; #X connect 6 0 13 0; --- 20,30 ---- #X obj 29 120 * 2; #X text 61 125 convert range to -1 to 1; ! #X text 280 312 output range: 0 to 1; #X text 245 371 released under the GNU GPL; #X text 28 357 (C) Copyright 2005 Hans-Christoph Steiner <hans(a)at.or.at> ; ! #X obj 231 280 rad2hid; ! #X text 23 331 radius; ! #X text 230 332 angle; #X connect 0 0 18 0; #X connect 6 0 13 0; Index: TODO =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/hid/TODO,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** TODO 26 Apr 2005 04:44:38 -0000 1.15 --- TODO 21 May 2005 02:41:50 -0000 1.16 *************** *** 137,144 **** --- 137,150 ---- [hid_debounce] + [hid_vector] - angle and distance for mouse/relative data + peak finder object "kalman filters" + Curves!! + + http://www.2dcurves.com + /++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\ Index: joystick-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/hid/joystick-help.pd,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** joystick-help.pd 26 Apr 2005 03:50:24 -0000 1.9 --- joystick-help.pd 21 May 2005 02:41:51 -0000 1.10 *************** *** 1,4 **** ! #N canvas 248 419 666 464 10; ! #X obj 168 91 tgl 25 0 empty empty empty 0 -6 0 8 -225271 -1 -1 0 1 ; #X floatatom 63 234 7 0 0 3 Y-axis - -; --- 1,4 ---- ! #N canvas 31 125 670 468 10; ! #X obj 168 91 tgl 25 0 empty empty empty 0 -6 0 8 -225271 -1 -1 1 1 ; #X floatatom 63 234 7 0 0 3 Y-axis - -; *************** *** 41,48 **** #X floatatom 245 234 5 0 0 3 hat0X - -; #X floatatom 288 234 5 0 0 3 hat0Y - -; - #X msg 220 112 open 3; #X obj 212 291 route btn_0 btn_1 btn_2 btn_3 btn_4 btn_5 btn_6 btn_7 btn_8 btn_9; - #X msg 225 131 open 5; #X obj 168 154 joystick 0; #N canvas 674 327 446 497 joystick_noise 0; --- 41,46 ---- *************** *** 99,103 **** #X connect 22 0 5 0; #X restore 440 155 pd joystick_noise; ! #X obj 440 92 tgl 25 0 empty empty empty 0 -6 0 8 -225271 -1 -1 1 1 ; #X text 333 73 Select your device and turn on to make noise:; --- 97,101 ---- #X connect 22 0 5 0; #X restore 440 155 pd joystick_noise; ! #X obj 440 92 tgl 25 0 empty empty empty 0 -6 0 8 -225271 -1 -1 0 1 ; #X text 333 73 Select your device and turn on to make noise:; *************** *** 105,145 **** #X msg 503 125 open \$1; #X obj 503 105 hradio 15 1 1 8 \$0-device-number empty choose_a_device ! 0 -6 1 9 -262144 -1 -1 0; #X obj 477 105 nbx 1 14 -1e+37 1e+37 0 0 empty \$0-device-number empty ! 0 -6 0 14 -166441 -1 -1 0 256; #X text 8 36 Use a joystick device with Pd. This object auto-calibrates the output of axis data. Move each element of the device thru its full range to calibrate it.; #X obj 335 215 unpack s f; ! #X obj 339 375 pddp_open all_about_hid_mapping; #X text 422 177 (remember to calibrate all parts; #X text 430 190 of the joystick first); #X msg 394 120 print; ! #X connect 0 0 31 0; ! #X connect 19 0 31 0; ! #X connect 28 0 31 0; ! #X connect 29 0 3 0; ! #X connect 29 1 4 0; ! #X connect 29 2 5 0; ! #X connect 29 3 6 0; ! #X connect 29 4 9 0; ! #X connect 29 5 10 0; ! #X connect 29 6 11 0; ! #X connect 29 7 12 0; ! #X connect 29 8 13 0; ! #X connect 29 9 14 0; ! #X connect 30 0 31 0; ! #X connect 31 0 2 0; ! #X connect 31 1 1 0; ! #X connect 31 2 7 0; ! #X connect 31 3 8 0; ! #X connect 31 4 26 0; ! #X connect 31 5 27 0; ! #X connect 31 6 29 0; ! #X connect 31 6 40 0; ! #X connect 33 0 32 0; ! #X connect 36 0 32 1; ! #X connect 37 0 36 0; ! #X connect 40 0 15 0; ! #X connect 40 1 16 0; ! #X connect 44 0 32 0; --- 103,145 ---- #X msg 503 125 open \$1; #X obj 503 105 hradio 15 1 1 8 \$0-device-number empty choose_a_device ! 0 -6 1 9 -262144 -1 -1 2; #X obj 477 105 nbx 1 14 -1e+37 1e+37 0 0 empty \$0-device-number empty ! 0 -6 0 14 -166441 -1 -1 2 256; #X text 8 36 Use a joystick device with Pd. This object auto-calibrates the output of axis data. Move each element of the device thru its full range to calibrate it.; #X obj 335 215 unpack s f; ! #X obj 407 375 pddp_open all_about_hid_mapping; #X text 422 177 (remember to calibrate all parts; #X text 430 190 of the joystick first); #X msg 394 120 print; ! #X msg 220 112 open 2; ! #X msg 225 131 open 3; ! #X connect 0 0 29 0; ! #X connect 19 0 29 0; ! #X connect 28 0 3 0; ! #X connect 28 1 4 0; ! #X connect 28 2 5 0; ! #X connect 28 3 6 0; ! #X connect 28 4 9 0; ! #X connect 28 5 10 0; ! #X connect 28 6 11 0; ! #X connect 28 7 12 0; ! #X connect 28 8 13 0; ! #X connect 28 9 14 0; ! #X connect 29 0 2 0; ! #X connect 29 1 1 0; ! #X connect 29 2 7 0; ! #X connect 29 3 8 0; ! #X connect 29 4 26 0; ! #X connect 29 5 27 0; ! #X connect 29 6 28 0; ! #X connect 29 6 38 0; ! #X connect 31 0 30 0; ! #X connect 34 0 30 1; ! #X connect 35 0 34 0; ! #X connect 38 0 15 0; ! #X connect 38 1 16 0; ! #X connect 42 0 30 0; ! #X connect 43 0 29 0; ! #X connect 44 0 29 0;

1 0

externals/build/doc makefile,1.12,1.13
by Hans-Christoph Steiner 20 May '05

20 May '05

Update of /cvsroot/pure-data/externals/build/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28952 Modified Files: makefile Log Message: updated for my new dir layout, and removed ann stuff since its out of date Index: makefile =================================================================== RCS file: /cvsroot/pure-data/externals/build/doc/makefile,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** makefile 26 Apr 2005 04:41:12 -0000 1.12 --- makefile 20 May 2005 20:55:43 -0000 1.13 *************** *** 15,19 **** ../../signal/*/*.pd \ ../../aenv~/*.pd \ - ../../ann/examples/*.* \ ../../arraysize/*.pd \ ../../beatpipe/*.pd \ --- 15,18 ---- *************** *** 30,33 **** --- 29,33 ---- ../../ff/*.pd \ ../../hcs/*-help.pd \ + ../../hcs/*/doc/*.pd \ ../../hcs/hid/examples/*.pd \ ../../hcs/hid/*-help.pd \

1 0

externals/ann/src ann_mlp.c, 1.5, 1.6 ann_td.c, 1.5, 1.6 makefile.msvc, 1.3, 1.4
by dmorelli 20 May '05

20 May '05

Update of /cvsroot/pure-data/externals/ann/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28233 Modified Files: ann_mlp.c ann_td.c makefile.msvc Log Message: mlp and td ready to be compiled as a single file (library) ann.c needs to be changed: we should add #include ann_*.c Index: ann_mlp.c =================================================================== RCS file: /cvsroot/pure-data/externals/ann/src/ann_mlp.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ann_mlp.c 20 May 2005 11:06:37 -0000 1.5 --- ann_mlp.c 20 May 2005 20:53:00 -0000 1.6 *************** *** 11,16 **** #include "fann.h" - #define VERSION "0.03" #ifndef __DATE__ #define __DATE__ "" --- 11,18 ---- #include "fann.h" + #ifndef VERSION + #define VERSION "0.2" + #endif #ifndef __DATE__ #define __DATE__ "" *************** *** 37,41 **** } t_ann_mlp; ! static void help(t_ann_mlp *x) { post(""); --- 39,43 ---- } t_ann_mlp; ! static void ann_mlp_help(t_ann_mlp *x) { post(""); *************** *** 49,53 **** } ! static void createFann(t_ann_mlp *x, t_symbol *sl, int argc, t_atom *argv) { unsigned int num_input = 2; --- 51,55 ---- } ! static void ann_mlp_createFann(t_ann_mlp *x, t_symbol *sl, int argc, t_atom *argv) { unsigned int num_input = 2; *************** *** 78,82 **** if (num_input>MAXINPUT) { ! error("too many inputs, maximum allowed is %d",MAXINPUT); return; } --- 80,84 ---- if (num_input>MAXINPUT) { ! error("too many inputs, maximum allowed is MAXINPUT"); return; } *************** *** 84,88 **** if (num_output>MAXOUTPUT) { ! error("too many outputs, maximum allowed is %d", MAXOUTPUT); return; } --- 86,90 ---- if (num_output>MAXOUTPUT) { ! error("too many outputs, maximum allowed is MAXOUTPUT"); return; } *************** *** 109,113 **** } ! static void print_status(t_ann_mlp *x) { if (x->mode == TRAIN) --- 111,115 ---- } ! static void ann_mlp_print_status(t_ann_mlp *x) { if (x->mode == TRAIN) *************** *** 117,121 **** } ! static void train(t_ann_mlp *x) { x->mode=TRAIN; --- 119,123 ---- } ! static void ann_mlp_train(t_ann_mlp *x) { x->mode=TRAIN; *************** *** 126,139 **** } fann_reset_MSE(x->ann); ! print_status(x); } ! static void run(t_ann_mlp *x) { x->mode=RUN; ! print_status(x); } ! static void set_mode(t_ann_mlp *x, t_symbol *sl, int argc, t_atom *argv) { if (argc<1) --- 128,141 ---- } fann_reset_MSE(x->ann); ! ann_mlp_print_status(x); } ! static void ann_mlp_run(t_ann_mlp *x) { x->mode=RUN; ! ann_mlp_print_status(x); } ! static void ann_mlp_set_mode(t_ann_mlp *x, t_symbol *sl, int argc, t_atom *argv) { if (argc<1) *************** *** 144,148 **** { x->mode = atom_getint(argv++); ! print_status(x); } } --- 146,150 ---- { x->mode = atom_getint(argv++); ! ann_mlp_print_status(x); } } *************** *** 150,154 **** ! static void train_on_file(t_ann_mlp *x, t_symbol *sl, int argc, t_atom *argv) { if (x->ann == 0) --- 152,156 ---- ! static void ann_mlp_train_on_file(t_ann_mlp *x, t_symbol *sl, int argc, t_atom *argv) { if (x->ann == 0) *************** *** 172,179 **** x->iterations_between_reports, x->desired_error); ! post("nn: finished training on file %s", x->filenametrain->s_name); } ! static void set_desired_error(t_ann_mlp *x, t_symbol *sl, int argc, t_atom *argv) { float desired_error = (float)0.001; --- 174,181 ---- x->iterations_between_reports, x->desired_error); ! post("ann_mlp: finished training on file %s", x->filenametrain->s_name); } ! static void ann_mlp_set_desired_error(t_ann_mlp *x, t_symbol *sl, int argc, t_atom *argv) { float desired_error = (float)0.001; *************** *** 189,193 **** } ! static void set_max_iterations(t_ann_mlp *x, t_symbol *sl, int argc, t_atom *argv) { unsigned int max_iterations = 500000; --- 191,195 ---- } ! static void ann_mlp_set_max_iterations(t_ann_mlp *x, t_symbol *sl, int argc, t_atom *argv) { unsigned int max_iterations = 500000; *************** *** 203,207 **** } ! static void set_iterations_between_reports(t_ann_mlp *x, t_symbol *sl, int argc, t_atom *argv) { --- 205,209 ---- } ! static void ann_mlp_set_iterations_between_reports(t_ann_mlp *x, t_symbol *sl, int argc, t_atom *argv) { *************** *** 222,226 **** // run the ann using floats in list passed to the inlet as input values // and send result to outlet as list of float ! static void run_the_net(t_ann_mlp *x, t_symbol *sl, int argc, t_atom *argv) { int i=0; --- 224,228 ---- // run the ann using floats in list passed to the inlet as input values // and send result to outlet as list of float ! static void ann_mlp_run_the_net(t_ann_mlp *x, t_symbol *sl, int argc, t_atom *argv) { int i=0; *************** *** 276,280 **** } ! static void train_on_the_fly(t_ann_mlp *x, t_symbol *sl, int argc, t_atom *argv) { int i=0; --- 278,282 ---- } ! static void ann_mlp_train_on_the_fly(t_ann_mlp *x, t_symbol *sl, int argc, t_atom *argv) { int i=0; *************** *** 335,349 **** } ! static void manage_list(t_ann_mlp *x, t_symbol *sl, int argc, t_atom *argv) { if (x->mode) ! run_the_net(x, sl, argc, argv); else { ! train_on_the_fly(x, sl, argc, argv); } } ! static void set_filename(t_ann_mlp *x, t_symbol *sl, int argc, t_atom *argv) { if (argc>0) { --- 337,351 ---- } ! static void ann_mlp_manage_list(t_ann_mlp *x, t_symbol *sl, int argc, t_atom *argv) { if (x->mode) ! ann_mlp_run_the_net(x, sl, argc, argv); else { ! ann_mlp_train_on_the_fly(x, sl, argc, argv); } } ! static void ann_mlp_set_filename(t_ann_mlp *x, t_symbol *sl, int argc, t_atom *argv) { if (argc>0) { *************** *** 356,360 **** } ! static void load_ann_from_file(t_ann_mlp *x, t_symbol *sl, int argc, t_atom *argv) { if (argc>0) { --- 358,362 ---- } ! static void ann_mlp_load_ann_from_file(t_ann_mlp *x, t_symbol *sl, int argc, t_atom *argv) { if (argc>0) { *************** *** 368,372 **** } ! static void save_ann_to_file(t_ann_mlp *x, t_symbol *sl, int argc, t_atom *argv) { if (argc>0) { --- 370,374 ---- } ! static void ann_mlp_save_ann_to_file(t_ann_mlp *x, t_symbol *sl, int argc, t_atom *argv) { if (argc>0) { *************** *** 384,388 **** // functions for training algo: ! static void set_FANN_TRAIN_INCREMENTAL(t_ann_mlp *x) { if (x->ann == 0) --- 386,390 ---- // functions for training algo: ! static void ann_mlp_set_FANN_TRAIN_INCREMENTAL(t_ann_mlp *x) { if (x->ann == 0) *************** *** 395,399 **** } } ! static void set_FANN_TRAIN_BATCH(t_ann_mlp *x) { if (x->ann == 0) --- 397,401 ---- } } ! static void ann_mlp_set_FANN_TRAIN_BATCH(t_ann_mlp *x) { if (x->ann == 0) *************** *** 406,410 **** } } ! static void set_FANN_TRAIN_RPROP(t_ann_mlp *x) { if (x->ann == 0) --- 408,412 ---- } } ! static void ann_mlp_set_FANN_TRAIN_RPROP(t_ann_mlp *x) { if (x->ann == 0) *************** *** 417,421 **** } } ! static void set_FANN_TRAIN_QUICKPROP(t_ann_mlp *x) { if (x->ann == 0) --- 419,423 ---- } } ! static void ann_mlp_set_FANN_TRAIN_QUICKPROP(t_ann_mlp *x) { if (x->ann == 0) *************** *** 429,433 **** } ! static void set_activation_function_output(t_ann_mlp *x, t_symbol *sl, int argc, t_atom *argv) { t_symbol *parametro = 0; --- 431,435 ---- } ! static void ann_mlp_set_activation_function_output(t_ann_mlp *x, t_symbol *sl, int argc, t_atom *argv) { t_symbol *parametro = 0; *************** *** 465,489 **** } ! static void print_ann_details(t_ann_mlp *x) { if (x->ann == 0) { ! post("nn:ann is not initialized"); } else { ! post("nn:follows a description of the current ann:"); ! post("nn:num_input=%i", x->ann->num_input); ! post("nn:num_output=%i", x->ann->num_output); ! post("nn:learning_rate=%f", x->ann->learning_rate); ! post("nn:connection_rate=%f", x->ann->connection_rate); ! post("nn:total_neurons=%i", x->ann->total_neurons); ! post("nn:total_connections=%i", x->ann->total_connections); ! post("nn:last error=%i", x->ann->errstr); if (x->filename == 0) { ! post("nn:filename not set"); } else { ! post("nn:filename=%s", x->filename->s_name); } } --- 467,491 ---- } ! static void ann_mlp_print_ann_details(t_ann_mlp *x) { if (x->ann == 0) { ! post("ann_mlp:ann is not initialized"); } else { ! post("follows a description of the current ann:"); ! post("num_input=%i", x->ann->num_input); ! post("num_output=%i", x->ann->num_output); ! post("learning_rate=%f", x->ann->learning_rate); ! post("connection_rate=%f", x->ann->connection_rate); ! post("total_neurons=%i", x->ann->total_neurons); ! post("total_connections=%i", x->ann->total_connections); ! post("last error=%i", x->ann->errstr); if (x->filename == 0) { ! post("ann_mlp:filename not set"); } else { ! post("filename=%s", x->filename->s_name); } } *************** *** 491,495 **** ! static void *nn_new(t_symbol *s, int argc, t_atom *argv) { t_ann_mlp *x = (t_ann_mlp *)pd_new(ann_mlp_class); --- 493,497 ---- ! static void *ann_mlp_new(t_symbol *s, int argc, t_atom *argv) { t_ann_mlp *x = (t_ann_mlp *)pd_new(ann_mlp_class); *************** *** 504,514 **** if (argc>0) { x->filename = atom_gensym(argv); ! load_ann_from_file(x, NULL , 0, NULL); } return (void *)x; } // free resources ! static void nn_free(t_ann_mlp *x) { struct fann *ann = x->ann; --- 506,524 ---- if (argc>0) { x->filename = atom_gensym(argv); ! ann_mlp_load_ann_from_file(x, NULL , 0, NULL); } + + post(""); + post("ann_mlp: neural nets for PD"); + post("version: "VERSION""); + post("compiled: "__DATE__); + post("author: Davide Morelli"); + post("contact: info(a)davidemorelli.it www.davidemorelli.it"); + return (void *)x; } // free resources ! static void ann_mlp_free(t_ann_mlp *x) { struct fann *ann = x->ann; *************** *** 519,561 **** void ann_mlp_setup(void) { - post(""); - post("ann_mlp: neural nets for PD"); - post("version: "VERSION""); - post("compiled: "__DATE__); - post("author: Davide Morelli"); - post("contact: info(a)davidemorelli.it www.davidemorelli.it"); - ann_mlp_class = class_new(gensym("ann_mlp"), ! (t_newmethod)nn_new, ! (t_method)nn_free, sizeof(t_ann_mlp), CLASS_DEFAULT, A_GIMME, 0); // general.. ! class_addmethod(ann_mlp_class, (t_method)help, gensym("help"), 0); ! class_addmethod(ann_mlp_class, (t_method)createFann, gensym("create"), A_GIMME, 0); ! class_addmethod(ann_mlp_class, (t_method)train, gensym("train"), 0); ! class_addmethod(ann_mlp_class, (t_method)run, gensym("run"), 0); ! class_addmethod(ann_mlp_class, (t_method)set_mode, gensym("setmode"), A_GIMME, 0); ! class_addmethod(ann_mlp_class, (t_method)train_on_file, gensym("train-on-file"), A_GIMME, 0); ! class_addmethod(ann_mlp_class, (t_method)manage_list, gensym("data"), A_GIMME, 0); ! class_addmethod(ann_mlp_class, (t_method)set_filename, gensym("filename"), A_GIMME, 0); ! class_addmethod(ann_mlp_class, (t_method)load_ann_from_file, gensym("load"),A_GIMME, 0); ! class_addmethod(ann_mlp_class, (t_method)save_ann_to_file, gensym("save"),A_GIMME, 0); ! class_addmethod(ann_mlp_class, (t_method)print_ann_details, gensym("details"), 0); // change training parameters ! class_addmethod(ann_mlp_class, (t_method)set_desired_error, gensym("desired_error"),A_GIMME, 0); ! class_addmethod(ann_mlp_class, (t_method)set_max_iterations, gensym("max_iterations"),A_GIMME, 0); ! class_addmethod(ann_mlp_class, (t_method)set_iterations_between_reports, gensym("iterations_between_reports"),A_GIMME, 0); // change training and activation algorithms ! class_addmethod(ann_mlp_class, (t_method)set_FANN_TRAIN_INCREMENTAL, gensym("FANN_TRAIN_INCREMENTAL"), 0); ! class_addmethod(ann_mlp_class, (t_method)set_FANN_TRAIN_BATCH, gensym("FANN_TRAIN_BATCH"), 0); ! class_addmethod(ann_mlp_class, (t_method)set_FANN_TRAIN_RPROP, gensym("FANN_TRAIN_RPROP"), 0); ! class_addmethod(ann_mlp_class, (t_method)set_FANN_TRAIN_QUICKPROP, gensym("FANN_TRAIN_QUICKPROP"), 0); ! class_addmethod(ann_mlp_class, (t_method)set_activation_function_output, gensym("set_activation_function_output"),A_GIMME, 0); // the most important one: running the ann ! class_addlist(ann_mlp_class, (t_method)manage_list); // help patch --- 529,564 ---- void ann_mlp_setup(void) { ann_mlp_class = class_new(gensym("ann_mlp"), ! (t_newmethod)ann_mlp_new, ! (t_method)ann_mlp_free, sizeof(t_ann_mlp), CLASS_DEFAULT, A_GIMME, 0); // general.. ! class_addmethod(ann_mlp_class, (t_method)ann_mlp_help, gensym("help"), 0); ! class_addmethod(ann_mlp_class, (t_method)ann_mlp_createFann, gensym("create"), A_GIMME, 0); ! class_addmethod(ann_mlp_class, (t_method)ann_mlp_train, gensym("train"), 0); ! class_addmethod(ann_mlp_class, (t_method)ann_mlp_run, gensym("run"), 0); ! class_addmethod(ann_mlp_class, (t_method)ann_mlp_set_mode, gensym("setmode"), A_GIMME, 0); ! class_addmethod(ann_mlp_class, (t_method)ann_mlp_train_on_file, gensym("train-on-file"), A_GIMME, 0); ! class_addmethod(ann_mlp_class, (t_method)ann_mlp_manage_list, gensym("data"), A_GIMME, 0); ! class_addmethod(ann_mlp_class, (t_method)ann_mlp_set_filename, gensym("filename"), A_GIMME, 0); ! class_addmethod(ann_mlp_class, (t_method)ann_mlp_load_ann_from_file, gensym("load"),A_GIMME, 0); ! class_addmethod(ann_mlp_class, (t_method)ann_mlp_save_ann_to_file, gensym("save"),A_GIMME, 0); ! class_addmethod(ann_mlp_class, (t_method)ann_mlp_print_ann_details, gensym("details"), 0); // change training parameters ! class_addmethod(ann_mlp_class, (t_method)ann_mlp_set_desired_error, gensym("desired_error"),A_GIMME, 0); ! class_addmethod(ann_mlp_class, (t_method)ann_mlp_set_max_iterations, gensym("max_iterations"),A_GIMME, 0); ! class_addmethod(ann_mlp_class, (t_method)ann_mlp_set_iterations_between_reports, gensym("iterations_between_reports"),A_GIMME, 0); // change training and activation algorithms ! class_addmethod(ann_mlp_class, (t_method)ann_mlp_set_FANN_TRAIN_INCREMENTAL, gensym("FANN_TRAIN_INCREMENTAL"), 0); ! class_addmethod(ann_mlp_class, (t_method)ann_mlp_set_FANN_TRAIN_BATCH, gensym("FANN_TRAIN_BATCH"), 0); ! class_addmethod(ann_mlp_class, (t_method)ann_mlp_set_FANN_TRAIN_RPROP, gensym("FANN_TRAIN_RPROP"), 0); ! class_addmethod(ann_mlp_class, (t_method)ann_mlp_set_FANN_TRAIN_QUICKPROP, gensym("FANN_TRAIN_QUICKPROP"), 0); ! class_addmethod(ann_mlp_class, (t_method)ann_mlp_set_activation_function_output, gensym("set_activation_function_output"),A_GIMME, 0); // the most important one: running the ann ! class_addlist(ann_mlp_class, (t_method)ann_mlp_manage_list); // help patch Index: ann_td.c =================================================================== RCS file: /cvsroot/pure-data/externals/ann/src/ann_td.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ann_td.c 20 May 2005 11:06:37 -0000 1.5 --- ann_td.c 20 May 2005 20:53:00 -0000 1.6 *************** *** 11,16 **** #include "fann.h" - #define VERSION "0.01" #ifndef __DATE__ #define __DATE__ "" --- 11,18 ---- #include "fann.h" + #ifndef VERSION + #define VERSION "0.2" + #endif #ifndef __DATE__ #define __DATE__ "" *************** *** 41,45 **** } t_ann_td; ! static void help(t_ann_td *x) { post(""); --- 43,47 ---- } t_ann_td; ! static void ann_td_help(t_ann_td *x) { post(""); *************** *** 53,57 **** } ! static void deallocate_inputs(t_ann_td *x) { if (x->inputs != 0) --- 55,59 ---- } ! static void ann_td_deallocate_inputs(t_ann_td *x) { if (x->inputs != 0) *************** *** 62,69 **** } ! static void allocate_inputs(t_ann_td *x) { unsigned int i; ! deallocate_inputs(x); // allocate space for inputs array x->inputs = (t_float *)getbytes((x->frames) * (x->num_input) * sizeof(t_float)); --- 64,71 ---- } ! static void ann_td_allocate_inputs(t_ann_td *x) { unsigned int i; ! ann_td_deallocate_inputs(x); // allocate space for inputs array x->inputs = (t_float *)getbytes((x->frames) * (x->num_input) * sizeof(t_float)); *************** *** 71,75 **** } ! static void createFann(t_ann_td *x, t_symbol *sl, int argc, t_atom *argv) { unsigned int num_input = 2; --- 73,77 ---- } ! static void ann_td_createFann(t_ann_td *x, t_symbol *sl, int argc, t_atom *argv) { unsigned int num_input = 2; *************** *** 127,131 **** fann_set_activation_function_output(x->ann, FANN_SIGMOID_SYMMETRIC); ! allocate_inputs(x); if (x->ann == 0) --- 129,133 ---- fann_set_activation_function_output(x->ann, FANN_SIGMOID_SYMMETRIC); ! ann_td_allocate_inputs(x); if (x->ann == 0) *************** *** 145,149 **** } ! static void print_status(t_ann_td *x) { if (x->mode == TRAIN) --- 147,151 ---- } ! static void ann_td_print_status(t_ann_td *x) { if (x->mode == TRAIN) *************** *** 153,157 **** } ! static void train(t_ann_td *x) { x->mode=TRAIN; --- 155,159 ---- } ! static void ann_td_train(t_ann_td *x) { x->mode=TRAIN; *************** *** 162,175 **** } fann_reset_MSE(x->ann); ! print_status(x); } ! static void run(t_ann_td *x) { x->mode=RUN; ! print_status(x); } ! static void set_mode(t_ann_td *x, t_symbol *sl, int argc, t_atom *argv) { if (argc<1) --- 164,177 ---- } fann_reset_MSE(x->ann); ! ann_td_print_status(x); } ! static void ann_td_run(t_ann_td *x) { x->mode=RUN; ! ann_td_print_status(x); } ! static void ann_td_set_mode(t_ann_td *x, t_symbol *sl, int argc, t_atom *argv) { if (argc<1) *************** *** 180,184 **** { x->mode = atom_getint(argv++); ! print_status(x); } } --- 182,186 ---- { x->mode = atom_getint(argv++); ! ann_td_print_status(x); } } *************** *** 186,190 **** ! static void train_on_file(t_ann_td *x, t_symbol *sl, int argc, t_atom *argv) { if (x->ann == 0) --- 188,192 ---- ! static void ann_td_train_on_file(t_ann_td *x, t_symbol *sl, int argc, t_atom *argv) { if (x->ann == 0) *************** *** 211,215 **** } ! static void set_desired_error(t_ann_td *x, t_symbol *sl, int argc, t_atom *argv) { float desired_error = (float)0.001; --- 213,217 ---- } ! static void ann_td_set_desired_error(t_ann_td *x, t_symbol *sl, int argc, t_atom *argv) { float desired_error = (float)0.001; *************** *** 225,229 **** } ! static void set_max_iterations(t_ann_td *x, t_symbol *sl, int argc, t_atom *argv) { unsigned int max_iterations = 500000; --- 227,231 ---- } ! static void ann_td_set_max_iterations(t_ann_td *x, t_symbol *sl, int argc, t_atom *argv) { unsigned int max_iterations = 500000; *************** *** 239,243 **** } ! static void set_iterations_between_reports(t_ann_td *x, t_symbol *sl, int argc, t_atom *argv) { --- 241,245 ---- } ! static void ann_td_set_iterations_between_reports(t_ann_td *x, t_symbol *sl, int argc, t_atom *argv) { *************** *** 256,260 **** ! static void scale_inputs(t_ann_td *x) { unsigned int j; --- 258,262 ---- ! static void ann_td_scale_inputs(t_ann_td *x) { unsigned int j; *************** *** 274,278 **** // run the ann using floats in list passed to the inlet as input values // and send result to outlet as list of float ! static void run_the_net(t_ann_td *x, t_symbol *sl, int argc, t_atom *argv) { int i=0; --- 276,280 ---- // run the ann using floats in list passed to the inlet as input values // and send result to outlet as list of float ! static void ann_td_run_the_net(t_ann_td *x, t_symbol *sl, int argc, t_atom *argv) { int i=0; *************** *** 303,307 **** quanti = x->ann->num_output; ! scale_inputs(x); // fill output array with zeros --- 305,309 ---- quanti = x->ann->num_output; ! ann_td_scale_inputs(x); // fill output array with zeros *************** *** 338,342 **** } ! static void train_on_the_fly(t_ann_td *x, t_symbol *sl, int argc, t_atom *argv) { int i=0; --- 340,344 ---- } ! static void ann_td_train_on_the_fly(t_ann_td *x, t_symbol *sl, int argc, t_atom *argv) { int i=0; *************** *** 371,375 **** } ! scale_inputs(x); // fill input array with actual data sent to inlet --- 373,377 ---- } ! ann_td_scale_inputs(x); // fill input array with actual data sent to inlet *************** *** 399,413 **** } ! static void manage_list(t_ann_td *x, t_symbol *sl, int argc, t_atom *argv) { if (x->mode) ! run_the_net(x, sl, argc, argv); else { ! train_on_the_fly(x, sl, argc, argv); } } ! static void set_filename(t_ann_td *x, t_symbol *sl, int argc, t_atom *argv) { if (argc>0) { --- 401,415 ---- } ! static void ann_td_manage_list(t_ann_td *x, t_symbol *sl, int argc, t_atom *argv) { if (x->mode) ! ann_td_run_the_net(x, sl, argc, argv); else { ! ann_td_train_on_the_fly(x, sl, argc, argv); } } ! static void ann_td_set_filename(t_ann_td *x, t_symbol *sl, int argc, t_atom *argv) { if (argc>0) { *************** *** 420,424 **** } ! static void load_ann_from_file(t_ann_td *x, t_symbol *sl, int argc, t_atom *argv) { if (x->ins_frames_set==0) --- 422,426 ---- } ! static void ann_td_load_ann_from_file(t_ann_td *x, t_symbol *sl, int argc, t_atom *argv) { if (x->ins_frames_set==0) *************** *** 437,444 **** post("nn:ann loaded fom file %s", x->filename->s_name); ! allocate_inputs(x); } ! static void save_ann_to_file(t_ann_td *x, t_symbol *sl, int argc, t_atom *argv) { if (argc>0) { --- 439,446 ---- post("nn:ann loaded fom file %s", x->filename->s_name); ! ann_td_allocate_inputs(x); } ! static void ann_td_save_ann_to_file(t_ann_td *x, t_symbol *sl, int argc, t_atom *argv) { if (argc>0) { *************** *** 456,460 **** // functions for training algo: ! static void set_FANN_TRAIN_INCREMENTAL(t_ann_td *x) { if (x->ann == 0) --- 458,462 ---- // functions for training algo: ! static void ann_td_set_FANN_TRAIN_INCREMENTAL(t_ann_td *x) { if (x->ann == 0) *************** *** 467,471 **** } } ! static void set_FANN_TRAIN_BATCH(t_ann_td *x) { if (x->ann == 0) --- 469,473 ---- } } ! static void ann_td_set_FANN_TRAIN_BATCH(t_ann_td *x) { if (x->ann == 0) *************** *** 478,482 **** } } ! static void set_FANN_TRAIN_RPROP(t_ann_td *x) { if (x->ann == 0) --- 480,484 ---- } } ! static void ann_td_set_FANN_TRAIN_RPROP(t_ann_td *x) { if (x->ann == 0) *************** *** 489,493 **** } } ! static void set_FANN_TRAIN_QUICKPROP(t_ann_td *x) { if (x->ann == 0) --- 491,495 ---- } } ! static void ann_td_set_FANN_TRAIN_QUICKPROP(t_ann_td *x) { if (x->ann == 0) *************** *** 501,505 **** } ! static void set_activation_function_output(t_ann_td *x, t_symbol *sl, int argc, t_atom *argv) { t_symbol *parametro = 0; --- 503,507 ---- } ! static void ann_td_set_activation_function_output(t_ann_td *x, t_symbol *sl, int argc, t_atom *argv) { t_symbol *parametro = 0; *************** *** 537,541 **** } ! static void print_ann_details(t_ann_td *x) { if (x->ann == 0) --- 539,543 ---- } ! static void ann_td_print_ann_details(t_ann_td *x) { if (x->ann == 0) *************** *** 562,566 **** } ! static void set_num_input_frames(t_ann_td *x, t_floatarg ins, t_floatarg frames) { x->num_input = ins; --- 564,568 ---- } ! static void ann_td_set_num_input_frames(t_ann_td *x, t_floatarg ins, t_floatarg frames) { x->num_input = ins; *************** *** 569,573 **** } ! static void *nn_new(t_symbol *s, int argc, t_atom *argv) { t_ann_td *x = (t_ann_td *)pd_new(ann_td_class); --- 571,575 ---- } ! static void *ann_td_new(t_symbol *s, int argc, t_atom *argv) { t_ann_td *x = (t_ann_td *)pd_new(ann_td_class); *************** *** 594,614 **** x->frames = atom_getint(argv++); x->ins_frames_set=1; ! allocate_inputs(x); } if (argc>2) { x->filename = atom_gensym(argv); ! load_ann_from_file(x, NULL , 0, NULL); } return (void *)x; } // free resources ! static void nn_free(t_ann_td *x) { struct fann *ann = x->ann; fann_destroy(ann); ! deallocate_inputs(x); // TODO: free other resources! } --- 596,623 ---- x->frames = atom_getint(argv++); x->ins_frames_set=1; ! ann_td_allocate_inputs(x); } if (argc>2) { x->filename = atom_gensym(argv); ! ann_td_load_ann_from_file(x, NULL , 0, NULL); } + post(""); + post("ann_td: time delay neural nets for PD"); + post("version: "VERSION""); + post("compiled: "__DATE__); + post("author: Davide Morelli"); + post("contact: info(a)davidemorelli.it www.davidemorelli.it"); + return (void *)x; } // free resources ! static void ann_td_free(t_ann_td *x) { struct fann *ann = x->ann; fann_destroy(ann); ! ann_td_deallocate_inputs(x); // TODO: free other resources! } *************** *** 616,660 **** void ann_td_setup(void) { - post(""); - post("ann_td: time delay neural nets for PD"); - post("version: "VERSION""); - post("compiled: "__DATE__); - post("author: Davide Morelli"); - post("contact: info(a)davidemorelli.it www.davidemorelli.it"); - ann_td_class = class_new(gensym("ann_td"), ! (t_newmethod)nn_new, ! (t_method)nn_free, sizeof(t_ann_td), CLASS_DEFAULT, A_GIMME, 0); // general.. ! class_addmethod(ann_td_class, (t_method)help, gensym("help"), 0); ! class_addmethod(ann_td_class, (t_method)createFann, gensym("create"), A_GIMME, 0); ! class_addmethod(ann_td_class, (t_method)train, gensym("train"), 0); ! class_addmethod(ann_td_class, (t_method)run, gensym("run"), 0); ! class_addmethod(ann_td_class, (t_method)set_mode, gensym("setmode"), A_GIMME, 0); ! class_addmethod(ann_td_class, (t_method)train_on_file, gensym("train-on-file"), A_GIMME, 0); ! class_addmethod(ann_td_class, (t_method)manage_list, gensym("data"), A_GIMME, 0); ! class_addmethod(ann_td_class, (t_method)set_filename, gensym("filename"), A_GIMME, 0); ! class_addmethod(ann_td_class, (t_method)load_ann_from_file, gensym("load"),A_GIMME, 0); ! class_addmethod(ann_td_class, (t_method)save_ann_to_file, gensym("save"),A_GIMME, 0); ! class_addmethod(ann_td_class, (t_method)print_ann_details, gensym("details"), 0); // change training parameters ! class_addmethod(ann_td_class, (t_method)set_desired_error, gensym("desired_error"),A_GIMME, 0); ! class_addmethod(ann_td_class, (t_method)set_max_iterations, gensym("max_iterations"),A_GIMME, 0); ! class_addmethod(ann_td_class, (t_method)set_iterations_between_reports, gensym("iterations_between_reports"),A_GIMME, 0); // change training and activation algorithms ! class_addmethod(ann_td_class, (t_method)set_FANN_TRAIN_INCREMENTAL, gensym("FANN_TRAIN_INCREMENTAL"), 0); ! class_addmethod(ann_td_class, (t_method)set_FANN_TRAIN_BATCH, gensym("FANN_TRAIN_BATCH"), 0); ! class_addmethod(ann_td_class, (t_method)set_FANN_TRAIN_RPROP, gensym("FANN_TRAIN_RPROP"), 0); ! class_addmethod(ann_td_class, (t_method)set_FANN_TRAIN_QUICKPROP, gensym("FANN_TRAIN_QUICKPROP"), 0); ! class_addmethod(ann_td_class, (t_method)set_activation_function_output, gensym("set_activation_function_output"),A_GIMME, 0); ! class_addmethod(ann_td_class, (t_method)set_num_input_frames, gensym("inputs_frames"),A_DEFFLOAT, A_DEFFLOAT, 0); // the most important one: running the ann ! class_addlist(ann_td_class, (t_method)manage_list); // help patch --- 625,662 ---- void ann_td_setup(void) { ann_td_class = class_new(gensym("ann_td"), ! (t_newmethod)ann_td_new, ! (t_method)ann_td_free, sizeof(t_ann_td), CLASS_DEFAULT, A_GIMME, 0); // general.. ! class_addmethod(ann_td_class, (t_method)ann_td_help, gensym("help"), 0); ! class_addmethod(ann_td_class, (t_method)ann_td_createFann, gensym("create"), A_GIMME, 0); ! class_addmethod(ann_td_class, (t_method)ann_td_train, gensym("train"), 0); ! class_addmethod(ann_td_class, (t_method)ann_td_run, gensym("run"), 0); ! class_addmethod(ann_td_class, (t_method)ann_td_set_mode, gensym("setmode"), A_GIMME, 0); ! class_addmethod(ann_td_class, (t_method)ann_td_train_on_file, gensym("train-on-file"), A_GIMME, 0); ! class_addmethod(ann_td_class, (t_method)ann_td_manage_list, gensym("data"), A_GIMME, 0); ! class_addmethod(ann_td_class, (t_method)ann_td_set_filename, gensym("filename"), A_GIMME, 0); ! class_addmethod(ann_td_class, (t_method)ann_td_load_ann_from_file, gensym("load"),A_GIMME, 0); ! class_addmethod(ann_td_class, (t_method)ann_td_save_ann_to_file, gensym("save"),A_GIMME, 0); ! class_addmethod(ann_td_class, (t_method)ann_td_print_ann_details, gensym("details"), 0); // change training parameters ! class_addmethod(ann_td_class, (t_method)ann_td_set_desired_error, gensym("desired_error"),A_GIMME, 0); ! class_addmethod(ann_td_class, (t_method)ann_td_set_max_iterations, gensym("max_iterations"),A_GIMME, 0); ! class_addmethod(ann_td_class, (t_method)ann_td_set_iterations_between_reports, gensym("iterations_between_reports"),A_GIMME, 0); // change training and activation algorithms ! class_addmethod(ann_td_class, (t_method)ann_td_set_FANN_TRAIN_INCREMENTAL, gensym("FANN_TRAIN_INCREMENTAL"), 0); ! class_addmethod(ann_td_class, (t_method)ann_td_set_FANN_TRAIN_BATCH, gensym("FANN_TRAIN_BATCH"), 0); ! class_addmethod(ann_td_class, (t_method)ann_td_set_FANN_TRAIN_RPROP, gensym("FANN_TRAIN_RPROP"), 0); ! class_addmethod(ann_td_class, (t_method)ann_td_set_FANN_TRAIN_QUICKPROP, gensym("FANN_TRAIN_QUICKPROP"), 0); ! class_addmethod(ann_td_class, (t_method)ann_td_set_activation_function_output, gensym("set_activation_function_output"),A_GIMME, 0); ! class_addmethod(ann_td_class, (t_method)ann_td_set_num_input_frames, gensym("inputs_frames"),A_DEFFLOAT, A_DEFFLOAT, 0); // the most important one: running the ann ! class_addlist(ann_td_class, (t_method)ann_td_manage_list); // help patch Index: makefile.msvc =================================================================== RCS file: /cvsroot/pure-data/externals/ann/src/makefile.msvc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** makefile.msvc 19 May 2005 15:04:33 -0000 1.3 --- makefile.msvc 20 May 2005 20:53:00 -0000 1.4 *************** *** 12,18 **** ! current: clean pd_nt - pd_nt: ann_som.dll ann_mlp.dll ann_td.dll .SUFFIXES: .dll --- 12,20 ---- ! current: clean pd_nt distclean ! ! pd_nt: ann_som.dll ann_mlp.dll ann_td.dll ann.dll ! #pd_nt: ann.dll .SUFFIXES: .dll *************** *** 28,39 **** $(PDNTLDIR)\kernel32.lib \ $(PDPATH)\bin\pd.lib \ ! $(FANNLIB)\libfann.lib .c.dll: cl $(PDNTCFLAGS) $(PDNTINCLUDE) /c $*.c ! link /dll /export:$*_setup $*.obj $(PDNTLIB) ! -del *.obj ! -del *.lib ! -del *.exp #install: --- 30,42 ---- $(PDNTLDIR)\kernel32.lib \ $(PDPATH)\bin\pd.lib \ ! $(FANNLIB)\libfann.lib ! # ann_mlp.lib ann_som.lib ann_td.lib .c.dll: cl $(PDNTCFLAGS) $(PDNTINCLUDE) /c $*.c ! link /dll /export:$*_setup $*.obj $(PDNTLIB) *.lib ! # -del *.obj ! # -del *.lib ! # -del *.exp #install: *************** *** 47,48 **** --- 50,55 ---- -del *.dll + distclean: + -del *.obj + -del *.lib + -del *.exp

1 0

[PD-cvs] externals/hcs/hid hid_linux.h, NONE, 1.1 hid_linux.c, 1.10, 1.11
by Hans-Christoph Steiner 20 May '05

20 May '05

Update of /cvsroot/pure-data/externals/hcs/hid In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26323 Modified Files: hid_linux.c Added Files: hid_linux.h Log Message: created header so that [linuxhid] can share code --- NEW FILE: hid_linux.h --- #ifndef _HID_LINUX_H #define _HID_LINUX_H /* * these are exported so they can be used in the implementation of [linuxhid] */ void hid_print(t_hid* x); t_int hid_open_device(t_hid *x, t_int device_number); t_int hid_close_device(t_hid *x); t_int hid_build_device_list(t_hid *x); #endif /* ! _HID_LINUX_H */ Index: hid_linux.c =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/hid/hid_linux.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** hid_linux.c 28 Apr 2005 04:29:58 -0000 1.10 --- hid_linux.c 20 May 2005 20:44:37 -0000 1.11 *************** *** 1,2 **** --- 1,3 ---- + /* this code only works for Linux kernels */ #ifdef __linux__

1 0

externals/hcs/hid hid_log.pd,1.4,1.5 hid_exp.pd,1.3,1.4
by Hans-Christoph Steiner 20 May '05

20 May '05

Update of /cvsroot/pure-data/externals/hcs/hid In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25907 Modified Files: hid_log.pd hid_exp.pd Log Message: updated math to generate proper curves Index: hid_exp.pd =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/hid/hid_exp.pd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** hid_exp.pd 28 Nov 2004 04:59:47 -0000 1.3 --- hid_exp.pd 20 May 2005 20:42:59 -0000 1.4 *************** *** 1,16 **** ! #N canvas 76 444 487 313 10; #X obj 72 38 inlet; ! #X obj 86 263 outlet; #X text 120 38 input range: 0 to 1; ! #X text 142 263 output range: 0 to 1; #X text 7 9 [hid_exp]; ! #X obj 86 178 pow; ! #X obj 72 140 t b f; ! #X msg 72 159 2; ! #X obj 86 220 - 1; #X connect 0 0 6 0; ! #X connect 5 0 8 0; ! #X connect 6 0 7 0; ! #X connect 6 1 5 1; ! #X connect 7 0 5 0; ! #X connect 8 0 1 0; --- 1,11 ---- ! #N canvas 225 325 499 325 10; #X obj 72 38 inlet; ! #X obj 72 258 outlet; #X text 120 38 input range: 0 to 1; ! #X text 128 258 output range: 0 to 1; #X text 7 9 [hid_exp]; ! #X obj 73 142 dbtorms; ! #X obj 73 120 * 100; #X connect 0 0 6 0; ! #X connect 5 0 1 0; ! #X connect 6 0 5 0; Index: hid_log.pd =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/hid/hid_log.pd,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** hid_log.pd 26 Apr 2005 04:44:38 -0000 1.4 --- hid_log.pd 20 May 2005 20:42:58 -0000 1.5 *************** *** 1,19 **** ! #N canvas 252 423 381 307 10; ! #X obj 84 32 inlet; ! #X obj 84 249 outlet; ! #X text 132 32 input range: 0 to 1; ! #X text 140 249 output range: 0 to 1; #X text 9 5 [hid_log]; ! #X obj 84 134 * 1.71828; ! #X obj 84 153 + 1; ! #X obj 84 193 log; ! #X text 92 172 the values are scaled from 1 to e; ! #X text 150 134 (e - 1); ! #X obj 84 65 min 1; ! #X obj 84 86 max 0; ! #X connect 0 0 10 0; #X connect 5 0 6 0; ! #X connect 6 0 7 0; ! #X connect 7 0 1 0; ! #X connect 10 0 11 0; ! #X connect 11 0 5 0; --- 1,11 ---- ! #N canvas 297 485 422 322 10; ! #X obj 31 45 inlet; ! #X obj 31 282 outlet; ! #X text 79 45 input range: 0 to 1; ! #X text 87 282 output range: 0 to 1; #X text 9 5 [hid_log]; ! #X obj 30 145 rmstodb; ! #X obj 30 175 / 100; ! #X connect 0 0 5 0; #X connect 5 0 6 0; ! #X connect 6 0 1 0;

1 0

externals/hcs/hid/doc - New directory
by Hans-Christoph Steiner 20 May '05

20 May '05

Update of /cvsroot/pure-data/externals/hcs/hid/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23266/doc Log Message: Directory /cvsroot/pure-data/externals/hcs/hid/doc added to the repository

1 0

externals/hcs/general/doc - New directory
by Hans-Christoph Steiner 20 May '05

20 May '05

Update of /cvsroot/pure-data/externals/hcs/general/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21413/doc Log Message: Directory /cvsroot/pure-data/externals/hcs/general/doc added to the repository

1 0

externals/hcs/general - New directory
by Hans-Christoph Steiner 20 May '05

20 May '05

Update of /cvsroot/pure-data/externals/hcs/general In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21347/general Log Message: Directory /cvsroot/pure-data/externals/hcs/general added to the repository

1 0

externals/hcs/hid hid_lowpass.pd, NONE, 1.1 hid_smooth-help.pd, NONE, 1.1 hid_average.pd, NONE, 1.1 noise4hidhelp.pd, NONE, 1.1 hid_lowpass-help.pd, 1.1, 1.2 hid_smooth.pd, 1.2, 1.3 hid_average-help.pd, 1.1, 1.2
by Hans-Christoph Steiner 20 May '05

20 May '05

Update of /cvsroot/pure-data/externals/hcs/hid In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17369 Modified Files: hid_lowpass-help.pd hid_smooth.pd hid_average-help.pd Added Files: hid_lowpass.pd hid_smooth-help.pd hid_average.pd noise4hidhelp.pd Log Message: updated help files and objects for smoothing, average, and lowpoass --- NEW FILE: hid_lowpass.pd --- #N canvas 666 425 438 310 10; #X obj 67 31 inlet; #X obj 67 235 outlet; #X text 7 266 (C) Copyright 2004 Hans-Christoph Steiner <hans(a)at.or.at> ; #X text 224 280 released under the GNU GPL; #X obj 252 30 inlet; #X obj 69 157 snapshot~; #X obj 68 58 t b f; #X obj 97 85 sig~; #X obj 97 115 lop~ 10; #X text 9 9 [hid_lowpass]; #X connect 0 0 6 0; #X connect 4 0 8 1; #X connect 5 0 1 0; #X connect 6 0 5 0; #X connect 6 1 7 0; #X connect 7 0 8 0; #X connect 8 0 5 0; Index: hid_lowpass-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/hid/hid_lowpass-help.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** hid_lowpass-help.pd 26 Apr 2005 03:50:24 -0000 1.1 --- hid_lowpass-help.pd 20 May 2005 20:04:15 -0000 1.2 *************** *** 1,24 **** ! #N canvas 320 291 466 316 10; #X obj 5 2 cnv 15 450 20 empty empty [hid_lowpass] 2 11 1 18 -233017 -66577 0; #X obj 422 3 pddp; ! #X text 27 270 (C) Copyright 2004 Hans-Christoph Steiner <hans(a)at.or.at> ; ! #X text 244 284 released under the GNU GPL; ! #X floatatom 153 124 5 0 0 0 - - -; ! #X floatatom 153 180 5 0 0 0 - - -; ! #X obj 156 105 hsl 128 15 0 1 0 0 empty empty empty -2 -6 0 8 -262144 ! -1 -1 0 1; ! #X obj 156 197 hsl 128 15 0 1 0 0 empty empty empty -2 -6 0 8 -262144 ! -1 -1 0 1; ! #X text 98 233 For more info:; ! #X obj 202 231 pddp_open all_about_hid_mapping; ! #X obj 153 150 hid_lowpass; ! #X text 18 36 Smooths a stream of numbers by converting it to an audio ! signal and low-pass filtering that signal. By default \, the average ! is the last 10 values. You can set this using an argument or the right ! inlet.; ! #X connect 4 0 10 0; ! #X connect 5 0 7 0; ! #X connect 6 0 4 0; ! #X connect 10 0 5 0; --- 1,35 ---- ! #N canvas 119 269 475 392 10; #X obj 5 2 cnv 15 450 20 empty empty [hid_lowpass] 2 11 1 18 -233017 -66577 0; #X obj 422 3 pddp; ! #X text 27 340 (C) Copyright 2004 Hans-Christoph Steiner <hans(a)at.or.at> ; ! #X text 244 354 released under the GNU GPL; ! #X floatatom 101 199 5 0 0 0 - - -; ! #X floatatom 101 255 5 0 0 0 - - -; ! #X text 98 312 For more info:; ! #X obj 202 310 pddp_open all_about_hid_mapping; ! #X obj 101 225 hid_lowpass; ! #X obj 193 198 hsl 75 18 1 100 1 1 empty empty refresh(Hz) 4 9 1 12 ! -228992 -1 -1 3700 0; ! #X floatatom 189 227 5 0 0 0 - - -; ! #X obj 104 272 hsl 250 15 0 1 0 0 empty empty empty -2 -6 0 8 -262144 ! -1 -1 4283 1; ! #X obj 104 173 hsl 250 15 0 1 0 0 empty empty empty -2 -6 0 8 -262144 ! -1 -1 4582 1; ! #X text 20 35 Smooths a stream of numbers by converting it to an audio ! signal and low-pass filtering that signal. By default \, the the filter ! is set to 10 Hz. You can set this using the right inlet. The lower ! the frequency \, the smoother the data \, but the greater the latency. ! ; ! #X obj 102 140 noise4hidhelp; ! #X obj 102 105 tgl 30 0 empty empty start 1 15 1 12 -90049 -1 -1 1 ! 1; ! #X connect 4 0 8 0; ! #X connect 5 0 11 0; ! #X connect 8 0 5 0; ! #X connect 9 0 8 1; ! #X connect 9 0 10 0; ! #X connect 12 0 4 0; ! #X connect 14 0 12 0; ! #X connect 15 0 14 0; --- NEW FILE: hid_smooth-help.pd --- #N canvas 388 256 475 392 10; #X text 27 340 (C) Copyright 2004 Hans-Christoph Steiner <hans(a)at.or.at> ; #X text 244 354 released under the GNU GPL; #X floatatom 102 195 5 0 0 0 - - -; #X floatatom 102 251 5 0 0 0 - - -; #X text 98 303 For more info:; #X obj 202 301 pddp_open all_about_hid_mapping; #X obj 103 131 noise4hidhelp; #X obj 105 268 hsl 250 15 0 1 0 0 empty empty empty 22 8 1 12 -262144 -1 -1 16106 1; #X obj 105 164 hsl 250 15 0 1 0 0 empty empty empty 22 8 1 12 -262144 -1 -1 16509 1; #X obj 5 2 cnv 15 450 20 empty empty [hid_smooth] 2 11 1 18 -233017 -66577 0; #X obj 422 3 pddp; #X obj 102 221 hid_smooth; #X text 18 36 Smooths a stream of numbers using weighted averaging of the last 10 values. This object is an shortcut for [hid_average] with the default settings.; #X obj 103 94 tgl 30 0 empty empty start 1 15 1 12 -90049 -1 -1 1 1 ; #X connect 2 0 11 0; #X connect 3 0 7 0; #X connect 6 0 8 0; #X connect 8 0 2 0; #X connect 11 0 3 0; #X connect 13 0 6 0; --- NEW FILE: hid_average.pd --- #N canvas 346 512 462 312 10; #X obj 67 31 inlet; #X obj 67 235 outlet; #X obj 102 78 loadbang; #X msg 76 113 weight; #X obj 67 149 average \$1; #X msg 130 113 10; #X text 27 266 (C) Copyright 2004 Hans-Christoph Steiner <hans(a)at.or.at> ; #X text 244 280 released under the GNU GPL; #X text 9 9 [hid_average]; #X obj 272 30 inlet; #X connect 0 0 4 0; #X connect 2 0 5 0; #X connect 2 0 3 0; #X connect 3 0 4 0; #X connect 4 0 1 0; #X connect 5 0 4 1; #X connect 9 0 4 1; --- NEW FILE: noise4hidhelp.pd --- #N canvas 430 67 346 450 10; #X obj 149 250 +; #X obj 177 250 f; #X obj 278 215 bang; #X obj 150 404 outlet; #X obj 149 280 moses 1000; #X obj 150 371 / 1000; #X obj 149 308 moses -1; #X obj 32 211 bang; #X obj 149 219 *; #X msg 185 185 -1; #X msg 118 186 1; #X obj 150 74 metro 90; #X obj 149 129 - 20; #X obj 149 109 random 60; #X obj 150 24 inlet; #X obj 37 126 loadbang; #X connect 0 0 1 0; #X connect 0 0 4 0; #X connect 1 0 0 1; #X connect 2 0 9 0; #X connect 4 0 6 0; #X connect 4 1 2 0; #X connect 5 0 3 0; #X connect 6 0 7 0; #X connect 6 1 5 0; #X connect 7 0 10 0; #X connect 8 0 0 0; #X connect 9 0 8 1; #X connect 10 0 8 1; #X connect 11 0 13 0; #X connect 12 0 8 0; #X connect 13 0 12 0; #X connect 14 0 11 0; #X connect 15 0 10 0; Index: hid_average-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/hid/hid_average-help.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** hid_average-help.pd 26 Apr 2005 03:50:24 -0000 1.1 --- hid_average-help.pd 20 May 2005 20:04:15 -0000 1.2 *************** *** 1,23 **** ! #N canvas 320 291 462 312 10; ! #X obj 5 2 cnv 15 450 20 empty empty [hid_average] 2 11 1 18 -233017 ! -66577 0; ! #X obj 422 3 pddp; ! #X text 27 270 (C) Copyright 2004 Hans-Christoph Steiner <hans(a)at.or.at> ; ! #X text 244 284 released under the GNU GPL; ! #X floatatom 153 104 5 0 0 0 - - -; ! #X floatatom 153 180 5 0 0 0 - - -; ! #X obj 156 85 hsl 128 15 0 1 0 0 empty empty empty -2 -6 0 8 -262144 -1 -1 0 1; ! #X obj 156 197 hsl 128 15 0 1 0 0 empty empty empty -2 -6 0 8 -262144 -1 -1 0 1; ! #X text 98 233 For more info:; ! #X obj 202 231 pddp_open all_about_hid_mapping; ! #X obj 153 150 hid_average; #X text 18 36 Smooths a stream of numbers using weighted averaging. By default \, the average is the last 10 values. You can set this using ! an argument or the right inlet.; ! #X connect 4 0 10 0; ! #X connect 5 0 7 0; ! #X connect 6 0 4 0; ! #X connect 10 0 5 0; --- 1,33 ---- ! #N canvas 135 352 479 396 10; ! #X text 27 340 (C) Copyright 2004 Hans-Christoph Steiner <hans(a)at.or.at> ; ! #X text 244 354 released under the GNU GPL; ! #X floatatom 101 195 5 0 0 0 - - -; ! #X floatatom 101 251 5 0 0 0 - - -; ! #X text 98 303 For more info:; ! #X obj 202 301 pddp_open all_about_hid_mapping; ! #X obj 193 194 hsl 85 18 0.1 10 1 1 empty empty average_count 0 9 1 ! 12 -228992 -1 -1 3500 0; ! #X floatatom 189 223 5 0 0 0 - - -; ! #X obj 102 131 noise4hidhelp; ! #X obj 104 268 hsl 250 15 0 1 0 0 empty empty empty -2 -6 0 8 -262144 -1 -1 0 1; ! #X obj 104 164 hsl 250 15 0 1 0 0 empty empty empty -2 -6 0 8 -262144 -1 -1 0 1; ! #X obj 5 2 cnv 15 450 20 empty empty [hid_average] 2 11 1 18 -233017 ! -66577 0; ! #X obj 422 3 pddp; ! #X obj 101 221 hid_average; #X text 18 36 Smooths a stream of numbers using weighted averaging. By default \, the average is the last 10 values. You can set this using ! the right inlet.; ! #X obj 102 95 tgl 30 0 empty empty start 1 15 1 12 -90049 -1 -1 0 1 ! ; ! #X connect 2 0 13 0; ! #X connect 3 0 9 0; ! #X connect 6 0 7 0; ! #X connect 6 0 13 1; ! #X connect 8 0 10 0; ! #X connect 10 0 2 0; ! #X connect 13 0 3 0; ! #X connect 15 0 8 0; Index: hid_smooth.pd =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/hid/hid_smooth.pd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** hid_smooth.pd 28 Nov 2004 01:26:34 -0000 1.2 --- hid_smooth.pd 20 May 2005 20:04:15 -0000 1.3 *************** *** 1,14 **** ! #N canvas 346 512 458 308 10; #X obj 67 31 inlet; #X obj 67 256 outlet; - #X obj 122 78 loadbang; - #X msg 96 113 weight; - #X obj 67 149 average \$1; - #X msg 150 113 10; #X text 9 9 [hid_smooth]; ! #X connect 0 0 4 0; ! #X connect 2 0 5 0; ! #X connect 2 0 3 0; ! #X connect 3 0 4 0; ! #X connect 4 0 1 0; ! #X connect 5 0 4 1; --- 1,7 ---- ! #N canvas 346 512 462 312 10; #X obj 67 31 inlet; #X obj 67 256 outlet; #X text 9 9 [hid_smooth]; ! #X obj 67 149 hid_average; ! #X connect 0 0 3 0; ! #X connect 3 0 1 0;

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
41
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs May 2005