Pd-cvs May 2005

pd-cvs@lists.iem.at

14 participants
407 discussions

externals/ann/src ann_mlp.c,1.3,1.4 ann_td.c,1.3,1.4
by IOhannes m zmölnig 19 May '05

19 May '05

Update of /cvsroot/pure-data/externals/ann/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31127 Modified Files: ann_mlp.c ann_td.c Log Message: the joys of dos2unix Index: ann_mlp.c =================================================================== RCS file: /cvsroot/pure-data/externals/ann/src/ann_mlp.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ann_mlp.c 19 May 2005 14:14:53 -0000 1.3 --- ann_mlp.c 19 May 2005 14:19:19 -0000 1.4 *************** *** 1,565 **** ! /* nn : Neural Networks for PD ! by Davide Morelli - info(a)davidemorelli.it - http://www.davidemorelli.it ! this software is simply an interface for FANN classes ! http://fann.sourceforge.net/ ! FANN is obviously needed for compilation ! this software is licensed under the GNU General Public License ! */ ! #include <stdio.h> ! #include <string.h> ! #include "m_pd.h" [...1101 lines suppressed...] ! // 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 ! class_sethelpsymbol(ann_mlp_class, gensym("help-ann_mlp")); ! ! ! } Index: ann_td.c =================================================================== RCS file: /cvsroot/pure-data/externals/ann/src/ann_td.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ann_td.c 19 May 2005 14:14:53 -0000 1.3 --- ann_td.c 19 May 2005 14:19:19 -0000 1.4 *************** *** 1,664 **** ! /* ann_td : Time Delay Neural Networks for PD ! by Davide Morelli - info(a)davidemorelli.it - http://www.davidemorelli.it ! this software is simply an interface for FANN classes ! http://fann.sourceforge.net/ ! FANN is obviously needed for compilation ! this software is licensed under the GNU General Public License ! */ ! #include <stdio.h> ! #include <string.h> ! #include "m_pd.h" [...1299 lines suppressed...] ! 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 ! class_sethelpsymbol(ann_td_class, gensym("help-ann_td")); ! ! ! }

1 0

externals/ann/src makefile.linux,1.4,1.5
by IOhannes m zmölnig 19 May '05

19 May '05

Update of /cvsroot/pure-data/externals/ann/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30865 Modified Files: makefile.linux Log Message: added a target "ann" to build as a single library Index: makefile.linux =================================================================== RCS file: /cvsroot/pure-data/externals/ann/src/makefile.linux,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** makefile.linux 19 May 2005 14:06:39 -0000 1.4 --- makefile.linux 19 May 2005 14:17:53 -0000 1.5 *************** *** 72,75 **** --- 72,86 ---- $(STRIP) $(STRIPFLAGS) "$*.pd_linux" + + ann: $(TARGETS:%.c=%.o) + $(CC) $(CFLAGS) $(INCLUDE) -o ann.o -c ann.c + $(CC) $(LDFLAGS) -o ann.pd_linux *.o $(LIBS) + $(STRIP) $(STRIPFLAGS) ann.pd_linux + + %.o: %.c + $(CC) $(CFLAGS) $(INCLUDE) -o "$*.o" -c "$*.c" + + + everything: clean all install distclean

1 0

externals/ann/src ann.c,1.2,1.3
by IOhannes m zmölnig 19 May '05

19 May '05

