Changeset 1e2c82f

Timestamp:

Oct 2, 2009, 1:09:46 AM (15 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

2f64b0e

Parents:

d57c879

Message:

rename vec_max and vec_max_elem to fvec_max fvec_max_elem

Files:

• src/mathutils.c (modified) (2 diffs)
• src/mathutils.h (modified) (2 diffs)
• src/tempo/beattracking.c (modified) (4 diffs)
• src/utils/hist.c (modified) (2 diffs)
• swig/aubio.i (modified) (1 diff)
• tests/src/test-filterbank.c (modified) (1 diff)

src/mathutils.c

@@ -102 +102 @@
 }
 
-smpl_t vec_max(fvec_t *s) {
+smpl_t fvec_max(fvec_t *s) {
   uint_t i,j;
   smpl_t tmp = 0.0f;
@@ -131 +131 @@
 }
 
-uint_t vec_max_elem(fvec_t *s) {
+uint_t fvec_max_elem(fvec_t *s) {
   uint_t i,j=0, pos=0.;
   smpl_t tmp = 0.0f;

src/mathutils.h

@@ -73 +73 @@
  * \bug mono 
  */
-smpl_t vec_max(fvec_t *s);
+smpl_t fvec_max(fvec_t *s);
 /** returns the min of a vector
  *
@@ -88 +88 @@
  * \bug mono 
  */
-uint_t vec_max_elem(fvec_t *s);
+uint_t fvec_max_elem(fvec_t *s);
 /** implement 'fftshift' like function
  * 

src/tempo/beattracking.c

@@ -169 +169 @@
 
   /* find non-zero Rayleigh period */
-  maxindex = vec_max_elem (bt->acfout);
+  maxindex = fvec_max_elem (bt->acfout);
   bt->rp = maxindex ? vec_quadint (bt->acfout, maxindex, 1) : 1;
   //rp = (maxindex==127) ? 43 : maxindex; //rayparam
@@ -196 +196 @@
 
   /* find Rayleigh period */
-  maxindex = vec_max_elem (bt->phout);
+  maxindex = fvec_max_elem (bt->phout);
   if (maxindex >= winlen - 1) {
 #if AUBIO_BEAT_WARNINGS
@@ -305 +305 @@
     }
     fvec_weight (acfout, bt->gwv);
-    gp = vec_quadint (acfout, vec_max_elem (acfout), 1);
+    gp = vec_quadint (acfout, fvec_max_elem (acfout), 1);
     /*
        while(gp<32) gp =gp*2;
@@ -419 +419 @@
 {
   if (bt->gp) {
-    return vec_max (bt->acfout);
+    return fvec_max (bt->acfout);
   } else {
     return 0.;

src/utils/hist.c

@@ -20 +20 @@
 #include "fvec.h"
 #include "utils/scale.h"
-#include "mathutils.h" //vec_min vec_max
+#include "mathutils.h" //vec_min fvec_max
 #include "utils/hist.h"
 
@@ -110 +110 @@
   sint_t tmp = 0;
   smpl_t ilow = vec_min(input);
-  smpl_t ihig = vec_max(input);
+  smpl_t ihig = fvec_max(input);
   smpl_t step = (ihig-ilow)/(smpl_t)(s->nelems);
 

swig/aubio.i

@@ -131 +131 @@
 smpl_t aubio_unwrap2pi (smpl_t phase);
 smpl_t fvec_mean(fvec_t *s);
-smpl_t vec_max(fvec_t *s);
+smpl_t fvec_max(fvec_t *s);
 smpl_t vec_min(fvec_t *s);
 uint_t vec_min_elem(fvec_t *s);
-uint_t vec_max_elem(fvec_t *s);
+uint_t fvec_max_elem(fvec_t *s);
 void vec_shift(fvec_t *s);
 smpl_t vec_sum(fvec_t *s);

tests/src/test-filterbank.c

@@ -21 +21 @@
   }
 
-  if (vec_max (coeffs) != 0.) {
+  if (fvec_max (coeffs) != 0.) {
     return -1;
   }