split the objects from mtx_binops into several files: mtx_add, mtx_sub, mtx_mul, mtx_pow

mtx_binops is still there for glue functions
exposed some important operations on float-arrays via iemmatrix.h (mtx_doInvert, mtx_doTranspose, mtx_doMultiply)
as you can easily see, they all start with "mtx_do" and a capital letter;
they all return a pointer to (newly allocated) memory with the result

svn path=/trunk/externals/iem/iemmatrix/; revision=2947

1 files changed, 158 insertions, 0 deletions

diff --git a/src/mtx_sub.c b/src/mtx_sub.c
new file mode 100644
index 0000000..aff1a76
--- /dev/null
+++ b/src/mtx_sub.c
@@ -0,0 +1,158 @@
+/*
+ *  iemmatrix
+ *
+ *  objects for manipulating simple matrices
+ *  mostly refering to matlab/octave matrix functions
+ *
+ * Copyright (c) IOhannes m zmölnig, forum::für::umläute
+ * IEM, Graz, Austria
+ *
+ * For information on usage and redistribution, and for a DISCLAIMER OF ALL
+ * WARRANTIES, see the file, "LICENSE.txt," in this distribution.
+ *
+ */
+#include "iemmatrix.h"
+
+/* -------------------------------------------------------------- */
+/*
+ * mtx_sub
+ * mtx_-
+ */
+
+static t_class *mtx_sub_class, *mtx_subscalar_class;
+
+static void mtx_subscalar_matrix(t_mtx_binscalar *x, t_symbol *s, int argc, t_atom *argv)
+{
+  int n=argc-2;
+  int row=atom_getfloat(argv), col=atom_getfloat(argv+1);
+  
+  t_float offset=x->f;
+  t_atom *buf;
+  t_atom *ap=argv+2;
+
+  if(argc<2){post("mtx_sub: crippled matrix");return; }
+  adjustsize(&x->m, row, col);
+
+  buf=x->m.atombuffer+2;
+
+  while(n--){
+    buf->a_type = A_FLOAT;
+    buf++->a_w.w_float = atom_getfloat(ap++) - offset;
+  }
+  outlet_anything(x->x_obj.ob_outlet, gensym("matrix"), argc, x->m.atombuffer);
+}
+static void mtx_subscalar_list(t_mtx_binscalar *x, t_symbol *s, int argc, t_atom *argv)
+{
+  int n=argc;
+  t_atom *m;
+  t_float offset = x->f;
+  adjustsize(&x->m, 1, argc);
+  m = x->m.atombuffer;
+
+  while(n--){
+    m->a_type = A_FLOAT;
+    (m++)->a_w.w_float = atom_getfloat(argv++) - offset;
+  }
+  outlet_list(x->x_obj.ob_outlet, gensym("list"), argc, x->m.atombuffer);
+}
+
+static void mtx_sub_matrix(t_mtx_binmtx *x, t_symbol *s, int argc, t_atom *argv)
+{
+  int row=atom_getfloat(argv);
+  int col=atom_getfloat(argv+1);
+  t_atom *m;
+  t_atom *m1 = argv+2;
+  t_atom *m2 = x->m2.atombuffer+2;
+  int n = argc-2;
+
+  if (argc<2){    post("mtx_sub: crippled matrix");    return;  }
+  if ((col<1)||(row<1)) {    post("mtx_sub: invalid dimensions");    return;  }
+  if (col*row>argc-2){    post("sparse matrix not yet supported : use \"mtx_check\"");    return;  }
+
+  if (!(x->m2.col*x->m2.row)) {
+    outlet_anything(x->x_obj.ob_outlet, gensym("matrix"), argc, argv);
+    return;
+  }
+
+  if ((col!=x->m2.col)||(row!=x->m2.row)){ 
+    post("mtx_sub: matrix dimensions do not match");
+    /* LATER SOLVE THIS */    
+    return;
+  }
+  adjustsize(&x->m, row, col);
+  m = x->m.atombuffer+2;
+
+  while(n--){
+    t_float f = atom_getfloat(m1++)-atom_getfloat(m2++);
+    SETFLOAT(m, f);
+    m++;
+  }
+  
+  outlet_anything(x->x_obj.ob_outlet, gensym("matrix"), argc, x->m.atombuffer);
+}
+static void mtx_sub_float(t_mtx_binmtx *x, t_float f)
+{
+  t_matrix *m=&x->m, *m2=&x->m2;
+  t_atom *ap, *ap2=m2->atombuffer+2;
+  int row2, col2, n;
+
+  if (!m2->atombuffer){ post("mulitply with what ?");            return; }
+
+  row2=atom_getfloat(m2->atombuffer);
+  col2=atom_getfloat(m2->atombuffer+1);
+  adjustsize(m, row2, col2);
+  ap=m->atombuffer+2;
+
+  n=row2*col2;
+
+  while(n--){
+    SETFLOAT(ap, f-atom_getfloat(ap2++));
+    ap++;
+  }
+  
+  outlet_anything(x->x_obj.ob_outlet, gensym("matrix"), m->row*m->col+2, m->atombuffer);
+}
+static void *mtx_sub_new(t_symbol *s, int argc, t_atom *argv)
+{
+  if (argc>1) post("mtx_sub : extra arguments ignored");
+  if (argc) {
+    t_mtx_binscalar *x = (t_mtx_binscalar *)pd_new(mtx_subscalar_class);
+    floatinlet_new(&x->x_obj, &x->f);
+    x->f = atom_getfloatarg(0, argc, argv);
+    outlet_new(&x->x_obj, 0);
+    return(x);
+  } else {
+    t_mtx_binmtx *x = (t_mtx_binmtx *)pd_new(mtx_sub_class);
+    inlet_new(&x->x_obj, &x->x_obj.ob_pd, gensym("matrix"), gensym(""));
+    outlet_new(&x->x_obj, 0);
+    x->m.col = x->m.row =  x->m2.col = x->m2.row = 0;
+    x->m.atombuffer = x->m2.atombuffer = 0;
+    return(x);
+  }
+}
+
+void mtx_sub_setup(void)
+{
+  mtx_sub_class = class_new(gensym("mtx_sub"), (t_newmethod)mtx_sub_new, (t_method)mtx_binmtx_free,
+			    sizeof(t_mtx_binmtx), 0, A_GIMME, 0);
+  class_addcreator((t_newmethod)mtx_sub_new, gensym("mtx_-"), A_GIMME,0);
+  class_addmethod(mtx_sub_class, (t_method)mtx_sub_matrix, gensym("matrix"), A_GIMME, 0);
+  class_addmethod(mtx_sub_class, (t_method)mtx_bin_matrix2, gensym(""), A_GIMME, 0);
+  class_addfloat (mtx_sub_class, mtx_sub_float);
+  class_addbang  (mtx_sub_class, mtx_binmtx_bang);
+
+  mtx_subscalar_class = class_new(gensym("mtx_sub"), 0, (t_method)mtx_binscalar_free,
+				  sizeof(t_mtx_binscalar), 0, 0);
+  class_addcreator(0, gensym("mtx_-"), 0, 0);
+  class_addmethod(mtx_subscalar_class, (t_method)mtx_subscalar_matrix, gensym("matrix"), A_GIMME, 0);
+  class_addlist  (mtx_subscalar_class, mtx_subscalar_list);
+  class_addbang  (mtx_subscalar_class, mtx_binscalar_bang);
+
+  class_sethelpsymbol(mtx_sub_class, gensym("iemmatrix/mtx_binops"));
+  class_sethelpsymbol(mtx_subscalar_class, gensym("iemmatrix/mtx_binops"));
+}
+
+void iemtx_sub_setup(void)
+{
+  mtx_sub_setup();
+}