Update of /cvsroot/pure-data/externals/ann/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30351 Modified Files: ann.c Log Message: call setup-functions of ann_mlp and ann_td Index: ann.c =================================================================== RCS file: /cvsroot/pure-data/externals/ann/src/ann.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ann.c 12 Apr 2005 13:27:42 -0000 1.2 --- ann.c 19 May 2005 14:15:23 -0000 1.3 *************** *** 33,36 **** --- 33,40 ---- void ann_som_setup(void); + void ann_mlp_setup(void); + void ann_td_setup(void); + + /* *************** *** 49,52 **** --- 53,58 ---- { ann_som_setup(); + ann_mlp_setup(); + ann_td_setup();

1 0

externals/ann/src ann_mlp.c,1.2,1.3 ann_td.c,1.2,1.3
by IOhannes m zmölnig 19 May '05

19 May '05

Update of /cvsroot/pure-data/externals/ann/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30212 Modified Files: ann_mlp.c ann_td.c Log Message: made all local functions static (in order to not interfere with each other) Index: ann_mlp.c =================================================================== RCS file: /cvsroot/pure-data/externals/ann/src/ann_mlp.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ann_mlp.c 19 May 2005 14:07:23 -0000 1.2 --- ann_mlp.c 19 May 2005 14:14:53 -0000 1.3 *************** *** 37,41 **** } t_ann_mlp; ! void help(t_ann_mlp *x) { post(""); --- 37,41 ---- } t_ann_mlp; ! static void help(t_ann_mlp *x) { post(""); *************** *** 49,53 **** } ! void createFann(t_ann_mlp *x, t_symbol *sl, int argc, t_atom *argv) { unsigned int num_input = 2; --- 49,53 ---- } ! static void createFann(t_ann_mlp *x, t_symbol *sl, int argc, t_atom *argv) { unsigned int num_input = 2; *************** *** 109,113 **** } ! void print_status(t_ann_mlp *x) { if (x->mode == TRAIN) --- 109,113 ---- } ! static void print_status(t_ann_mlp *x) { if (x->mode == TRAIN) *************** *** 117,121 **** } ! void train(t_ann_mlp *x) { x->mode=TRAIN; --- 117,121 ---- } ! static void train(t_ann_mlp *x) { x->mode=TRAIN; *************** *** 129,133 **** } ! void run(t_ann_mlp *x) { x->mode=RUN; --- 129,133 ---- } ! static void run(t_ann_mlp *x) { x->mode=RUN; *************** *** 135,139 **** } ! void set_mode(t_ann_mlp *x, t_symbol *sl, int argc, t_atom *argv) { if (argc<1) --- 135,139 ---- } ! static void set_mode(t_ann_mlp *x, t_symbol *sl, int argc, t_atom *argv) { if (argc<1) *************** *** 150,154 **** ! void train_on_file(t_ann_mlp *x, t_symbol *sl, int argc, t_atom *argv) { if (x->ann == 0) --- 150,154 ---- ! static void train_on_file(t_ann_mlp *x, t_symbol *sl, int argc, t_atom *argv) { if (x->ann == 0) *************** *** 175,179 **** } ! void set_desired_error(t_ann_mlp *x, t_symbol *sl, int argc, t_atom *argv) { float desired_error = (float)0.001; --- 175,179 ---- } ! static void set_desired_error(t_ann_mlp *x, t_symbol *sl, int argc, t_atom *argv) { float desired_error = (float)0.001; *************** *** 189,193 **** } ! void set_max_iterations(t_ann_mlp *x, t_symbol *sl, int argc, t_atom *argv) { unsigned int max_iterations = 500000; --- 189,193 ---- } ! static void set_max_iterations(t_ann_mlp *x, t_symbol *sl, int argc, t_atom *argv) { unsigned int max_iterations = 500000; *************** *** 203,207 **** } ! void set_iterations_between_reports(t_ann_mlp *x, t_symbol *sl, int argc, t_atom *argv) { --- 203,207 ---- } ! static void 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 ! void run_the_net(t_ann_mlp *x, t_symbol *sl, int argc, t_atom *argv) { int i=0; --- 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; *************** *** 276,280 **** } ! void train_on_the_fly(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; *************** *** 335,339 **** } ! void manage_list(t_ann_mlp *x, t_symbol *sl, int argc, t_atom *argv) { if (x->mode) --- 335,339 ---- } ! static void manage_list(t_ann_mlp *x, t_symbol *sl, int argc, t_atom *argv) { if (x->mode) *************** *** 345,349 **** } ! void set_filename(t_ann_mlp *x, t_symbol *sl, int argc, t_atom *argv) { if (argc>0) { --- 345,349 ---- } ! static void set_filename(t_ann_mlp *x, t_symbol *sl, int argc, t_atom *argv) { if (argc>0) { *************** *** 356,360 **** } ! void load_ann_from_file(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) { *************** *** 368,372 **** } ! void save_ann_to_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) { *************** *** 384,388 **** // functions for training algo: ! void set_FANN_TRAIN_INCREMENTAL(t_ann_mlp *x) { if (x->ann == 0) --- 384,388 ---- // functions for training algo: ! static void set_FANN_TRAIN_INCREMENTAL(t_ann_mlp *x) { if (x->ann == 0) *************** *** 395,399 **** } } ! void set_FANN_TRAIN_BATCH(t_ann_mlp *x) { if (x->ann == 0) --- 395,399 ---- } } ! static void set_FANN_TRAIN_BATCH(t_ann_mlp *x) { if (x->ann == 0) *************** *** 406,410 **** } } ! void set_FANN_TRAIN_RPROP(t_ann_mlp *x) { if (x->ann == 0) --- 406,410 ---- } } ! static void set_FANN_TRAIN_RPROP(t_ann_mlp *x) { if (x->ann == 0) *************** *** 417,421 **** } } ! void set_FANN_TRAIN_QUICKPROP(t_ann_mlp *x) { if (x->ann == 0) --- 417,421 ---- } } ! static void set_FANN_TRAIN_QUICKPROP(t_ann_mlp *x) { if (x->ann == 0) *************** *** 429,433 **** } ! void set_activation_function_output(t_ann_mlp *x, t_symbol *sl, int argc, t_atom *argv) { t_symbol *parametro = 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; *************** *** 465,469 **** } ! void print_ann_details(t_ann_mlp *x) { if (x->ann == 0) --- 465,469 ---- } ! static void print_ann_details(t_ann_mlp *x) { if (x->ann == 0) *************** *** 491,495 **** ! void *nn_new(t_symbol *s, int argc, t_atom *argv) { t_ann_mlp *x = (t_ann_mlp *)pd_new(ann_mlp_class); --- 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); Index: ann_td.c =================================================================== RCS file: /cvsroot/pure-data/externals/ann/src/ann_td.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ann_td.c 19 May 2005 14:07:23 -0000 1.2 --- ann_td.c 19 May 2005 14:14:53 -0000 1.3 *************** *** 41,45 **** } t_ann_td; ! void help(t_ann_td *x) { post(""); --- 41,45 ---- } t_ann_td; ! static void help(t_ann_td *x) { post(""); *************** *** 53,57 **** } ! void deallocate_inputs(t_ann_td *x) { if (x->inputs != 0) --- 53,57 ---- } ! static void deallocate_inputs(t_ann_td *x) { if (x->inputs != 0) *************** *** 62,66 **** } ! void allocate_inputs(t_ann_td *x) { unsigned int i; --- 62,66 ---- } ! static void allocate_inputs(t_ann_td *x) { unsigned int i; *************** *** 71,75 **** } ! void createFann(t_ann_td *x, t_symbol *sl, int argc, t_atom *argv) { unsigned int num_input = 2; --- 71,75 ---- } ! static void createFann(t_ann_td *x, t_symbol *sl, int argc, t_atom *argv) { unsigned int num_input = 2; *************** *** 145,149 **** } ! void print_status(t_ann_td *x) { if (x->mode == TRAIN) --- 145,149 ---- } ! static void print_status(t_ann_td *x) { if (x->mode == TRAIN) *************** *** 153,157 **** } ! void train(t_ann_td *x) { x->mode=TRAIN; --- 153,157 ---- } ! static void train(t_ann_td *x) { x->mode=TRAIN; *************** *** 165,169 **** } ! void run(t_ann_td *x) { x->mode=RUN; --- 165,169 ---- } ! static void run(t_ann_td *x) { x->mode=RUN; *************** *** 171,175 **** } ! void set_mode(t_ann_td *x, t_symbol *sl, int argc, t_atom *argv) { if (argc<1) --- 171,175 ---- } ! static void set_mode(t_ann_td *x, t_symbol *sl, int argc, t_atom *argv) { if (argc<1) *************** *** 186,190 **** ! void train_on_file(t_ann_td *x, t_symbol *sl, int argc, t_atom *argv) { if (x->ann == 0) --- 186,190 ---- ! static void train_on_file(t_ann_td *x, t_symbol *sl, int argc, t_atom *argv) { if (x->ann == 0) *************** *** 211,215 **** } ! void set_desired_error(t_ann_td *x, t_symbol *sl, int argc, t_atom *argv) { float desired_error = (float)0.001; --- 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; *************** *** 225,229 **** } ! void set_max_iterations(t_ann_td *x, t_symbol *sl, int argc, t_atom *argv) { unsigned int max_iterations = 500000; --- 225,229 ---- } ! static void set_max_iterations(t_ann_td *x, t_symbol *sl, int argc, t_atom *argv) { unsigned int max_iterations = 500000; *************** *** 239,243 **** } ! void set_iterations_between_reports(t_ann_td *x, t_symbol *sl, int argc, t_atom *argv) { --- 239,243 ---- } ! static void set_iterations_between_reports(t_ann_td *x, t_symbol *sl, int argc, t_atom *argv) { *************** *** 256,260 **** ! void scale_inputs(t_ann_td *x) { unsigned int j; --- 256,260 ---- ! static void 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 ! void run_the_net(t_ann_td *x, t_symbol *sl, int argc, t_atom *argv) { int i=0; --- 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; *************** *** 338,342 **** } ! void train_on_the_fly(t_ann_td *x, t_symbol *sl, int argc, t_atom *argv) { int i=0; --- 338,342 ---- } ! static void train_on_the_fly(t_ann_td *x, t_symbol *sl, int argc, t_atom *argv) { int i=0; *************** *** 399,403 **** } ! void manage_list(t_ann_td *x, t_symbol *sl, int argc, t_atom *argv) { if (x->mode) --- 399,403 ---- } ! static void manage_list(t_ann_td *x, t_symbol *sl, int argc, t_atom *argv) { if (x->mode) *************** *** 409,413 **** } ! void set_filename(t_ann_td *x, t_symbol *sl, int argc, t_atom *argv) { if (argc>0) { --- 409,413 ---- } ! static void set_filename(t_ann_td *x, t_symbol *sl, int argc, t_atom *argv) { if (argc>0) { *************** *** 420,424 **** } ! void load_ann_from_file(t_ann_td *x, t_symbol *sl, int argc, t_atom *argv) { if (x->ins_frames_set==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) *************** *** 440,444 **** } ! void save_ann_to_file(t_ann_td *x, t_symbol *sl, int argc, t_atom *argv) { if (argc>0) { --- 440,444 ---- } ! static void 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: ! void set_FANN_TRAIN_INCREMENTAL(t_ann_td *x) { if (x->ann == 0) --- 456,460 ---- // functions for training algo: ! static void set_FANN_TRAIN_INCREMENTAL(t_ann_td *x) { if (x->ann == 0) *************** *** 467,471 **** } } ! void set_FANN_TRAIN_BATCH(t_ann_td *x) { if (x->ann == 0) --- 467,471 ---- } } ! static void set_FANN_TRAIN_BATCH(t_ann_td *x) { if (x->ann == 0) *************** *** 478,482 **** } } ! void set_FANN_TRAIN_RPROP(t_ann_td *x) { if (x->ann == 0) --- 478,482 ---- } } ! static void set_FANN_TRAIN_RPROP(t_ann_td *x) { if (x->ann == 0) *************** *** 489,493 **** } } ! void set_FANN_TRAIN_QUICKPROP(t_ann_td *x) { if (x->ann == 0) --- 489,493 ---- } } ! static void set_FANN_TRAIN_QUICKPROP(t_ann_td *x) { if (x->ann == 0) *************** *** 501,505 **** } ! void set_activation_function_output(t_ann_td *x, t_symbol *sl, int argc, t_atom *argv) { t_symbol *parametro = 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; *************** *** 537,541 **** } ! void print_ann_details(t_ann_td *x) { if (x->ann == 0) --- 537,541 ---- } ! static void print_ann_details(t_ann_td *x) { if (x->ann == 0) *************** *** 562,566 **** } ! void set_num_input_frames(t_ann_td *x, t_floatarg ins, t_floatarg frames) { x->num_input = ins; --- 562,566 ---- } ! static void set_num_input_frames(t_ann_td *x, t_floatarg ins, t_floatarg frames) { x->num_input = ins; *************** *** 569,573 **** } ! void *nn_new(t_symbol *s, int argc, t_atom *argv) { t_ann_td *x = (t_ann_td *)pd_new(ann_td_class); --- 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);

1 0

externals/ann/src ann_mlp.c, 1.1, 1.2 ann_som.c, 1.5, 1.6 ann_td.c, 1.1, 1.2
by IOhannes m zmölnig 19 May '05

19 May '05

Update of /cvsroot/pure-data/externals/ann/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28356 Modified Files: ann_mlp.c ann_som.c ann_td.c Log Message: shut down the compiler... Index: ann_mlp.c =================================================================== RCS file: /cvsroot/pure-data/externals/ann/src/ann_mlp.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ann_mlp.c 18 May 2005 15:53:29 -0000 1.1 --- ann_mlp.c 19 May 2005 14:07:23 -0000 1.2 *************** *** 31,36 **** t_symbol *filename; // name of the file where this ann is saved t_symbol *filenametrain; // name of the file with training data ! float desired_error; ! unsigned int max_iterations; unsigned int iterations_between_reports; t_outlet *l_out, *f_out; --- 31,36 ---- t_symbol *filename; // name of the file where this ann is saved t_symbol *filenametrain; // name of the file with training data ! float desired_error; ! unsigned int max_iterations; unsigned int iterations_between_reports; t_outlet *l_out, *f_out; *************** *** 50,95 **** void createFann(t_ann_mlp *x, t_symbol *sl, int argc, t_atom *argv) ! { ! unsigned int num_input = 2; ! unsigned int num_output = 1; ! unsigned int num_layers = 3; ! unsigned int num_neurons_hidden = 3; ! float connection_rate = 1; ! float learning_rate = (float)0.7; ! ! if (argc>0) ! num_input = atom_getint(argv++); ! ! if (argc>1) ! num_output = atom_getint(argv++); ! ! if (argc>2) ! num_layers = atom_getint(argv++); ! ! if (argc>3) ! num_neurons_hidden = atom_getint(argv++); ! ! if (argc>4) ! connection_rate = atom_getfloat(argv++); ! ! if (argc>5) ! learning_rate = atom_getfloat(argv++); ! ! if (num_input>=MAXINPUT) ! { ! error("too many inputs, maximum allowed is MAXINPUT"); ! return; ! } ! ! if (num_output>=MAXOUTPUT) ! { ! error("too many outputs, maximum allowed is MAXOUTPUT"); ! return; ! } ! ! x->ann = fann_create(connection_rate, learning_rate, num_layers, ! num_input, num_neurons_hidden, num_output); ! ! fann_set_activation_function_hidden(x->ann, FANN_SIGMOID_SYMMETRIC); fann_set_activation_function_output(x->ann, FANN_SIGMOID_SYMMETRIC); --- 50,95 ---- void createFann(t_ann_mlp *x, t_symbol *sl, int argc, t_atom *argv) ! { ! unsigned int num_input = 2; ! unsigned int num_output = 1; ! unsigned int num_layers = 3; ! unsigned int num_neurons_hidden = 3; ! float connection_rate = 1; ! float learning_rate = (float)0.7; ! ! if (argc>0) ! num_input = atom_getint(argv++); ! ! if (argc>1) ! num_output = atom_getint(argv++); ! ! if (argc>2) ! num_layers = atom_getint(argv++); ! ! if (argc>3) ! num_neurons_hidden = atom_getint(argv++); ! ! if (argc>4) ! connection_rate = atom_getfloat(argv++); ! ! if (argc>5) ! learning_rate = atom_getfloat(argv++); ! ! if (num_input>=MAXINPUT) ! { ! error("too many inputs, maximum allowed is MAXINPUT"); ! return; ! } ! ! if (num_output>=MAXOUTPUT) ! { ! error("too many outputs, maximum allowed is MAXOUTPUT"); ! return; ! } ! ! x->ann = fann_create(connection_rate, learning_rate, num_layers, ! num_input, num_neurons_hidden, num_output); ! ! fann_set_activation_function_hidden(x->ann, FANN_SIGMOID_SYMMETRIC); fann_set_activation_function_output(x->ann, FANN_SIGMOID_SYMMETRIC); *************** *** 151,173 **** void train_on_file(t_ann_mlp *x, t_symbol *sl, int argc, t_atom *argv) ! { if (x->ann == 0) { error("ann not initialized"); return; - } - - if (argc<1) - { - error("you must specify the filename with training data"); - return; - } else - { - x->filenametrain = atom_gensym(argv); } ! ! //post("nn: starting training on file %s, please be patient and wait for my next message (it could take severeal minutes to complete training)", x->filenametrain->s_name); ! ! fann_train_on_file(x->ann, x->filenametrain->s_name, x->max_iterations, x->iterations_between_reports, x->desired_error); --- 151,173 ---- void train_on_file(t_ann_mlp *x, t_symbol *sl, int argc, t_atom *argv) ! { if (x->ann == 0) { error("ann not initialized"); return; } ! ! if (argc<1) ! { ! error("you must specify the filename with training data"); ! return; ! } else ! { ! x->filenametrain = atom_gensym(argv); ! } ! ! //post("nn: starting training on file %s, please be patient and wait for my next message (it could take severeal minutes to complete training)", x->filenametrain->s_name); ! ! fann_train_on_file(x->ann, x->filenametrain->s_name, x->max_iterations, x->iterations_between_reports, x->desired_error); *************** *** 497,502 **** x->f_out = outlet_new(&x->x_obj, &s_float); ! x->desired_error = (float)0.001; ! x->max_iterations = 500000; x->iterations_between_reports = 1000; x->mode=RUN; --- 497,502 ---- x->f_out = outlet_new(&x->x_obj, &s_float); ! x->desired_error = (float)0.001; ! x->max_iterations = 500000; x->iterations_between_reports = 1000; x->mode=RUN; *************** *** 563,565 **** ! } \ No newline at end of file --- 563,565 ---- ! } Index: ann_td.c =================================================================== RCS file: /cvsroot/pure-data/externals/ann/src/ann_td.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ann_td.c 18 May 2005 15:53:29 -0000 1.1 --- ann_td.c 19 May 2005 14:07:23 -0000 1.2 *************** *** 31,36 **** t_symbol *filename; // name of the file where this ann is saved t_symbol *filenametrain; // name of the file with training data ! float desired_error; ! unsigned int max_iterations; unsigned int iterations_between_reports; unsigned int frames; --- 31,36 ---- t_symbol *filename; // name of the file where this ann is saved t_symbol *filenametrain; // name of the file with training data ! float desired_error; ! unsigned int max_iterations; unsigned int iterations_between_reports; unsigned int frames; *************** *** 72,128 **** void createFann(t_ann_td *x, t_symbol *sl, int argc, t_atom *argv) ! { ! unsigned int num_input = 2; ! unsigned int num_output = 1; ! unsigned int num_layers = 3; ! unsigned int num_neurons_hidden = 3; ! float connection_rate = 1; ! float learning_rate = (float)0.7; ! ! if (argc<3) ! { ! error("you must provide at least num_input, num_output amd frames number"); ! return; ! } ! if (argc>0) ! num_input = atom_getint(argv++); ! ! if (argc>1) ! num_output = atom_getint(argv++); ! ! if (argc>2) ! { ! x->frames = atom_getint(argv++); ! x->ins_frames_set=1; ! } ! ! if (argc>3) ! num_layers = atom_getint(argv++); ! ! if (argc>4) ! num_neurons_hidden = atom_getint(argv++); ! ! if (argc>5) ! connection_rate = atom_getfloat(argv++); ! ! if (argc>6) ! learning_rate = atom_getfloat(argv++); ! ! if ((num_input * x->frames)>=MAXINPUT) ! { ! error("too many inputs, maximum allowed is %f", MAXINPUT/x->frames); ! return; ! } ! ! if (num_output>=MAXOUTPUT) ! { ! error("too many outputs, maximum allowed is MAXOUTPUT"); ! return; ! } ! ! x->ann = fann_create(connection_rate, learning_rate, num_layers, ! (num_input*x->frames), num_neurons_hidden, num_output); ! ! fann_set_activation_function_hidden(x->ann, FANN_SIGMOID_SYMMETRIC); fann_set_activation_function_output(x->ann, FANN_SIGMOID_SYMMETRIC); --- 72,128 ---- void createFann(t_ann_td *x, t_symbol *sl, int argc, t_atom *argv) ! { ! unsigned int num_input = 2; ! unsigned int num_output = 1; ! unsigned int num_layers = 3; ! unsigned int num_neurons_hidden = 3; ! float connection_rate = 1; ! float learning_rate = (float)0.7; ! ! if (argc<3) ! { ! error("you must provide at least num_input, num_output amd frames number"); ! return; ! } ! if (argc>0) ! num_input = atom_getint(argv++); ! ! if (argc>1) ! num_output = atom_getint(argv++); ! ! if (argc>2) ! { ! x->frames = atom_getint(argv++); ! x->ins_frames_set=1; ! } ! ! if (argc>3) ! num_layers = atom_getint(argv++); ! ! if (argc>4) ! num_neurons_hidden = atom_getint(argv++); ! ! if (argc>5) ! connection_rate = atom_getfloat(argv++); ! ! if (argc>6) ! learning_rate = atom_getfloat(argv++); ! ! if ((num_input * x->frames)>=MAXINPUT) ! { ! error("too many inputs, maximum allowed is %f", MAXINPUT/x->frames); ! return; ! } ! ! if (num_output>=MAXOUTPUT) ! { ! error("too many outputs, maximum allowed is MAXOUTPUT"); ! return; ! } ! ! x->ann = fann_create(connection_rate, learning_rate, num_layers, ! (num_input*x->frames), num_neurons_hidden, num_output); ! ! fann_set_activation_function_hidden(x->ann, FANN_SIGMOID_SYMMETRIC); fann_set_activation_function_output(x->ann, FANN_SIGMOID_SYMMETRIC); *************** *** 187,209 **** void train_on_file(t_ann_td *x, t_symbol *sl, int argc, t_atom *argv) ! { if (x->ann == 0) { error("ann not initialized"); return; - } - - if (argc<1) - { - error("you must specify the filename with training data"); - return; - } else - { - x->filenametrain = atom_gensym(argv); } ! ! //post("nn: starting training on file %s, please be patient and wait for my next message (it could take severeal minutes to complete training)", x->filenametrain->s_name); ! ! fann_train_on_file(x->ann, x->filenametrain->s_name, x->max_iterations, x->iterations_between_reports, x->desired_error); --- 187,209 ---- void train_on_file(t_ann_td *x, t_symbol *sl, int argc, t_atom *argv) ! { if (x->ann == 0) { error("ann not initialized"); return; } ! ! if (argc<1) ! { ! error("you must specify the filename with training data"); ! return; ! } else ! { ! x->filenametrain = atom_gensym(argv); ! } ! ! //post("nn: starting training on file %s, please be patient and wait for my next message (it could take severeal minutes to complete training)", x->filenametrain->s_name); ! ! fann_train_on_file(x->ann, x->filenametrain->s_name, x->max_iterations, x->iterations_between_reports, x->desired_error); *************** *** 278,282 **** int i=0; unsigned j=0; - unsigned k=0; //fann_type input[MAXINPUT]; fann_type *calc_out; --- 278,281 ---- *************** *** 576,581 **** x->f_out = outlet_new(&x->x_obj, &s_float); ! x->desired_error = (float)0.001; ! x->max_iterations = 500000; x->iterations_between_reports = 1000; x->mode=RUN; --- 575,580 ---- x->f_out = outlet_new(&x->x_obj, &s_float); ! x->desired_error = (float)0.001; ! x->max_iterations = 500000; x->iterations_between_reports = 1000; x->mode=RUN; *************** *** 663,665 **** ! } \ No newline at end of file --- 662,664 ---- ! } Index: ann_som.c =================================================================== RCS file: /cvsroot/pure-data/externals/ann/src/ann_som.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ann_som.c 12 Apr 2005 13:27:42 -0000 1.5 --- ann_som.c 19 May 2005 14:07:23 -0000 1.6 *************** *** 330,336 **** freebytes(ap, x->num_sensors*sizeof(t_atom)); - - - } --- 330,333 ---- *************** *** 758,761 **** --- 755,760 ---- class_addmethod(som_class, (t_method)som_write, gensym("write"), A_GIMME, 0); + class_addmethod(som_class, (t_method)som_dump, gensym("dump"), A_FLOAT, 0); + class_addmethod(som_class, (t_method)som_print, gensym("print"), 0); class_addmethod(som_class, (t_method)som_help, gensym("help"), 0);

1 0

externals/ann/src makefile.linux,1.3,1.4
by IOhannes m zmölnig 19 May '05

19 May '05

Update of /cvsroot/pure-data/externals/ann/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28187 Modified Files: makefile.linux Log Message: now it compiles on my system, producing a bunch of pd_linux's Index: makefile.linux =================================================================== RCS file: /cvsroot/pure-data/externals/ann/src/makefile.linux,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** makefile.linux 18 May 2005 15:24:35 -0000 1.3 --- makefile.linux 19 May 2005 14:06:39 -0000 1.4 *************** *** 1,5 **** - current: all - - # the ANN-EXTERNAL-makefile # everything is GnuGPL that should come with the ann.tgz --- 1,2 ---- *************** *** 21,33 **** INSTALL_PREFIX = /usr/local PDLIBDIR = /lib/pd - #these were the user adjustables ! TARGETS = ann \ ! ann_som \ ! ann_mlp \ ! ann_td \ # ----------------------- LINUX ---------------------------- .SUFFIXES: .pd_linux --- 18,36 ---- INSTALL_PREFIX = /usr/local PDLIBDIR = /lib/pd + # the *.dll-files go into $(DESTDIR)$(INSTALLL_PREFIX)$(PDLIBDIR)$(LIBRARY_DIR) + LIBRARY_DIR=/extra + # the reference-files go into $(DESTDIR)$(INSTALLL_PREFIX)$(PDLIBDIR)$(REFERENCE_DIR) + #REFERENCE_DIR=/doc/5.reference/ann + REFERENCE_DIR=/extra/help-ann ! #these were the user adjustables ! #--------------------------------- + TARGETS = ann_som.c \ + ann_mlp.c \ + ann_td.c \ + # ----------------------- LINUX ---------------------------- .SUFFIXES: .pd_linux *************** *** 38,81 **** PD_DIR = $(DESTDIR)$(INSTALL_PREFIX)$(PDLIBDIR) ifeq (${ARCH},alpha) ! AFLAGS = -mieee -mcpu=ev56 endif LINCLUDE = ! $(LINUXOBJECTS): *.h #CFLAGS = -O2 -g -Wall $(LINCLUDE) $(UCFLAGS) $(AFLAGS) ! CFLAGS = -O2 -O6 -funroll-loops -march=pentium3 -fomit-frame-pointer -Wall $(LINCLUDE) $(UCFLAGS) $(AFLAGS) ! ! everything: clean all install distclean ! distclean: ! touch dummy.o ! touch dummy.pd_linux ! touch dummy~ ! rm *.o *.pd_linux *~ ! clean: ! touch dummy.o ! touch dummy.pd_linux ! rm *.o *.pd_linux ! all: $(LINUXOBJECTS) ! @echo :: $(LINUXOBJECTS) ! ld -export_dynamic -shared -o ann.pd_linux *.o -lc -lm ! strip --strip-unneeded ann.pd_linux ! .c.pd_linux: ! cc $(CFLAGS) -O2 -DPD -fPIC $(INCLUDE) -c -o $*.o $*.c install: installdocs ! install -m 644 ann.pd_linux $(PD_DIR)/externs installdocs: ! install -d $(PD_DIR)/doc/5.reference/ann ! install -m644 ../examples/* $(PD_DIR)/doc/5.reference/ann --- 41,87 ---- PD_DIR = $(DESTDIR)$(INSTALL_PREFIX)$(PDLIBDIR) + PD_INSTALLDIR_LIB = $(PD_DIR)$(LIBRARY_DIR) + PD_INSTALLDIR_REF = $(PD_DIR)$(REFERENCE_DIR) ifeq (${ARCH},alpha) ! AFLAGS = -mieee -mcpu=ev56 endif + + STRIP=strip + STRIPFLAGS=--strip-unneeded + + LINCLUDE = ! OPTIMIZE_FLAGS = -O2 -O6 -funroll-loops -march=pentium3 ! DEFS = -DPD #CFLAGS = -O2 -g -Wall $(LINCLUDE) $(UCFLAGS) $(AFLAGS) ! CFLAGS = $(OPTIMIZE_FLAGS) -fomit-frame-pointer -fPIC -Wall $(LINCLUDE) $(UCFLAGS) $(AFLAGS) $(DEFS) ! LDFLAGS = -Wl,-export_dynamic -shared ! LIBS = -lc -lm -lfann ! # here come the targets ! all: $(TARGETS:%.c=%.pd_linux) ! %.pd_linux: %.c ! $(CC) $(CFLAGS) $(INCLUDE) $(LDFLAGS) -o "$*.pd_linux" "$*.c" $(LIBS) ! $(STRIP) $(STRIPFLAGS) "$*.pd_linux" ! everything: clean all install distclean ! distclean: ! -rm *.o *.pd_linux *~ + clean: + -rm *.o *.pd_linux install: installdocs ! install -m 644 ann*.pd_linux $(PD_INSTALLDIR_LIB) installdocs: ! install -d $(PD_INSTALLDIR_REF) ! install -m644 ../examples/* $(PD_INSTALLDIR_REF)

1 0

externals/zexy/src configure.ac,1.2,1.3
by IOhannes m zmölnig 19 May '05

19 May '05

Update of /cvsroot/pure-data/externals/zexy/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18135 Modified Files: configure.ac Log Message: another attempt to fix the configure for osX Index: configure.ac =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/configure.ac,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** configure.ac 18 May 2005 16:50:12 -0000 1.2 --- configure.ac 19 May 2005 10:22:42 -0000 1.3 *************** *** 35,39 **** AC_ARG_ENABLE(lpt, [ --enable-lpt enable parallelport-support]) AC_ARG_ENABLE(icc, [ --enable-icc enable ICC-support]) ! if test $includedir --- 35,42 ---- AC_ARG_ENABLE(lpt, [ --enable-lpt enable parallelport-support]) AC_ARG_ENABLE(icc, [ --enable-icc enable ICC-support]) ! if test `uname -s` = Darwin; ! then ! AC_ARG_ENABLE(bundle, [ --enable-bundleloader use bundle_loader (default: autodetect)]) ! fi if test $includedir *************** *** 74,83 **** DFLAGS="-DZEXY_LIBRARY" dnl ! dnl OK, checks for machines are here now dnl if test `uname -s` = Linux; then ! LFLAGS="-export_dynamic -shared" EXT=pd_linux STRIPFLAGS="--strip-unneeded" --- 77,145 ---- DFLAGS="-DZEXY_LIBRARY" + + dnl Checks for pd-version, to set the correct help-path + AC_MSG_CHECKING("pd\>=0.37") + + if test "$with_pdversion" != "" + then + echo -n "($with_pdversion)... " + PD_VERSION="$with_pdversion" + else + cat > conftest.c << EOF + #include <stdio.h> + #include "m_pd.h" + int main(){ + printf("%d.%d\n", PD_MAJOR_VERSION, PD_MINOR_VERSION); + return 0; + } + EOF + if $CC $INCLUDES -o conftest.o conftest.c > /dev/null 2>&1 + then + PD_VERSION=`./conftest.o` + else + PD_VERSION="" + fi + fi + + let PD_MAJORVERSION=`echo $PD_VERSION | cut -d"." -f1`+0 + let PD_MINORVERSION=`echo $PD_VERSION | cut -d"." -f2`+0 + + if test "$PD_MAJORVERSION" -gt 0 || test "$PD_MINORVERSION" -ge 37 + then + REFERENCEPATH=extra/help- + echo "yes" + else + REFERENCEPATH=doc/5.reference/ + echo "no" + fi + + dnl check for zexy-version (but why...) + AC_MSG_CHECKING("zexy-version") + cat > conftest.c << EOF + #include <stdio.h> + #include "zexy.h" + int main(){ + printf("%s\n", VERSION); + return 0; + } + EOF + + if $CC $INCLUDES $DFLAGS -o conftest.o conftest.c > /dev/null 2>&1 + then + ZEXY_VERSION=`./conftest.o` + echo "$ZEXY_VERSION" + else + ZEXY_VERSION="X" + echo "(unknown)" + fi + + + dnl ! dnl OK, checks which machines are here now dnl if test `uname -s` = Linux; then ! LFLAGS="-export_dynamic -shared" EXT=pd_linux STRIPFLAGS="--strip-unneeded" *************** *** 101,107 **** then LD=cc - LFLAGS="-bundle -undefined suppress -flat_namespace" EXT=pd_darwin ! STRIPFLAGS= if test "$enable_lpt" = "yes"; then AC_MSG_ERROR("lpt not supported on this platform"); --- 163,187 ---- then LD=cc EXT=pd_darwin ! ! if test "$enable_bundleloader" = ""; then ! if test "$PD_MAJORVERSION" -gt 0 || test "$PD_MINORVERSION" -ge 39; then ! enable_bundleloader="yes" ! else ! enable_bundleloader="no" ! fi ! fi ! if test "$enable_bundleloader" = "yes"; then ! dnl i hope "prefix" points to where we want it... ! dnl should it rather be @exec_prefix@ ??? ! LFLAGS="-bundle -bundle_loader @prefix@/bin/pd" ! STRIPFLAGS= ! else ! LFLAGS="-bundle -undefined suppress -flat_namespace" ! STRIPFLAGS= ! fi ! ! ! if test "$enable_lpt" = "yes"; then AC_MSG_ERROR("lpt not supported on this platform"); *************** *** 112,115 **** --- 192,196 ---- fi fi + if test `uname | sed -e 's/^MINGW.*/NT/'` = NT; then *************** *** 156,216 **** fi - dnl Checks for pd-version, to set the correct help-path - AC_MSG_CHECKING("pd\>=0.37") - - if test "$with_pdversion" != "" - then - echo -n "($with_pdversion)... " - PD_VERSION="$with_pdversion" - else - cat > conftest.c << EOF - #include <stdio.h> - #include "m_pd.h" - int main(){ - printf("%d.%d\n", PD_MAJOR_VERSION, PD_MINOR_VERSION); - return 0; - } - EOF - if $CC $INCLUDES -o conftest.o conftest.c > /dev/null 2>&1 - then - PD_VERSION=`./conftest.o` - else - PD_VERSION="" - fi - fi - - let PD_MAJORVERSION=`echo $PD_VERSION | cut -d"." -f1`+0 - let PD_MINORVERSION=`echo $PD_VERSION | cut -d"." -f2`+0 - - if test "$PD_MAJORVERSION" -gt 0 || test "$PD_MINORVERSION" -ge 37 - then - REFERENCEPATH=extra/help- - echo "yes" - else - REFERENCEPATH=doc/5.reference/ - echo "no" - fi - - dnl check for zexy-version (but why...) - AC_MSG_CHECKING("zexy-version") - cat > conftest.c << EOF - #include <stdio.h> - #include "zexy.h" - int main(){ - printf("%s\n", VERSION); - return 0; - } - EOF - - if $CC $INCLUDES $DFLAGS -o conftest.o conftest.c > /dev/null 2>&1 - then - ZEXY_VERSION=`./conftest.o` - echo "$ZEXY_VERSION" - else - ZEXY_VERSION="X" - echo "(unknown)" - fi - - dnl check for LPT AC_MSG_CHECKING("parallel-port") --- 237,240 ----

