Changeset 2598

Timestamp:

18/06/07 14:07:51 (14 years ago)

Author:

domlowe

Message:

nearest neighbour bug fixed

Location:

TI02-CSML/trunk/csml/API

Files:

• csmlutils.py (modified) (3 diffs)
• genSubset.py (modified) (1 diff)

TI02-CSML/trunk/csml/API/csmlutils.py

@@ -40 +40 @@
     return kwargs
                   
-    
-                        
-def nudgeSingleValuesToAxisValues(value, axisValues):
+def nudgeSingleValuesToAxisValues(value, axisValues, minBound=None, maxBound=None):
         """
         Takes a value and checks if it is in the axisValues array. If not, it nudges the 
         value to the nearest neighbour in axis. It returns the new value twice along 
         with a message describing the change.
+        
+        minBound and maxBound added as options.
+        If a value is outside of minBound or maxBound it is nudged so that it is within.
+        
+        TODO - rewrite this so it is legible!
+        
         """
 
+        bounds=False
+        reverseBounds=False
+        
+        #determine if bounds have been provided and if they are of the form (-30,30)  or (330, 30)
+        if minBound!=None:
+            if maxBound!=None:                               
+                bounds =True
+                if minBound > maxBound:           
+                    reverseBounds = True
         rtMessage=""
         newValue=None
-        
         def __fixTimes(value, axisValues):
             newValue = csml.csmllibs.csmltime.getTimeAsValue(value)
@@ -63 +75 @@
         else:            
             if str(value).find('T') != -1:
+                minBound,minBound=None,None,
+                bounds,reverseBounds=False,False              
                 value, axisValues=__fixTimes(value,axisValues)
-            sortedAxis=[]
-            for i in axisValues:
-                sortedAxis.append(i)
-            sortedAxis.sort()   
+            sortedAxis=[]            
+            if bounds == True:
+               if reverseBounds!=True:
+                    for i in axisValues:
+                        if i >= minBound:
+                            if i <= maxBound:
+                                sortedAxis.append(i)
+                         
+               else:
+                   for i in axisValues:
+                       if i >= minBound:
+                           sortedAxis.append(i)
+                       elif i >= maxBound:
+                            sortedAxis.append(i)                                      
+            else:
+                for i in axisValues:
+                    sortedAxis.append(i)
+            sortedAxis.sort()   
+
             if value<sortedAxis[0]:
-                newValue=sortedAxis[0]
+                if sortedAxis[0] < maxBound:
+                    newValue=sortedAxis[0]
+                else:
+                    newValue=sortedAxis[-1]
             elif value>sortedAxis[-1]:
                 newValue=sortedAxis[-1]
-            else:
+            else:
                 for i in range(len(axisValues)):
                     if i<(len(axisValues)-1):
@@ -97 +129 @@
             if len(str(int(newValue))) ==14: # it's a time
                 newValue=csml.csmllibs.csmltime.convertValueToCSML(newValue)   
-        return (newValue)                            
+        return (newValue)   
+                

TI02-CSML/trunk/csml/API/genSubset.py

@@ -22 +22 @@
                 kwargs[key]=nearestNeighbour    
         else:
-            #handle ranges
-            tmpkey=[]
-            for val in kwargs[key]:
-                nearestNeighbour=csml.API.csmlutils.nudgeSingleValuesToAxisValues(val, domain[key])
-                if nearestNeighbour is not None:
-                    tmpkey.append(nearestNeighbour)   
-                kwargs[key]=tuple(tmpkey)
+            ##handle ranges
+            #tmpkey=[]
+            ##this finds the nearest neighbour without overstepping 0 (for longitude)
+            #if kwargs[key][0] > kwargs[key][1]:                                
+                #nearestNeighbour=csml.API.csmlutils.nudgeSingleValuesToAxisValues(val, domain[key], minBound=kwargs[key][0], maxBound=0)
+                #if nearestNeighbour is not None:
+                    #tmpkey.append(nearestNeighbour)   
+                #nearestNeighbour=csml.API.csmlutils.nudgeSingleValuesToAxisValues(val, domain[key], minBound=0, maxBound=kwargs[key][1])
+                #if nearestNeighbour is not None:
+                    #tmpkey.append(nearestNeighbour)   
+                                 
+            #else:
+                tmpkey=[]
+                for val in kwargs[key]:
+                    nearestNeighbour=csml.API.csmlutils.nudgeSingleValuesToAxisValues(val, domain[key], minBound=kwargs[key][0], maxBound=kwargs[key][1])
+                    if nearestNeighbour is not None:
+                        tmpkey.append(nearestNeighbour)   
+                kwargs[key]=tuple(tmpkey)            
     return kwargs