Changeset e7fb07e


Ignore:
Timestamp:
Dec 1, 2007, 3:55:36 PM (16 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:
554a9cb
Parents:
2704647 (diff), 55e9018 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

merge from main branch

Files:
9 added
6 edited
7 moved

Legend:

Unmodified
Added
Removed

  • README

    r2704647 re7fb07e  
    119119CONTACT
    120120
    121 The home page of this project can be found at http://aubio.piem.org/. Feel free
     121The home page of this project can be found at http://aubio.org/. Feel free
    122122to drop me a comment (piem@altern.org) or on the mailing list, aubio@piem.org.
    123123Suggestions and feedback are most welcome.

  • configure.ac

    r2704647 re7fb07e  
    9191AM_CONDITIONAL(MINGW, false)
    9292AM_CONDITIONAL(DARWIN, false)
    93 case "${build_os}" in
     93case "${host_os}" in
    9494*mingw* | *cygwin*)
    9595  mingw32_support="yes"

  • swig/aubio.i

    r2704647 re7fb07e  
    263263aubio_pickpeak_t * new_aubio_peakpicker(smpl_t threshold);
    264264uint_t aubio_peakpick_pimrt(fvec_t * DF, aubio_pickpeak_t * p);
     265uint_t aubio_peakpick_pimrt_wt( fvec_t* DF, aubio_pickpeak_t* p, smpl_t* peakval );
    265266smpl_t aubio_peakpick_pimrt_getval(aubio_pickpeak_t* p);
    266 uint_t aubio_peakpick_pimrt_wt( fvec_t* DF, aubio_pickpeak_t* p, smpl_t* peakval );
    267267void del_aubio_peakpicker(aubio_pickpeak_t * p);
     268void aubio_peakpicker_set_threshold(aubio_pickpeak_t * p, smpl_t threshold);
     269smpl_t aubio_peakpicker_get_threshold(aubio_pickpeak_t * p);
    268270
    269271/* transient/steady state separation */

  • tests/python/examples/aubioonset.py

    r2704647 re7fb07e  
    11from template import *
    22
    3 class aubioonset_test_case(program_test_case):
     3class aubioonset_unit(program_test_case):
    44 
    55  import os.path
    … …  
    2424    self.getOutput()
    2525    # only one onset in woodblock.aiff
    26     assert len(str(self.output)) != 0, "no output produced with command:\n" \
    27       + self.command
    28     assert len(self.output.split('\n')) == 1
     26    self.assertNotEqual(0, len(str(self.output)), \
     27      "no output produced with command:\n" + self.command)
     28    self.assertEqual(1, len(self.output.split('\n')) )
    2929    # onset should be at 0.00000
    30     assert float(self.output.strip()) == 0.
     30    self.assertEqual(0, float(self.output.strip()))
    3131
    32 for name in ["energy", "specdiff", "hfc", "complex", "phase", "kl", "mkl"]:
    33   exec("class aubioonset_test_case_"+name+"(aubioonset_test_case):\n\
     32list_of_onset_modes = ["energy", "specdiff", "hfc", "complex", "phase", \
     33                      "kl", "mkl", "specflux"]
     34
     35for name in list_of_onset_modes:
     36  exec("class aubioonset_"+name+"_unit(aubioonset_unit):\n\
    3437  options = \" -O "+name+" \"")
    3538

  • tests/python/run_all_tests

    r2704647 re7fb07e  
    1515  return [i.split('.')[0].replace('/','.') for i in glob(path)]
    1616
    17 modules_to_test  = list_of_test_files('*.py')
     17modules_to_test  = []
     18modules_to_test += list_of_test_files('src/*.py')
     19modules_to_test += list_of_test_files('src/*/*.py')
    1820modules_to_test += list_of_test_files('examples/aubio*.py')
     21modules_to_test += list_of_test_files('*.py')
    1922
    2023if __name__ == '__main__':

  • tests/python/src/spectral/filterbank.py

    r2704647 re7fb07e  
    9292  def testmfcc_channels(self):
    9393      """ check the values of each filters in the mfcc filterbank """
     94      import os.path
    9495      self.filterbank = new_aubio_filterbank_mfcc(n_filters, win_size, samplerate,
    9596        0., samplerate)
    9697      filterbank_mfcc = [ [float(f) for f in line.strip().split()]
    97         for line in open('filterbank_mfcc.txt').readlines()]
     98        for line in open(os.path.join('src','spectral','filterbank_mfcc.txt')).readlines()]
    9899      for channel in range(n_filters):
    99100        vec = aubio_filterbank_getchannel(self.filterbank,channel)

  • tests/python/template.py

    r2704647 re7fb07e  
    55 
    66  def assertCloseEnough(self, first, second, places=5, msg=None):
    7         """Fail if the two objects are unequal as determined by their
    8            *relative* difference rounded to the given number of decimal places
    9            (default 7) and comparing to zero.
    10         """
    11         if round(first, places) == 0:
    12           if round(second-first, places) != 0:
    13               raise self.failureException, \
    14                     (msg or '%r != %r within %r places' % (first, second, places))
    15         else:
    16           if round((second-first)/first, places) != 0:
    17               raise self.failureException, \
    18                     (msg or '%r != %r within %r places' % (first, second, places))
     7    """Fail if the two objects are unequal as determined by their
     8       *relative* difference rounded to the given number of decimal places
     9       (default 7) and comparing to zero.
     10    """
     11    if round(first, places) == 0:
     12      if round(second-first, places) != 0:
     13        raise self.failureException, \
     14              (msg or '%r != %r within %r places' % (first, second, places))
     15    else:
     16      if round((second-first)/first, places) != 0:
     17        raise self.failureException, \
     18              (msg or '%r != %r within %r places' % (first, second, places))
Note: See TracChangeset for help on using the changeset viewer.