1 0

[PD-cvs] externals/zexy/src a2l.c, 1.1, 1.2 atoi.c, 1.1, 1.2 avg~.c, 1.1, 1.2 blockmirror~.c, 1.1, 1.2 blockswap~.c, 1.1, 1.2 date.c, 1.1, 1.2 demultiplex.c, 1.1, 1.2 demultiplex~.c, 1.1, 1.2 dfreq~.c, 1.1, 1.2 dirac~.c, 1.1, 1.2 dot.c, 1.1, 1.2 drip.c, 1.1, 1.2 envrms~.c, 1.1, 1.2 fifop.c, 1.1, 1.2 glue.c, 1.1, 1.2 index.c, 1.2, 1.3 length.c, 1.1, 1.2 lifop.c, 1.1, 1.2 limiter~.c, 1.1, 1.2 list2int.c, 1.1, 1.2 list2symbol.c, 1.1, 1.2 lister.c, 1.3, 1.4 lpt.c, 1.2, 1.3 makesource.sh, 1.2, 1.3 makesymbol.c,
by IOhannes m zmölnig 19 May '05

19 May '05

Update of /cvsroot/pure-data/externals/zexy/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10512 Modified Files: a2l.c atoi.c avg~.c blockmirror~.c blockswap~.c date.c demultiplex.c demultiplex~.c dfreq~.c dirac~.c dot.c drip.c envrms~.c fifop.c glue.c index.c length.c lifop.c limiter~.c list2int.c list2symbol.c lister.c lpt.c makesource.sh makesymbol.c mavg.c minmax.c msgfile.c multiline~.c multiplex.c multiplex~.c niagara.c noish~.c noisi~.c operating_system.c packel.c pack~.c pdf~.c prime.c quantize~.c repack.c repeat.c sfplay.c sfrecord.c sigzero~.c sort.c step~.c strcmp.c sum.c swap~.c symbol2list.c tabdump.c tabminmax.c tabset.c tavg~.c time.c unpack~.c urn.c winNT_portio.c wrap.c z_sigbin.c z~.c Log Message: hopefully fixed the makesource-process for other platforms Index: time.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/time.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** time.c 22 Mar 2005 20:58:23 -0000 1.1 --- time.c 19 May 2005 09:42:55 -0000 1.2 *************** *** 121,122 **** --- 121,127 ---- zexy_register("time"); } + + void z_time_setup(void) + { + time_setup(); + } Index: noisi~.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/noisi~.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** noisi~.c 17 May 2005 16:50:28 -0000 1.1 --- noisi~.c 19 May 2005 09:42:55 -0000 1.2 *************** *** 166,167 **** --- 166,172 ---- class_sethelpsymbol(noisi_class, gensym("zexy/noisi~")); } + + void z_noisi__setup(void) + { + noisi_tilde_setup(); + } Index: multiplex.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/multiplex.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** multiplex.c 17 May 2005 15:07:37 -0000 1.2 --- multiplex.c 19 May 2005 09:42:55 -0000 1.3 *************** *** 105,106 **** --- 105,111 ---- zexy_register("multiplex"); } + + void z_multiplex_setup(void) + { + multiplex_setup(); + } Index: sfrecord.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/sfrecord.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** sfrecord.c 12 Apr 2005 13:27:07 -0000 1.2 --- sfrecord.c 19 May 2005 09:42:55 -0000 1.3 *************** *** 608,609 **** --- 608,614 ---- zexy_register("sfrecord"); } + + void z_sfrecord_setup(void) + { + sfrecord_setup(); + } Index: winNT_portio.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/winNT_portio.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** winNT_portio.c 22 Mar 2005 20:58:23 -0000 1.1 --- winNT_portio.c 19 May 2005 09:42:55 -0000 1.2 *************** *** 106,107 **** --- 106,111 ---- } #endif /* NT */ + + void z_winNT_portio_setup(void) + { + } Index: tabset.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/tabset.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** tabset.c 22 Mar 2005 20:58:23 -0000 1.1 --- tabset.c 19 May 2005 09:42:55 -0000 1.2 *************** *** 101,102 **** --- 101,107 ---- class_sethelpsymbol(tabset_class, gensym("zexy/tabset")); } + + void z_tabset_setup(void) + { + tabset_setup(); + } Index: wrap.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/wrap.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wrap.c 22 Mar 2005 20:58:23 -0000 1.1 --- wrap.c 19 May 2005 09:42:55 -0000 1.2 *************** *** 80,81 **** --- 80,86 ---- zexy_register("wrap"); } + + void z_wrap_setup(void) + { + wrap_setup(); + } Index: blockmirror~.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/blockmirror~.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** blockmirror~.c 17 May 2005 16:50:28 -0000 1.1 --- blockmirror~.c 19 May 2005 09:42:55 -0000 1.2 *************** *** 103,104 **** --- 103,109 ---- zexy_register("blockmirror~"); } + + void z_blockmirror__setup(void) + { + blockmirror_tilde_setup(); + } Index: tabdump.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/tabdump.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** tabdump.c 22 Mar 2005 20:58:23 -0000 1.1 --- tabdump.c 19 May 2005 09:42:55 -0000 1.2 *************** *** 116,117 **** --- 116,122 ---- class_sethelpsymbol(tabdump_class, gensym("zexy/tabdump")); } + + void z_tabdump_setup(void) + { + tabdump_setup(); + } Index: unpack~.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/unpack~.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** unpack~.c 17 May 2005 16:50:28 -0000 1.1 --- unpack~.c 19 May 2005 09:42:55 -0000 1.2 *************** *** 133,134 **** --- 133,139 ---- zexy_register("unpack~"); } + + void z_unpack__setup(void) + { + unpack_tilde_setup(); + } Index: operating_system.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/operating_system.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** operating_system.c 22 Mar 2005 20:58:22 -0000 1.1 --- operating_system.c 19 May 2005 09:42:55 -0000 1.2 *************** *** 65,66 **** --- 65,71 ---- zexy_register("operating_system"); } + + void z_operating_system_setup(void) + { + operating_system_setup(); + } Index: demultiplex~.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/demultiplex~.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** demultiplex~.c 17 May 2005 16:50:28 -0000 1.1 --- demultiplex~.c 19 May 2005 09:42:55 -0000 1.2 *************** *** 118,119 **** --- 118,124 ---- zexy_register("demultiplex~"); } + + void z_demultiplex__setup(void) + { + demultiplex_tilde_setup(); + } Index: sum.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/sum.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** sum.c 22 Mar 2005 20:58:23 -0000 1.1 --- sum.c 19 May 2005 09:42:55 -0000 1.2 *************** *** 60,61 **** --- 60,66 ---- zexy_register("sum"); } + + void z_sum_setup(void) + { + sum_setup(); + } Index: list2int.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/list2int.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** list2int.c 22 Mar 2005 20:58:22 -0000 1.1 --- list2int.c 19 May 2005 09:42:55 -0000 1.2 *************** *** 80,81 **** --- 80,91 ---- zexy_register("list2int"); } + + void l2i_setup(void) + { + list2int_setup(); + } + + void z_list2int_setup(void) + { + list2int_setup(); + } Index: msgfile.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/msgfile.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** msgfile.c 22 Mar 2005 20:58:22 -0000 1.1 --- msgfile.c 19 May 2005 09:42:55 -0000 1.2 *************** *** 799,800 **** --- 799,805 ---- zexy_register("msgfile"); } + + void z_msgfile_setup(void) + { + msgfile_setup(); + } Index: swap~.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/swap~.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** swap~.c 17 May 2005 16:50:28 -0000 1.1 --- swap~.c 19 May 2005 09:42:55 -0000 1.2 *************** *** 100,101 **** --- 100,106 ---- zexy_register("swap~"); } + + void z_swap__setup(void) + { + swap_tilde_setup(); + } Index: tabminmax.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/tabminmax.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** tabminmax.c 22 Mar 2005 20:58:23 -0000 1.1 --- tabminmax.c 19 May 2005 09:42:55 -0000 1.2 *************** *** 139,140 **** --- 139,145 ---- class_sethelpsymbol(tabminmax_class, gensym("zexy/tabminmax")); } + + void z_tabminmax_setup(void) + { + tabminmax_setup(); + } Index: index.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/index.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** index.c 12 Apr 2005 13:27:07 -0000 1.2 --- index.c 19 May 2005 09:42:55 -0000 1.3 *************** *** 225,226 **** --- 225,231 ---- zexy_register("index"); } + + void z_index_setup(void) + { + index_setup(); + } Index: lpt.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/lpt.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** lpt.c 13 Apr 2005 17:23:30 -0000 1.2 --- lpt.c 19 May 2005 09:42:55 -0000 1.3 *************** *** 231,232 **** --- 231,237 ---- zexy_register("lpt"); } + + void z_lpt_setup(void) + { + lpt_setup(); + } Index: limiter~.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/limiter~.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** limiter~.c 17 May 2005 16:50:28 -0000 1.1 --- limiter~.c 19 May 2005 09:42:55 -0000 1.2 *************** *** 718,719 **** --- 718,724 ---- zexy_register("limiter~"); } + + void z_limiter__setup(void) + { + limiter_tilde_setup(); + } Index: blockswap~.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/blockswap~.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** blockswap~.c 17 May 2005 16:50:28 -0000 1.1 --- blockswap~.c 19 May 2005 09:42:55 -0000 1.2 *************** *** 98,99 **** --- 98,104 ---- zexy_register("blockswap~"); } + + void z_blockswap__setup(void) + { + blockswap_tilde_setup(); + } Index: lister.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/lister.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** lister.c 18 May 2005 16:49:10 -0000 1.3 --- lister.c 19 May 2005 09:42:55 -0000 1.4 *************** *** 88,89 **** --- 88,94 ---- lister_setup(); } + + void z_lister_setup(void) + { + lister_setup(); + } Index: dot.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/dot.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** dot.c 22 Mar 2005 20:58:22 -0000 1.1 --- dot.c 19 May 2005 09:42:55 -0000 1.2 *************** *** 161,162 **** --- 161,167 ---- zexy_register("."); } + + void z_dot_setup(void) + { + dot_setup(); + } Index: tavg~.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/tavg~.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** tavg~.c 17 May 2005 16:50:28 -0000 1.1 --- tavg~.c 19 May 2005 09:42:55 -0000 1.2 *************** *** 98,99 **** --- 98,104 ---- zexy_register("tavg~"); } + + void z_tavg__setup(void) + { + tavg_tilde_setup(); + } Index: pack~.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/pack~.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** pack~.c 17 May 2005 16:50:28 -0000 1.1 --- pack~.c 19 May 2005 09:42:55 -0000 1.2 *************** *** 85,86 **** --- 85,91 ---- zexy_register("pack~"); } + + void z_pack__setup(void) + { + pack_tilde_setup(); + } Index: symbol2list.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/symbol2list.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** symbol2list.c 22 Mar 2005 20:58:23 -0000 1.1 --- symbol2list.c 19 May 2005 09:42:55 -0000 1.2 *************** *** 162,163 **** --- 162,171 ---- zexy_register("symbol2list"); } + void s2l_setup(void) + { + symbol2list_setup(); + } + void z_symbol2list_setup(void) + { + symbol2list_setup(); + } Index: niagara.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/niagara.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** niagara.c 22 Mar 2005 20:58:22 -0000 1.1 --- niagara.c 19 May 2005 09:42:55 -0000 1.2 *************** *** 109,110 **** --- 109,115 ---- zexy_register("niagara"); } + + void z_niagara_setup(void) + { + niagara_setup(); + } Index: packel.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/packel.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** packel.c 22 Mar 2005 20:58:22 -0000 1.1 --- packel.c 19 May 2005 09:42:55 -0000 1.2 *************** *** 106,107 **** --- 106,112 ---- zexy_register("packel"); } + + void z_packel_setup(void) + { + packel_setup(); + } Index: atoi.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/atoi.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** atoi.c 22 Mar 2005 20:58:20 -0000 1.1 --- atoi.c 19 May 2005 09:42:55 -0000 1.2 *************** *** 97,98 **** --- 97,103 ---- zexy_register("atoi"); } + + void z_atoi_setup(void) + { + atoi_setup(); + } Index: list2symbol.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/list2symbol.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** list2symbol.c 22 Mar 2005 20:58:22 -0000 1.1 --- list2symbol.c 19 May 2005 09:42:55 -0000 1.2 *************** *** 140,141 **** --- 140,149 ---- zexy_register("list2symbol"); } + void l2s_setup(void) + { + list2symbol_setup(); + } + void z_list2symbol_setup(void) + { + list2symbol_setup(); + } Index: minmax.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/minmax.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** minmax.c 22 Mar 2005 20:58:22 -0000 1.1 --- minmax.c 19 May 2005 09:42:55 -0000 1.2 *************** *** 83,84 **** --- 83,89 ---- zexy_register("minmax"); } + + void z_minmax_setup(void) + { + minmax_setup(); + } Index: multiplex~.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/multiplex~.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** multiplex~.c 17 May 2005 16:50:28 -0000 1.1 --- multiplex~.c 19 May 2005 09:42:55 -0000 1.2 *************** *** 111,112 **** --- 111,117 ---- zexy_register("multiplex~"); } + + void z_multiplex__setup(void) + { + multiplex_tilde_setup(); + } Index: glue.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/glue.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** glue.c 22 Mar 2005 20:58:22 -0000 1.1 --- glue.c 19 May 2005 09:42:55 -0000 1.2 *************** *** 113,114 **** --- 113,119 ---- zexy_register("glue"); } + + void z_glue_setup(void) + { + glue_setup(); + } Index: z~.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/z~.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** z~.c 17 May 2005 16:50:28 -0000 1.1 --- z~.c 19 May 2005 09:42:55 -0000 1.2 *************** *** 131,132 **** --- 131,137 ---- zexy_register("z~"); } + + void z_z__setup(void) + { + z_tilde_setup(); + } Index: pdf~.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/pdf~.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** pdf~.c 17 May 2005 16:50:28 -0000 1.1 --- pdf~.c 19 May 2005 09:42:55 -0000 1.2 *************** *** 139,140 **** --- 139,145 ---- zexy_register("pdf~"); } + + void z_pdf__setup(void) + { + pdf_tilde_setup(); + } Index: z_sigbin.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/z_sigbin.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** z_sigbin.c 22 Mar 2005 20:58:25 -0000 1.2 --- z_sigbin.c 19 May 2005 09:42:55 -0000 1.3 *************** *** 815,816 **** --- 815,821 ---- zexy_register("sigbin"); } + void z_z_sigbin_setup(void) + { + /* ok, looks a bit like nonsense... */ + z_sigbin_setup(); + } Index: avg~.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/avg~.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** avg~.c 17 May 2005 16:50:28 -0000 1.1 --- avg~.c 19 May 2005 09:42:55 -0000 1.2 *************** *** 84,85 **** --- 84,90 ---- zexy_register("avg~"); } + + void z_avg__setup(void) + { + avg_tilde_setup(); + } Index: sigzero~.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/sigzero~.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** sigzero~.c 17 May 2005 16:50:28 -0000 1.1 --- sigzero~.c 19 May 2005 09:42:55 -0000 1.2 *************** *** 110,111 **** --- 110,116 ---- zexy_register("sigzero~"); } + + void z_sigzero__setup(void) + { + sigzero_tilde_setup(); + } Index: sort.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/sort.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** sort.c 4 Apr 2005 12:23:48 -0000 1.2 --- sort.c 19 May 2005 09:42:55 -0000 1.3 *************** *** 150,151 **** --- 150,156 ---- zexy_register("sort"); } + + void z_sort_setup(void) + { + sort_setup(); + } Index: envrms~.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/envrms~.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** envrms~.c 17 May 2005 16:50:28 -0000 1.1 --- envrms~.c 19 May 2005 09:42:55 -0000 1.2 *************** *** 149,150 **** --- 149,155 ---- zexy_register("envrms~"); } + + void z_envrms__setup(void) + { + envrms_tilde_setup(); + } Index: repeat.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/repeat.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** repeat.c 22 Mar 2005 20:58:22 -0000 1.1 --- repeat.c 19 May 2005 09:42:55 -0000 1.2 *************** *** 59,60 **** --- 59,65 ---- zexy_register("repeat"); } + + void z_repeat_setup(void) + { + repeat_setup(); + } Index: date.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/date.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** date.c 22 Mar 2005 20:58:22 -0000 1.1 --- date.c 19 May 2005 09:42:55 -0000 1.2 *************** *** 123,124 **** --- 123,129 ---- zexy_register("date"); } + + void z_date_setup(void) + { + date_setup(); + } Index: dirac~.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/dirac~.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** dirac~.c 17 May 2005 16:50:28 -0000 1.1 --- dirac~.c 19 May 2005 09:42:55 -0000 1.2 *************** *** 112,113 **** --- 112,118 ---- zexy_register("dirac~"); } + + void z_dirac__setup(void) + { + dirac_tilde_setup(); + } Index: lifop.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/lifop.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** lifop.c 18 May 2005 16:51:41 -0000 1.1 --- lifop.c 19 May 2005 09:42:55 -0000 1.2 *************** *** 223,224 **** --- 223,229 ---- zexy_register("lifop"); } + + void z_lifop_setup(void) + { + lifop_setup(); + } Index: repack.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/repack.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** repack.c 22 Mar 2005 20:58:22 -0000 1.1 --- repack.c 19 May 2005 09:42:55 -0000 1.2 *************** *** 181,182 **** --- 181,187 ---- zexy_register("repack"); } + + void z_repack_setup(void) + { + repack_setup(); + } Index: demultiplex.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/demultiplex.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** demultiplex.c 22 Mar 2005 20:58:22 -0000 1.1 --- demultiplex.c 19 May 2005 09:42:55 -0000 1.2 *************** *** 114,115 **** --- 114,123 ---- zexy_register("demultiplex"); } + void demux_setup(void) + { + demultiplex_setup(); + } + void z_demultiplex_setup(void) + { + demultiplex_setup(); + } Index: fifop.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/fifop.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** fifop.c 18 May 2005 16:51:41 -0000 1.1 --- fifop.c 19 May 2005 09:42:55 -0000 1.2 *************** *** 232,233 **** --- 232,238 ---- zexy_register("fifop"); } + + void z_fifop_setup(void) + { + fifop_setup(); + } Index: urn.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/urn.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** urn.c 22 Mar 2005 20:58:23 -0000 1.1 --- urn.c 19 May 2005 09:42:55 -0000 1.2 *************** *** 153,154 **** --- 153,159 ---- zexy_register("urn"); } + + void z_urn_setup(void) + { + urn_setup(); + } Index: drip.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/drip.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** drip.c 22 Mar 2005 20:58:22 -0000 1.1 --- drip.c 19 May 2005 09:42:55 -0000 1.2 *************** *** 201,202 **** --- 201,207 ---- zexy_register("drip"); } + + void z_drip_setup(void) + { + drip_setup(); + } Index: makesymbol.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/makesymbol.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** makesymbol.c 22 Mar 2005 20:58:22 -0000 1.1 --- makesymbol.c 19 May 2005 09:42:55 -0000 1.2 *************** *** 145,146 **** --- 145,151 ---- zexy_register("makesymbol"); } + + void z_makesymbol_setup(void) + { + makesymbol_setup(); + } Index: sfplay.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/sfplay.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** sfplay.c 12 Apr 2005 13:27:07 -0000 1.2 --- sfplay.c 19 May 2005 09:42:55 -0000 1.3 *************** *** 674,675 **** --- 674,680 ---- zexy_register("sfplay"); } + + void z_sfplay_setup(void) + { + sfplay_setup(); + } Index: prime.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/prime.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** prime.c 22 Mar 2005 20:58:22 -0000 1.1 --- prime.c 19 May 2005 09:42:55 -0000 1.2 *************** *** 74,75 **** --- 74,80 ---- zexy_register("prime"); } + + void z_prime_setup(void) + { + prime_setup(); + } Index: mavg.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/mavg.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mavg.c 22 Mar 2005 20:58:22 -0000 1.1 --- mavg.c 19 May 2005 09:42:55 -0000 1.2 *************** *** 115,116 **** --- 115,121 ---- zexy_register("mavg"); } + + void z_mavg_setup(void) + { + mavg_setup(); + } Index: step~.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/step~.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** step~.c 17 May 2005 16:50:28 -0000 1.1 --- step~.c 19 May 2005 09:42:55 -0000 1.2 *************** *** 140,141 **** --- 140,146 ---- zexy_register("step~"); } + + void z_step__setup(void) + { + step_tilde_setup(); + } Index: makesource.sh =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/makesource.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** makesource.sh 17 May 2005 16:46:13 -0000 1.2 --- makesource.sh 19 May 2005 09:42:55 -0000 1.3 *************** *** 54,63 **** } - function get_setupfunctions() { - if [ -e "$1" ] - then - $GREP "^void .*_setup(void)" $i | $AWK '{print gensub("_setup.*", "_setup", "g", $2);}' - fi - } ################################## --- 54,57 ---- *************** *** 70,84 **** for i in `ls *.c | grep -v zexy.c` do ! NAME="${i%.c}" ! SETUPNAMES=`get_setupfunctions $i` ! if [ "$SETUPNAMES" ] ! then ! echo " $i \\" >> $ZEXY_S ! for SETUPNAME in $SETUPNAMES ! do ! echo "void ${SETUPNAME}(void);" >> $ZEXY_H ! echo " ${SETUPNAME}();" >> $ZEXY_C ! done ! fi done --- 64,75 ---- for i in `ls *.c | grep -v zexy.c` do ! ## each c-file in zexy needs to have a z_<file>_setup()-function ! ## that calls all needed setup-functions ! ## any non-alpha-numeric-character is replaced by "_" ! ## e.g. "multiplex~.c" -> "z_multiplex__setup()" ! SETUPNAME=z_`echo ${i%.c} | sed -e 's/[^[:alnum:]]/_/g'`_setup ! echo " $i \\" >> $ZEXY_S ! echo "void ${SETUPNAME}(void); /* $i */" >> $ZEXY_H ! echo " ${SETUPNAME}(); /* $i */" >> $ZEXY_C done Index: length.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/length.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** length.c 22 Mar 2005 20:58:22 -0000 1.1 --- length.c 19 May 2005 09:42:55 -0000 1.2 *************** *** 60,61 **** --- 60,66 ---- zexy_register("length"); } + + void z_length_setup(void) + { + length_setup(); + } Index: multiline~.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/multiline~.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** multiline~.c 17 May 2005 16:50:28 -0000 1.1 --- multiline~.c 19 May 2005 09:42:55 -0000 1.2 *************** *** 262,263 **** --- 262,268 ---- zexy_register("multiline_tilde"); } + + void z_multiline__setup(void) + { + multiline_tilde_setup(); + } Index: noish~.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/noish~.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** noish~.c 17 May 2005 16:50:28 -0000 1.1 --- noish~.c 19 May 2005 09:42:55 -0000 1.2 *************** *** 183,184 **** --- 183,189 ---- class_sethelpsymbol(noish_class, gensym("zexy/noish~")); } + + void z_noish__setup(void) + { + noish_tilde_setup(); + } Index: dfreq~.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/dfreq~.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** dfreq~.c 17 May 2005 16:50:28 -0000 1.1 --- dfreq~.c 19 May 2005 09:42:55 -0000 1.2 *************** *** 111,112 **** --- 111,117 ---- zexy_register("dfreq~"); } + + void z_dfreq__setup(void) + { + dfreq_tilde_setup(); + } Index: strcmp.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/strcmp.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** strcmp.c 22 Mar 2005 20:58:23 -0000 1.1 --- strcmp.c 19 May 2005 09:42:55 -0000 1.2 *************** *** 102,103 **** --- 102,108 ---- zexy_register("strcmp"); } + + void z_strcmp_setup(void) + { + strcmp_setup(); + } Index: quantize~.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/quantize~.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** quantize~.c 17 May 2005 16:50:28 -0000 1.1 --- quantize~.c 19 May 2005 09:42:55 -0000 1.2 *************** *** 112,113 **** --- 112,118 ---- zexy_register("quantize~"); } + + void z_quantize__setup(void) + { + quantize_tilde_setup(); + } Index: a2l.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/a2l.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** a2l.c 22 Mar 2005 20:58:20 -0000 1.1 --- a2l.c 19 May 2005 09:42:55 -0000 1.2 *************** *** 89,90 **** --- 89,95 ---- zexy_register("a2l"); } + + void z_a2l_setup(void) + { + a2l_setup(); + }

