Changeset b155ed03

Timestamp:

Dec 17, 2013, 4:42:20 PM (11 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:

ad76ce2

Parents:

aa033c2

Message:

src/vecutils.*: remove cvec functions for clarity

Location:

src

Files:

• vecutils.c (modified) (2 diffs)
• vecutils.h (modified) (2 diffs)

src/vecutils.c

@@ -15 +15 @@
 }
 
-#define AUBIO_OP_C_AND_F(OPNAME, OP) \
-  AUBIO_OP(OPNAME, OP, fvec, data) \
-  AUBIO_OP(norm ## _ ## OPNAME, OP, cvec, norm) \
-  AUBIO_OP(phas ## _ ## OPNAME, OP, cvec, phas)
+#define AUBIO_OP_C(OPNAME, OP) \
+  AUBIO_OP(OPNAME, OP, fvec, data)
 
-AUBIO_OP_C_AND_F(exp, EXP)
-AUBIO_OP_C_AND_F(cos, COS)
-AUBIO_OP_C_AND_F(sin, SIN)
-AUBIO_OP_C_AND_F(abs, ABS)
-AUBIO_OP_C_AND_F(sqrt, SQRT)
-AUBIO_OP_C_AND_F(log10, SAFE_LOG10)
-AUBIO_OP_C_AND_F(log, SAFE_LOG)
-AUBIO_OP_C_AND_F(floor, FLOOR)
-AUBIO_OP_C_AND_F(ceil, CEIL)
-AUBIO_OP_C_AND_F(round, ROUND)
+AUBIO_OP_C(exp, EXP)
+AUBIO_OP_C(cos, COS)
+AUBIO_OP_C(sin, SIN)
+AUBIO_OP_C(abs, ABS)
+AUBIO_OP_C(sqrt, SQRT)
+AUBIO_OP_C(log10, SAFE_LOG10)
+AUBIO_OP_C(log, SAFE_LOG)
+AUBIO_OP_C(floor, FLOOR)
+AUBIO_OP_C(ceil, CEIL)
+AUBIO_OP_C(round, ROUND)
 
-//AUBIO_OP_C_AND_F(pow, POW)
 void fvec_pow (fvec_t *s, smpl_t power)
 {
@@ -39 +36 @@
   }
 }
-
-void cvec_pow (cvec_t *s, smpl_t power)
-{
-  uint_t j;
-  for (j = 0; j < s->length; j++) {
-    s->norm[j] = POW(s->norm[j], power);
-  }
-}
-

src/vecutils.h

@@ -21 +21 @@
 /** \file
 
-  Utility functions for ::fvec_t and ::cvec_t objects
+  Utility functions for ::fvec_t
 
  */
@@ -110 +110 @@
 void fvec_pow (fvec_t *s, smpl_t pow);
 
-/** compute \f$e^x\f$ of each vector norm elements
-
-  \param s vector to modify
-
-*/
-void cvec_norm_exp (cvec_t *s);
-
-/** compute \f$cos(x)\f$ of each vector norm elements
-
-  \param s vector to modify
-
-*/
-void cvec_norm_cos (cvec_t *s);
-
-/** compute \f$sin(x)\f$ of each vector norm elements
-
-  \param s vector to modify
-
-*/
-void cvec_norm_sin (cvec_t *s);
-
-/** compute the \f$abs(x)\f$ of each vector norm elements
-
-  \param s vector to modify
-
-*/
-void cvec_norm_abs (cvec_t *s);
-
-/** compute the \f$sqrt(x)\f$ of each vector norm elements
-
-  \param s vector to modify
-
-*/
-void cvec_norm_sqrt (cvec_t *s);
-
-/** compute the \f$log10(x)\f$ of each vector norm elements
-
-  \param s vector to modify
-
-*/
-void cvec_norm_log10 (cvec_t *s);
-
-/** compute the \f$log(x)\f$ of each vector norm elements
-
-  \param s vector to modify
-
-*/
-void cvec_norm_log (cvec_t *s);
-
-/** compute the \f$floor(x)\f$ of each vector norm elements
-
-  \param s vector to modify
-
-*/
-void cvec_norm_floor (cvec_t *s);
-
-/** compute the \f$ceil(x)\f$ of each vector norm elements
-
-  \param s vector to modify
-
-*/
-void cvec_norm_ceil (cvec_t *s);
-
-/** compute the \f$round(x)\f$ of each vector norm elements
-
-  \param s vector to modify
-
-*/
-void cvec_norm_round (cvec_t *s);
-
-/** raise each vector norm elements to the power pow
-
-  \param s vector to modify
-  \param pow power to raise to
-
-*/
-void cvec_norm_pow (cvec_t *s, smpl_t pow);
-
-/** compute \f$e^x\f$ of each vector phas elements
-
-  \param s vector to modify
-
-*/
-void cvec_phas_exp (cvec_t *s);
-
-/** compute \f$cos(x)\f$ of each vector phas elements
-
-  \param s vector to modify
-
-*/
-void cvec_phas_cos (cvec_t *s);
-
-/** compute \f$sin(x)\f$ of each vector phas elements
-
-  \param s vector to modify
-
-*/
-void cvec_phas_sin (cvec_t *s);
-
-/** compute the \f$abs(x)\f$ of each vector phas elements
-
-  \param s vector to modify
-
-*/
-void cvec_phas_abs (cvec_t *s);
-
-/** compute the \f$sqrt(x)\f$ of each vector phas elements
-
-  \param s vector to modify
-
-*/
-void cvec_phas_sqrt (cvec_t *s);
-
-/** compute the \f$log10(x)\f$ of each vector phas elements
-
-  \param s vector to modify
-
-*/
-void cvec_phas_log10 (cvec_t *s);
-
-/** compute the \f$log(x)\f$ of each vector phas elements
-
-  \param s vector to modify
-
-*/
-void cvec_phas_log (cvec_t *s);
-
-/** compute the \f$floor(x)\f$ of each vector phas elements
-
-  \param s vector to modify
-
-*/
-void cvec_phas_floor (cvec_t *s);
-
-/** compute the \f$ceil(x)\f$ of each vector phas elements
-
-  \param s vector to modify
-
-*/
-void cvec_phas_ceil (cvec_t *s);
-
-/** compute the \f$round(x)\f$ of each vector phas elements
-
-  \param s vector to modify
-
-*/
-void cvec_phas_round (cvec_t *s);
-
-/** raise each vector phas elements to the power pow
-
-  \param s vector to modify
-  \param pow power to raise to
-
-*/
-void cvec_phas_pow (cvec_t *s, smpl_t pow);
-
 #ifdef __cplusplus
 }