Fixed cost2thresh so that it searches for the last cost if missing.

Author: Emi Nomura

brainx/util.py

@@ -12,7 +12,7 @@
 #-----------------------------------------------------------------------------
 # Functions
 #-----------------------------------------------------------------------------
-def format_matrix(data,s,b,lk,co,nouptri = False):
+def format_matrix(data,s,b,lk,co,idc = [],costlist=[],nouptri = False):
     """ Function which formats matrix for a particular subject and particular block (thresholds, upper-tris it) so that we can make a graph object out of it
 
     Parameters:
@@ -25,7 +25,7 @@ def format_matrix(data,s,b,lk,co,nouptri = False):
 """
 
     cmat = data[b,s]
-    th = cost2thresh(co,s,b,lk,[]) #get the right threshold
+    th = cost2thresh(co,s,b,lk,[],idc,costlist) #get the right threshold
 
     #cmat = replace_diag(cmat) #replace diagonals with zero
     cmat = thresholded_arr(cmat,th,fill_val=0)
@@ -35,7 +35,7 @@ def format_matrix(data,s,b,lk,co,nouptri = False):
 
     return cmat
 
-def format_matrix2(data,s,sc,c,lk,co,nouptri = False):
+def format_matrix2(data,s,sc,c,lk,co,idc = [],costlist=[],nouptri = False):
     """ Function which formats matrix for a particular subject and particular block (thresholds, upper-tris it) so that we can make a graph object out of it
 
     Parameters:
@@ -48,7 +48,7 @@ def format_matrix2(data,s,sc,c,lk,co,nouptri = False):
 """
 
     cmat = data[sc,c,s]
-    th = cost2thresh2(co,s,sc,c,lk,[]) #get the right threshold
+    th = cost2thresh2(co,s,sc,c,lk,[],idc,costlist) #get the right threshold
 
     #cmat = replace_diag(cmat) #replace diagonals with zero
     cmat = thresholded_arr(cmat,th,fill_val=0)
@@ -400,7 +400,7 @@ def replace_diag(arr,val=0):
     return arr
 
 
-def cost2thresh(cost,sub,bl,lk,last):
+def cost2thresh(cost,sub,bl,lk,last,idc = [],costlist=[]):
     """A definition for loading the lookup table and finding the threshold associated with a particular cost for a particular subject in a particular block
     
     inputs:
@@ -422,15 +422,27 @@ def cost2thresh(cost,sub,bl,lk,last):
         th=th[0] #if there are multiple thresholds, go down to the lower cost ####Is this right?!!!####
         print 'multiple thresh'
     elif len(th)<1:
-        th=last #if there is no associated thresh value because of repeats, just use the previous one
+        done = 1
+        while done:
+            idc = idc-1
+            newcost = costlist[idc]
+            print idc,newcost
+            ind=np.where(lk[bl][sub][1]==newcost)
+            th=lk[bl][sub][0][ind]
+            if len(th) > 1:
+                th = th[0]
+                done = 0
+                
+        #th=last #if there is no associated thresh value because of repeats, just use the previous one
         print 'use previous thresh'
+        
     else:
         th=th[0]
 
     #print th    
     return th
 
-def cost2thresh2(cost,sub,sc,c,lk,last):
+def cost2thresh2(cost,sub,sc,c,lk,last,idc = [],costlist=[]):
     """A definition for loading the lookup table and finding the threshold associated with a particular cost for a particular subject in a particular block
     
     inputs:
@@ -452,7 +464,17 @@ def cost2thresh2(cost,sub,sc,c,lk,last):
         th=th[0] #if there are multiple thresholds, go down to the lower cost ####Is this right?!!!####
         print 'multiple thresh'
     elif len(th)<1:
-        th=last #if there is no associated thresh value because of repeats, just use the previous one
+        done = 1
+        while done:
+            idc = idc-1
+            newcost = costlist[idc]
+            print idc,newcost
+            ind=np.where(lk[bl][sub][1]==newcost)
+            th=lk[bl][sub][0][ind]
+            if len(th) > 1:
+                th = th[0]
+                done = 0
+        #th=last #if there is no associated thresh value because of repeats, just use the previous one
         print 'use previous thresh'
     else:
         th=th[0]