1 0

externals/ann/helps ann_mlp-manual.txt,NONE,1.1
by dmorelli 19 May '05

19 May '05

Update of /cvsroot/pure-data/externals/ann/helps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32193 Added Files: ann_mlp-manual.txt Log Message: added a simple manual for ann_mlp --- NEW FILE: ann_mlp-manual.txt --- -----------------ann_mlp manual by davide morelli - info(a)davidemorelli.it -----------What is a neural network? To be shure you fully understand what is and why to use a ANN, read http://www.doc.ic.ac.uk/~nd/surprise_96/journal/vol4/cs11/report.html -----------Why use a ANN? Because they are useful in Pattern recognition, gesure recognition (patterns over time), associative recall of data (images, sounds, etc), predictions (e.g. time-series forecasting), complex data handling, etc.. --ANNs can handle noisy inputs: if you trained your ANN that [1,1] -> 1 Then if you pass [1.1, 0.9] -> 1 probably.. --ANNs can be trained without writing code: see ann/examples/ann_mlp_example2 (in CVS), you can teach the ANN to tell you when all these balls are close together or still.. How could you do this coding? You'd have to compute the distance of every ball from every other ball, then sum all the distances and ... Very complex and difficult! With ANN you simply teach when the balls are close and when they are not, you don't have to write code at all, you just have to use pd. -----------How to build a ANN? INPUTS: You must code your input data as a list of float. E.g. If you want timbre recognition you must fft a signal then build a list with fft's partial and feed ann_mlp with it E.g. if you want midi chord recognition and you played A4 C5 E6 then use the midi values of the notes of the chord to build a list with 3 integers (57 60 64) Tip: inputs should be 0 centered the example of chord recognition should not work well (hard to train) because possible input values go from 30 to 90, you should remap them so they go from -30 to 30 Notice how the inputs in ann/examples/ann_mlp_example2 go from -1 to 1 If you can't make inputs 0 centered they should at least start from 0 Tip: inputs should be normalized If you have one input that goes from -10 to 10 and another input that goes from -1 to 1 the first input will be more important than the second input OUTPUTS: Each "meaning" you want your ANN to detect should have its own output. Notice ann/examples/ann_mlp_example2: "Calm" and "chaos" have their outputs even if they are related. I could have set only 1 output = for calm and 1 for chaos. But having separated outputs I can see if my ANN has been trained well or not, but also could be that a situation is neither calm nor chaotic, or somehow calm AND chaotic.. -----------TRAINING ON THE FLY: It is much easier to train the ANN on the fly rather than using a train file. To train on the fly you simply must pass a list with [inputs + expected outputs( If you have 3 inputs and 2 outputs then you must pass a list with 5 floats E.g. You want to train a ANN for a simple logical function: OR You build a ann_mlp with 2 inputs and 1 output You set |train( You pass lists like |0 0 0( inputs are 0 0 output is 0 |1 0 1( inputs are 1 0 output is 1 |0 1 1( inputs are 0 1 output is 1 And so on.. Repeating until MSE is low enough MSE tells you the general error the ANN currently have with the inputs and outputs you are giving When you are ready set |run( And start passing lists with only inputs values |0 0( |1 0( Etc.. The left outlet of ann_mlp will start sending lists of float, in this case a list with only 1 float -----------PUTTING ALL TOGETHER: 1) Create a ANN passing ann_mlp a message with num_inputs and num_outputs E.g. (the simple ann for logical function OR) |create 2 1( | [ann_mlp] 2) set train mode |train( | [ann_mlp] 3) train the ANN passing lists num_inputs+num_outputs long |0 0 0( | [ann_mlp] (repeat at will using different inputs until mse is low - right outlet) 4) set run mode |run( | [ann_mlp] 5) run the net passing lists num_inputs long, the left outlet will send a list with the results |0 0( | [ann_mlp] When everything is fine you can save it to a file |save filename( | [ann_mlp] Can be loaded in 2 ways |load filename( | [ann_mlp] Or as argument [ann_mlp filename] ----------- For a more in-depth sight over technical issues: http://fann.sourceforge.net/report/report.html See fann manual for details on advanced params (activation functions, training params, etc..) http://fann.sourceforge.net/ ----------- questions and suggestions to info(a)davidemorelli.it

