src/fvec.c: fvec_copy: only get min if needed

[aubio.git] / src / fvec.c

diff --git a/src/fvec.c b/src/fvec.c
index 941830bcdddd25c5a7ad97a8864acc13734a5777..ea33b581ba255ec361b7a53ed89bda32ab5c3bb0 100644 (file)
--- a/src/fvec.c
+++ b/src/fvec.c
@@ -1,63 +1,99 @@
 /*
-   Copyright (C) 2003-2007 Paul Brossier <piem@piem.org>
+  Copyright (C) 2003-2009 Paul Brossier <piem@aubio.org>
 
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+  This file is part of aubio.
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  aubio is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  aubio is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with aubio.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
 #include "aubio_priv.h"
-#include "sample.h"
+#include "fvec.h"
 
-fvec_t * new_fvec( uint_t length, uint_t channels) {
+fvec_t * new_fvec( uint_t length) {
   fvec_t * s = AUBIO_NEW(fvec_t);
-  uint_t i,j;
-  s->channels = channels;
   s->length = length;
-  s->data = AUBIO_ARRAY(smpl_t*,s->channels);
-  for (i=0; i< s->channels; i++) {
-    s->data[i] = AUBIO_ARRAY(smpl_t, s->length);
-    for (j=0; j< s->length; j++) {
-      s->data[i][j]=0.;
-    }
-  }
+  s->data = AUBIO_ARRAY(smpl_t, s->length);
   return s;
 }
 
 void del_fvec(fvec_t *s) {
-  uint_t i;
-  for (i=0; i<s->channels; i++) {
-    AUBIO_FREE(s->data[i]);
-  }
   AUBIO_FREE(s->data);
   AUBIO_FREE(s);
 }
 
-void fvec_write_sample(fvec_t *s, smpl_t data, uint_t channel, uint_t position) {
-  s->data[channel][position] = data;
+void fvec_write_sample(fvec_t *s, smpl_t data, uint_t position) {
+  s->data[position] = data;
 }
-smpl_t fvec_read_sample(fvec_t *s, uint_t channel, uint_t position) {
-  return s->data[channel][position];
+
+smpl_t fvec_read_sample(fvec_t *s, uint_t position) {
+  return s->data[position];
 }
-void fvec_put_channel(fvec_t *s, smpl_t * data, uint_t channel) {
-  s->data[channel] = data;
+
+smpl_t * fvec_get_data(fvec_t *s) {
+  return s->data;
 }
-smpl_t * fvec_get_channel(fvec_t *s, uint_t channel) {
-  return s->data[channel];
+
+/* helper functions */
+
+void fvec_print(fvec_t *s) {
+  uint_t j;
+  for (j=0; j< s->length; j++) {
+    AUBIO_MSG(AUBIO_SMPL_FMT " ", s->data[j]);
+  }
+  AUBIO_MSG("\n");
 }
 
-smpl_t ** fvec_get_data(fvec_t *s) {
-  return s->data;
+void fvec_set(fvec_t *s, smpl_t val) {
+  uint_t j;
+  for (j=0; j< s->length; j++) {
+    s->data[j] = val;
+  }
+}
+
+void fvec_zeros(fvec_t *s) {
+  fvec_set(s, 0.);
+}
+
+void fvec_ones(fvec_t *s) {
+  fvec_set(s, 1.);
+}
+
+void fvec_rev(fvec_t *s) {
+  uint_t j;
+  for (j=0; j< FLOOR(s->length/2); j++) {
+    ELEM_SWAP(s->data[j], s->data[s->length-1-j]);
+  }
 }
 
+void fvec_weight(fvec_t *s, fvec_t *weight) {
+  uint_t j;
+  uint_t length = MIN(s->length, weight->length);
+  for (j=0; j< length; j++) {
+    s->data[j] *= weight->data[j];
+  }
+}
+
+void fvec_copy(fvec_t *s, fvec_t *t) {
+  uint_t j;
+  uint_t length = t->length;
+  if (s->length != t->length) {
+    AUBIO_WRN("trying to copy %d elements to %d elements \n",
+        s->length, t->length);
+    length = MIN(s->length, t->length);
+  }
+  for (j=0; j< length; j++) {
+    t->data[j] = s->data[j];
+  }
+}