added [mtx_exp] and [mtx_log]

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

5 files changed, 244 insertions, 1 deletions

diff --git a/doc/mtx_exp.pd b/doc/mtx_exp.pd
new file mode 100644
index 0000000..3cfe988
--- /dev/null
+++ b/doc/mtx_exp.pd
@@ -0,0 +1,35 @@
+#N canvas 128 118 687 471 10;
+#X msg 48 59 3 5;
+#X obj 485 95 matrix;
+#X text 435 77 see also help for;
+#X obj 485 126 exp;
+#X text 188 7 exponential of a matrix;
+#X text 45 42 compute the exponential of a matrix;
+#X obj 48 134 mtx_exp;
+#X obj 48 81 mtx_eye;
+#X obj 125 100 mtx 3 3;
+#X msg 125 80 0 1 2 3 4 5 6 7 8;
+#X obj 483 165 mtx_log;
+#X obj 48 162 mtx_print exponential;
+#X obj 64 285 mtx_rand 4 2;
+#X msg 64 263 bang;
+#X obj 64 307 t a a;
+#X obj 105 307 mtx_print org;
+#X obj 64 330 mtx_exp;
+#X obj 64 357 t a a;
+#X obj 105 357 mtx_print exp;
+#X obj 64 380 mtx_log;
+#X obj 64 407 mtx_print log;
+#X connect 0 0 7 0;
+#X connect 6 0 11 0;
+#X connect 7 0 6 0;
+#X connect 8 0 6 0;
+#X connect 9 0 8 0;
+#X connect 12 0 14 0;
+#X connect 13 0 12 0;
+#X connect 14 0 16 0;
+#X connect 14 1 15 0;
+#X connect 16 0 17 0;
+#X connect 17 0 19 0;
+#X connect 17 1 18 0;
+#X connect 19 0 20 0;
diff --git a/doc/mtx_log.pd b/doc/mtx_log.pd
new file mode 100644
index 0000000..96b2c0e
--- /dev/null
+++ b/doc/mtx_log.pd
@@ -0,0 +1,36 @@
+#N canvas 128 118 687 471 10;
+#X obj 485 95 matrix;
+#X text 435 77 see also help for;
+#X obj 181 100 mtx_eye;
+#X obj 48 100 mtx 3 3;
+#X msg 48 80 0 1 2 3 4 5 6 7 8;
+#X obj 64 285 mtx_rand 4 2;
+#X msg 64 263 bang;
+#X obj 64 307 t a a;
+#X obj 105 307 mtx_print org;
+#X obj 64 357 t a a;
+#X text 188 7 natural logarithm of matrix-elements;
+#X text 45 42 compute the natural lograithm of each element of a matrix
+;
+#X obj 483 165 mtx_exp;
+#X obj 48 134 mtx_log;
+#X obj 48 162 mtx_print logarithm;
+#X obj 64 330 mtx_log;
+#X obj 64 380 mtx_exp;
+#X obj 105 357 mtx_print log;
+#X obj 64 407 mtx_print exp;
+#X msg 181 79 3 3;
+#X obj 485 126 log;
+#X connect 2 0 13 0;
+#X connect 3 0 13 0;
+#X connect 4 0 3 0;
+#X connect 5 0 7 0;
+#X connect 6 0 5 0;
+#X connect 7 0 15 0;
+#X connect 7 1 8 0;
+#X connect 9 0 16 0;
+#X connect 9 1 17 0;
+#X connect 13 0 14 0;
+#X connect 15 0 9 0;
+#X connect 16 0 18 0;
+#X connect 19 0 2 0;
diff --git a/src/iemmatrix.c b/src/iemmatrix.c
index 0a96299..145b33b 100644
--- a/src/iemmatrix.c
+++ b/src/iemmatrix.c
@@ -25,9 +25,11 @@ void mtx_diegg_setup();
 void mtx_distance2_setup();
 void mtx_egg_setup();
 void mtx_element_setup();
+void mtx_exp_setup();
 void mtx_eye_setup();
-void mtx_inverse_setup();
 void mtx_gauss_setup();
+void mtx_inverse_setup();
+void mtx_log_setup();
 void mtx_matrix_setup();
 void mtx_mean_setup();
 void mtx_check_setup();