1 0

externals/ann/helps help-ann_mlp.pd,1.1,1.2
by dmorelli 19 May '05

19 May '05

Update of /cvsroot/pure-data/externals/ann/helps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30007 Modified Files: help-ann_mlp.pd Log Message: train on the fly has an autotrainer Index: help-ann_mlp.pd =================================================================== RCS file: /cvsroot/pure-data/externals/ann/helps/help-ann_mlp.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** help-ann_mlp.pd 18 May 2005 15:57:32 -0000 1.1 --- help-ann_mlp.pd 19 May 2005 08:52:26 -0000 1.2 *************** *** 1,4 **** ! #N canvas 117 93 838 448 12; ! #N canvas 181 295 623 324 creation 0; #X obj 52 235 outlet; #X msg 49 10 create; --- 1,4 ---- ! #N canvas 99 68 846 456 12; ! #N canvas 181 295 627 328 creation 0; #X obj 52 235 outlet; #X msg 49 10 create; *************** *** 21,25 **** #X connect 5 0 0 0; #X restore 93 68 pd creation examples; ! #N canvas 136 60 724 352 run 0; #X obj 90 219 outlet; #X msg 123 69 0 1; --- 21,25 ---- #X connect 5 0 0 0; #X restore 93 68 pd creation examples; ! #N canvas 136 60 728 356 run 0; #X obj 90 219 outlet; #X msg 123 69 0 1; *************** *** 151,155 **** ; #X text 272 371 by Davide Morelli - info(a)davidemorelli.it; ! #N canvas 468 204 572 403 train 0; #X obj 32 241 outlet; #N canvas 0 0 458 308 train 0; --- 151,155 ---- ; #X text 272 371 by Davide Morelli - info(a)davidemorelli.it; ! #N canvas 468 204 580 411 train 0; #X obj 32 241 outlet; #N canvas 0 0 458 308 train 0; *************** *** 304,318 **** #X connect 1 0 4 0; #X restore 79 103 pd train you net using a train file; ! #N canvas 100 44 884 550 train 0; ! #X obj 57 397 outlet; #X msg 60 31 train; #X text 126 33 1- set the train mode; ! #X text 116 81 2- build a list with inputs and desired output; ! #X text 139 101 be shure you provide the correct numbers of inputs and outputs; #X obj 168 202 pack s f f f; #X obj 197 248 pack f f f; #X obj 168 225 unpack s f f f; ! #X msg 192 374 run; #X obj 198 170 tgl 15 0 empty empty in1 0 -6 0 8 -262144 -1 -1 0 1 ; --- 304,317 ---- #X connect 1 0 4 0; #X restore 79 103 pd train you net using a train file; ! #N canvas 120 72 892 558 train 0; ! #X obj 55 487 outlet; #X msg 60 31 train; #X text 126 33 1- set the train mode; ! #X text 192 120 be shure you provide the correct numbers of inputs and outputs; #X obj 168 202 pack s f f f; #X obj 197 248 pack f f f; #X obj 168 225 unpack s f f f; ! #X msg 190 464 run; #X obj 198 170 tgl 15 0 empty empty in1 0 -6 0 8 -262144 -1 -1 0 1 ; *************** *** 323,347 **** #X obj 148 169 bng 15 250 50 0 empty empty train! 0 -6 0 8 -262144 -1 -1; ! #X text 299 183 set inputs and output value \, then send the list clicking on the "train!" bang; #X msg 316 261 create 2 1; ! #X text 229 374 3- when you are ready switch again to run mode before exiting; #X text 315 226 NOTE1: before training with this example you should have created a nn with 2 ins and 1 out with a command like:; ! #X text 311 291 NOTE2: while training the right outlet gives you the ! mean square error after each training pattern.; ! #X connect 1 0 0 0; ! #X connect 5 0 7 0; #X connect 6 0 0 0; ! #X connect 7 1 6 0; ! #X connect 7 2 6 1; ! #X connect 7 3 6 2; ! #X connect 8 0 0 0; ! #X connect 9 0 5 1; ! #X connect 10 0 5 2; ! #X connect 11 0 5 3; ! #X connect 12 0 5 0; ! #X connect 14 0 0 0; #X restore 68 50 pd train it on the fly; #X text 62 5 there are 2 ways to train your net; --- 322,382 ---- #X obj 148 169 bng 15 250 50 0 empty empty train! 0 -6 0 8 -262144 -1 -1; ! #X text 312 160 set inputs and output value \, then send the list clicking on the "train!" bang; #X msg 316 261 create 2 1; ! #X text 227 464 3- when you are ready switch again to run mode before exiting; #X text 315 226 NOTE1: before training with this example you should have created a nn with 2 ins and 1 out with a command like:; ! #N canvas 255 158 517 436 autotrain 0; ! #X obj 89 286 outlet; ! #X obj 85 87 metro 10; ! #X obj 85 38 tgl 15 0 empty empty toggle_training 0 -6 0 8 -262144 ! -1 -1 0 1; ! #X msg 101 192 0 0 0; ! #X msg 126 215 0 1 1; ! #X msg 82 168 1 0 1; ! #X msg 150 244 1 1 1; ! #X obj 82 112 random 4; ! #X obj 83 138 sel 0 1 2 3; ! #X obj 226 125 f 0; ! #X obj 256 124 + 1; ! #X floatatom 226 149 8 0 0 0 - - -; ! #X text 113 36 <--train OR untile mse is low enough; ! #X text 143 51 (you must be in train mode); ! #X connect 1 0 7 0; ! #X connect 1 0 9 0; ! #X connect 2 0 1 0; ! #X connect 3 0 0 0; ! #X connect 4 0 0 0; ! #X connect 5 0 0 0; #X connect 6 0 0 0; ! #X connect 7 0 8 0; ! #X connect 8 0 5 0; ! #X connect 8 1 3 0; ! #X connect 8 2 4 0; ! #X connect 8 3 6 0; ! #X connect 9 0 10 0; ! #X connect 9 0 11 0; ! #X connect 10 0 9 1; ! #X restore 224 363 pd autotrain OR; ! #X text 172 101 2a)- build a list with inputs and desired output; ! #X text 336 291 NOTE2: while training the right outlet gives you the ! mean square error after each training pattern. continue training until ! mse is low enough.; ! #X text 221 383 2b) use autotrain for the OR function; ! #X connect 1 0 0 0; ! #X connect 4 0 6 0; ! #X connect 5 0 0 0; ! #X connect 6 1 5 0; ! #X connect 6 2 5 1; ! #X connect 6 3 5 2; ! #X connect 7 0 0 0; ! #X connect 8 0 4 1; ! #X connect 9 0 4 2; ! #X connect 10 0 4 3; ! #X connect 11 0 4 0; ! #X connect 13 0 0 0; ! #X connect 16 0 0 0; #X restore 68 50 pd train it on the fly; #X text 62 5 there are 2 ways to train your net;

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
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