Changeset 2155 for TI02-CSML

Timestamp:

13/02/07 13:29:33 (13 years ago)

Author:

domlowe

Message:

Nudge to nearest neighbour function added to enable approximate requests for data - thanks Ag

Location:

TI02-CSML/trunk/csml

Files:

• API/csmlutils.py (modified) (1 diff)
• API/genSubset.py (modified) (3 diffs)
• API/ops_GridSeriesFeature.py (modified) (1 diff)
• DDC/obs/clim10subset.py (modified) (1 diff)

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

@@ -28 +28 @@
                             kwargs[key]=(kwargs[key][0],kwargs[key][1]+360)
     return kwargs
+                        
+                        
+                        
+def nudgeSingleValuesToAxisValues(value, axisValues):
+        """
+        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.
+        """
+        #import cdms
+        rtMessage=""
+        newValue=None
+        
+        if value in axisValues:
+            newValue=value
+        else:
+            sortedAxis=[]
+            for i in axisValues:
+                sortedAxis.append(i)
+            sortedAxis.sort()
+            
+            if value<sortedAxis[0]:
+                newValue=sortedAxis[0]
+            elif value>sortedAxis[-1]:
+                newValue=sortedAxis[-1]
+            else:
+                for i in range(len(axisValues)):
+                    if i<(len(axisValues)-1):
+                        (current, nextone)=(axisValues[i], axisValues[i+1])
+                        if current>nextone:
+                            tempc=nextone
+                            nextone=current
+                            current=tempc
+                    
+                        if value>current and value<nextone:
+                            lowergap=value-current
+                            uppergap=nextone-value
+                            if uppergap==lowergap:
+                                newValue=nextone
+                            elif uppergap>lowergap:
+                                newValue=current
+                            elif uppergap<lowergap:
+                                newValue=nextone                        
+                            break
+            if newValue==None:
+                rtMessage="%s axis selected value '%s' nudged to nearest value in real axis '%s' ;" % (axisType, value, newValue)       
+                print rtMessage         
+                    
+        return (newValue)                            

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

@@ -4 +4 @@
 import csml
 import csmlutils
-
+import sys
+
+def checkNeighbours(domain, **kwargs):
+        #for any non-range requests, get nearest neighbour
+    #e.g if 'latitude': (11) requested, latitude=12 may be the nearest value
+    for key in kwargs:      
+        #handle single values
+        if type(kwargs[key]) is not tuple:
+            nearestNeighbour=csml.API.csmlutils.nudgeSingleValuesToAxisValues(kwargs[key],domain[key])
+            if nearestNeighbour is not None:
+                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)
+    return kwargs
 
 def subsetDomain(timeaxis,times, domain,**kwargs):
@@ -15 +34 @@
     totalArraySize=1
     for key in domain.keys():
+        print key
         straxisValues=''
         if key in kwargs:
@@ -21 +41 @@
                 arraySize=len(strTimes.split())
             elif type(kwargs[key]) is not tuple:
-                #only one value not a range.
+                #only one value not a range
                 straxisValues=str(kwargs[key])  
             elif kwargs[key][0] < kwargs[key][1]:   

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

@@ -34 +34 @@
     return self.domain
 
+
     
 def subsetToGridSeries(self, csmlpath=None, ncpath=None,**kwargs):
+       
     #set self.domain:
-    self.getDomain()
+    self.getDomain()      
+    
+    #if request doesn't match domain points find nearest neighbours
+    kwargs=csml.API.genSubset.checkNeighbours(self.domain, **kwargs)
     
     #get the CRS from a  the  catalogue

TI02-CSML/trunk/csml/DDC/obs/clim10subset.py

@@ -39 +39 @@
 subsetDictionary={}
 subsetDictionary['time']=('1985-1-15T0:0:0.0')
-subsetDictionary['latitude']=(88.75)
-subsetDictionary['longitude']=(4.25)
+subsetDictionary['latitude']=(12,88.85)
+subsetDictionary['longitude']=(53.66, 55)
 #request subsetted data from features (can set paths here) and add to container
 #subset a feature