ADTLib

commit 567f236316f7241d7e67bfef1aca0c1b77ca81e8
parent b1db1296beeb0ecc666f9c01499ead52aa4b4aa5
Author: CarlSouthall <[email protected]>
Date:   Sun, 14 Aug 2016 20:38:47 +0100

14/08

Diffstat:
M
ADTLib.egg-info/PKG-INFO
 | 
2
+-
A
ADTLib/__init__.pyc
 | 
0

M
ADTLib/models/__init__.py
 | 
3
++-
A
ADTLib/models/__init__.pyc
 | 
0

A
ADTLib/nn/__init__.pyc
 | 
0

M
ADTLib/utils/__init__.py
 | 
15
++++++++++++---
A
ADTLib/utils/__init__.pyc
 | 
0

A
dist/ADTLib-0.7.tar.gz
 | 
0

M
setup.py
 | 
2
+-

9 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/ADTLib.egg-info/PKG-INFO b/ADTLib.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: ADTLib
-Version: 0.6
+Version: 0.7
 Summary: Automated Drum Trancription Library
 Home-page: https://github.com/CarlSouthall/ADTLib
 Author: Carl Southall
diff --git a/ADTLib/__init__.pyc b/ADTLib/__init__.pyc
Binary files differ.
diff --git a/ADTLib/models/__init__.py b/ADTLib/models/__init__.py
@@ -17,6 +17,8 @@ import inspect
 import ADTLib.nn as ADTnn
 from ADTLib.utils import Wavread, MeanPP, arrange_output, write_text
 
+
+
 def ADTBDRNN(TrackNames, out_sort='time',ret='yes', out_text='no', savedir='current',close_error=0.05,lambd=[9.7,9.9,4.9]):
  
     ''' Bi-directional neural network algorithm outlined in:
@@ -97,5 +99,4 @@ def ADTBDRNN(TrackNames, out_sort='time',ret='yes', out_text='no', savedir='curr
         
     if ret=='yes':
         return P
-        
         
 \ No newline at end of file
diff --git a/ADTLib/models/__init__.pyc b/ADTLib/models/__init__.pyc
Binary files differ.
diff --git a/ADTLib/nn/__init__.pyc b/ADTLib/nn/__init__.pyc
Binary files differ.
diff --git a/ADTLib/utils/__init__.py b/ADTLib/utils/__init__.py
@@ -33,18 +33,26 @@ def Wavread(TrackName):
 def arrange_output(Inputs,output_sort='time'):
     
     Names=['BD','SD','HH']
+   
     Out=list(np.zeros(len(Inputs)))
+    Out1=list(np.zeros(len(Inputs)))
     for i in xrange(len(Inputs)): 
+   
         Out[i]=list(np.zeros(len(Inputs[i])))
+        Out1[i]=list(np.zeros((1,2)))
         for j in xrange(len(Inputs[i])):    
             Out[i][j]=list(np.zeros((len(Inputs[i][j]))))
             for k in xrange(len(Inputs[i][j])):
                 Out[i][j][k]=list(np.zeros(2))
                 Out[i][j][k][0]=Inputs[i][j][k]
                 Out[i][j][k][1]=Names[j]
-                
-        Out[i]=np.concatenate([Out[i][0],Out[i][1],Out[i][2]],axis=0)
-        
+    
+    
+            if len(Out[i][j])>1:
+                Out1[i]=np.concatenate([Out1[i],Out[i][j]],axis=0)
+            
+        Out[i]=Out1[i][1:]
+               
         if output_sort=='time':
             Out1=np.array(Out[i][:,0],dtype=float)
             Out[i][:,0]=np.array(np.sort(Out1),dtype=str)
@@ -53,6 +61,7 @@ def arrange_output(Inputs,output_sort='time'):
             for j in xrange(len(indexs)):           
                 Out[i][j,1]=out_names[indexs[j]]
         
+    
     return Out
     
 def write_text(X,names,suffix='.ADT.txt',save_dir='current'):
diff --git a/ADTLib/utils/__init__.pyc b/ADTLib/utils/__init__.pyc
Binary files differ.
diff --git a/dist/ADTLib-0.7.tar.gz b/dist/ADTLib-0.7.tar.gz
Binary files differ.
diff --git a/setup.py b/setup.py
@@ -8,7 +8,7 @@ scripts = glob.glob('bin/*')
 setup(
   name = 'ADTLib',
   packages=find_packages(exclude=[]), 
-  version = '0.6',
+  version = '0.7',
   description = 'Automated Drum Trancription Library',
   author = 'Carl Southall',
   author_email = '[email protected]',