Changeset 50791b3

Timestamp:

Dec 16, 2005, 8:34:03 AM (19 years ago)

Author:

Paul Brossier <piem@altern.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:

0029638

Parents:

336cf77

Message:

optional resdir
optional resdir

File:

• python/aubio/bench/node.py (modified) (2 diffs)

python/aubio/bench/node.py

@@ -42 +42 @@
         return runcommand(cmd)
 
-def act_on_data (action,datapath,respath,suffix='.txt',filter='f',sub='\.wav$',**keywords):
+def act_on_data (action,datapath,respath=None,suffix='.txt',filter='f',sub='\.wav$',**keywords):
         """ execute action(datafile,resfile) on all files in datapath """
         dirlist = list_files(datapath,filter=filter)
         if dirlist == ['']: dirlist = []
-        respath_in_datapath = re.split(datapath, respath,maxsplit=1)[1:]
-        if(respath_in_datapath and suffix == ''): 
-                print 'error: respath in datapath and no suffix used'
-                #sys.exit(1)
+        if respath:
+                respath_in_datapath = re.split(datapath, respath,maxsplit=1)[1:]
+                if(respath_in_datapath and suffix == ''): 
+                        print 'error: respath in datapath and no suffix used'
         for i in dirlist:
                 j = re.split(datapath, i,maxsplit=1)[1]
                 j = re.sub(sub,'',j)
                 #j = "%s%s%s"%(respath,j,suffix)
-                j = "%s%s"%(respath,j)
-                if sub != '':
-                        j = re.sub(sub,suffix,j)
-                else:
-                        j = "%s%s" % (j,suffix)
+                if respath:
+                        j = "%s%s"%(respath,j)
+                        if sub != '':
+                                j = re.sub(sub,suffix,j)
+                        else:
+                                j = "%s%s" % (j,suffix)
                 action(i,j,**keywords)
 
@@ -73 +74 @@
 class bench:
 
-        def __init__(self,datadir,resdir,checkres=False,checkanno=False):
+        def __init__(self,datadir,resdir=None,checkres=False,checkanno=False):
                 self.datadir = datadir
                 self.resdir = resdir
+                self.results = []
                 print "Checking data directory", self.datadir
                 self.checkdata()