@@ -60,9 +62,11 @@ void iemtx_setup(){
   mtx_distance2_setup();
   mtx_egg_setup();
   mtx_element_setup();
+  mtx_exp_setup();
   mtx_eye_setup();
   mtx_gauss_setup();
   mtx_inverse_setup();
+  mtx_log_setup();
   mtx_matrix_setup();
   mtx_mean_setup();
   mtx_check_setup();
diff --git a/src/mtx_exp.c b/src/mtx_exp.c
new file mode 100644
index 0000000..3ad021e
--- /dev/null
+++ b/src/mtx_exp.c
@@ -0,0 +1,84 @@
+/*
+ *  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_exp: B=exp(A); B[n,m]=e^A[n,m]  */
+
+static t_class *mtx_exp_class;
+
+static void mtx_exp_matrix(t_mtx_binmtx *x, t_symbol *s, int argc, t_atom *argv)
+{
+  int row=atom_getfloat(argv++);
+  int col=atom_getfloat(argv++);
+  t_atom *m;
+  int n = argc-2;
+
+  if (argc<2){    post("mtx_exp: crippled matrix");    return;  }
+  if ((col<1)||(row<1)) {    post("mtx_exp: invalid dimensions");    return;  }
+  if (col*row>argc-2){    post("sparse matrix not yet supported : use \"mtx_check\"");    return;  }
+
+  adjustsize(&x->m, row, col);
+  m =  x->m.atombuffer+2;
+
+  while(n--){
+    t_float f = (t_float)exp(atom_getfloat(argv++));
+    SETFLOAT(m, f);
+    m++;
+  }
+
+  outlet_anything(x->x_obj.ob_outlet, gensym("matrix"), argc, x->m.atombuffer);
+}
+
+static void mtx_exp_list(t_mtx_binscalar *x, t_symbol *s, int argc, t_atom *argv)
+{
+  int n=argc;
+  t_atom *m;
+  t_float factor = x->f;
+
+  adjustsize(&x->m, 1, argc);
+  m = x->m.atombuffer;
+
+  while(n--){
+    m->a_type = A_FLOAT;
+    (m++)->a_w.w_float = (t_float)exp(atom_getfloat(argv++));
+  }
+
+  outlet_list(x->x_obj.ob_outlet, gensym("list"), argc, x->m.atombuffer);
+}
+
+static void *mtx_exp_new(t_symbol *s)
+{
+  /* element exp */
+  t_matrix *x = (t_matrix *)pd_new(mtx_exp_class);
+  outlet_new(&x->x_obj, 0);
+  x->col = x->row = 0;
+  x->atombuffer = 0;
+  return(x);
+}
+
+void mtx_exp_setup(void)
+{
+  mtx_exp_class = class_new(gensym("mtx_exp"), (t_newmethod)mtx_exp_new, (t_method)mtx_binmtx_free,
+				   sizeof(t_mtx_binmtx), 0, A_GIMME, 0);
+  class_addmethod(mtx_exp_class, (t_method)mtx_exp_matrix, gensym("matrix"), A_GIMME, 0);
+  class_addlist  (mtx_exp_class, mtx_exp_list);
+  class_addbang  (mtx_exp_class, mtx_binmtx_bang);
+
+  class_sethelpsymbol(mtx_exp_class, gensym("iemmatrix/mtx_exp"));
+}
+
+void iemtx_exp_setup(void)
+{
+  mtx_exp_setup();
+}
diff --git a/src/mtx_log.c b/src/mtx_log.c
new file mode 100644
index 0000000..90b609d
--- /dev/null
+++ b/src/mtx_log.c
@@ -0,0 +1,84 @@
+/*
+ *  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_log: B=log(A); B[n,m]=e^A[n,m]  */
+
+static t_class *mtx_log_class;
+
+static void mtx_log_matrix(t_mtx_binmtx *x, t_symbol *s, int argc, t_atom *argv)
+{
+  int row=atom_getfloat(argv++);
+  int col=atom_getfloat(argv++);
+  t_atom *m;
+  int n = argc-2;
+
+  if (argc<2){    post("mtx_log: crippled matrix");    return;  }
+  if ((col<1)||(row<1)) {    post("mtx_log: invalid dimensions");    return;  }
+  if (col*row>argc-2){    post("sparse matrix not yet supported : use \"mtx_check\"");    return;  }
+
+  adjustsize(&x->m, row, col);
+  m =  x->m.atombuffer+2;
+
+  while(n--){
+    t_float f = (t_float)log(atom_getfloat(argv++));
+    SETFLOAT(m, f);
+    m++;
+  }
+
+  outlet_anything(x->x_obj.ob_outlet, gensym("matrix"), argc, x->m.atombuffer);
+}
+
+static void mtx_log_list(t_mtx_binscalar *x, t_symbol *s, int argc, t_atom *argv)
+{
+  int n=argc;
+  t_atom *m;
+  t_float factor = x->f;
+
+  adjustsize(&x->m, 1, argc);
+  m = x->m.atombuffer;
+
+  while(n--){
+    m->a_type = A_FLOAT;
+    (m++)->a_w.w_float = (t_float)log(atom_getfloat(argv++));
+  }
+
+  outlet_list(x->x_obj.ob_outlet, gensym("list"), argc, x->m.atombuffer);
+}
+
+static void *mtx_log_new(t_symbol *s)
+{
+  /* element log */
+  t_matrix *x = (t_matrix *)pd_new(mtx_log_class);
+  outlet_new(&x->x_obj, 0);
+  x->col = x->row = 0;
+  x->atombuffer = 0;
+  return(x);
+}
+
+void mtx_log_setup(void)
+{
+  mtx_log_class = class_new(gensym("mtx_log"), (t_newmethod)mtx_log_new, (t_method)mtx_binmtx_free,
+				   sizeof(t_mtx_binmtx), 0, A_GIMME, 0);
+  class_addmethod(mtx_log_class, (t_method)mtx_log_matrix, gensym("matrix"), A_GIMME, 0);
+  class_addlist  (mtx_log_class, mtx_log_list);
+  class_addbang  (mtx_log_class, mtx_binmtx_bang);
+
+  class_sethelpsymbol(mtx_log_class, gensym("iemmatrix/mtx_log"));
+}
+
+void iemtx_log_setup(void)
+{
+  mtx_log_setup();
+}