Changeset 2035

Timestamp:

Nov 17, 2005, 2:00:56 PM (19 years ago)

Author:

duncan

Message:

remove bugs in get_min_max_indexes

Location:

inundation/pyvolution

Files:

• data_manager.py (modified) (2 diffs)
• test_data_manager.py (modified) (4 diffs)

inundation/pyvolution/data_manager.py

@@ -3588 +3588 @@
     else:
         lat_max_index = searchsorted(latitudes, maxlat)+1
-
     if minlon == None:
         lon_min_index = 0
@@ -3597 +3596 @@
         
     if maxlon == None:
-        lat_max_index = len(longitudes)
+        lon_max_index = len(longitudes)
     else:
-        lat_max_index = searchsorted(longitudes, maxlon)+1
-
-    return lat_min_index, lat_max_index, lon_min_index, lat_max_index
+        lon_max_index = searchsorted(longitudes, maxlon)+1
+
+    return lat_min_index, lat_max_index, lon_min_index, lon_max_index
         
     

inundation/pyvolution/test_data_manager.py

@@ -3333 +3333 @@
                        minlat = -37.6, maxlat = -37.6,
                   minlon = 148.3, maxlon = 148.3
-                      ,verbose = True
+                      #,verbose = True
                       )
 
@@ -3468 +3468 @@
         
         ## 6th test
+        
         kmin, kmax, lmin, lmax = get_min_max_indexes (latitudes,longitudes,
                                                       1.5,4,18,32)
@@ -3480 +3481 @@
                         longitudes_news == [10, 20, 30],
                          'failed')
+        
         
         ## 7th test
@@ -3500 +3502 @@
         self.failUnless(m2d == [[5,6],[9,10]],
                          'failed')
-
+        
+    def test_get_min_max_indexes2(self):
+        latitudes = [-45,-40,-35,-30]
+        longitudes = [148,149,150,151]
+
+        # k - lat
+        # l - lon
+        kmin, kmax, lmin, lmax = get_min_max_indexes (latitudes,longitudes,
+                                                      -37,-27,147,149.5)
+
+        #print "kmin",kmin;print "kmax",kmax
+        #print "lmin",lmin;print "lmax",lmax
+        latitudes_new = latitudes[kmin:kmax]
+        longitudes_news = longitudes[lmin:lmax]
+        #print "latitudes_new", latitudes_new
+        #print "longitudes_news",longitudes_news
+        
+        self.failUnless(latitudes_new == [-40, -35, -30] and \
+                        longitudes_news == [148, 149,150],
+                         'failed')
+        
+    def test_get_min_max_indexes3(self):
+        latitudes = [-60,-55,-50,-45,-40,-35,-30]
+        longitudes = [148,149,150,151]
+
+        # k - lat
+        # l - lon
+        kmin, kmax, lmin, lmax = get_min_max_indexes (latitudes,longitudes,
+                                                      -37,-27,147,149.5)
+
+        
+        #print "kmin",kmin;print "kmax",kmax
+        #print "lmin",lmin;print "lmax",lmax
+        latitudes_new = latitudes[kmin:kmax]
+        longitudes_news = longitudes[lmin:lmax]
+        #print "latitudes_new", latitudes_new
+        #print "longitudes_news",longitudes_news
+        
+        self.failUnless(latitudes_new == [-40, -35, -30] and \
+                        longitudes_news == [148, 149,150],
+                         'failed')
+        
 #-------------------------------------------------------------
 if __name__ == "__main__":