Changeset 5146 for anuga_core/source/anuga/geospatial_data

Timestamp:

Mar 10, 2008, 3:41:36 PM (17 years ago)

Author:

nick

Message:

update geospatial_data.py

File:

• anuga_core/source/anuga/geospatial_data/geospatial_data.py (modified) (13 diffs)

anuga_core/source/anuga/geospatial_data/geospatial_data.py

@@ -282 +282 @@
             # Polygon is an object - extract points
             polygon = polygon.get_data_points()
-            #print 'polygon',polygon
 
         points = self.get_data_points()    
-        #print '%s points:%s' %(verbose,points)
+#        if verbose: print '%s points:%s' %(verbose,points)
         inside_indices = inside_polygon(points, polygon, closed, verbose)
 
         clipped_G = self.get_sample(inside_indices)
+
 #        clipped_points = take(points, inside_indices)
 
@@ -375 +375 @@
                 lats_longs.append((lat_calced, long_calced)) # to hash
             return lats_longs
-            
         if absolute is True and geo_reference is None:
             return self.geo_reference.get_absolute(self.data_points)
@@ -384 +383 @@
         else:
             return self.data_points
-        
+
     
     def get_attributes(self, attribute_name=None):
@@ -617 +616 @@
             """
         #FIXME: add the geo_reference to this
-        
+#        print 'hello from get_sample'
         points = self.get_data_points()
         sampled_points = take(points, indices)
@@ -627 +626 @@
             for key, att in attributes.items():
                 sampled_attributes[key] = take(att, indices)
+
+#        print 'goodbye from get_sample'
 
         return Geospatial_data(sampled_points, sampled_attributes)
@@ -1398 +1399 @@
     
     """
+    Removes a small random sample of points from 'data_file'. Then creates 
+    models with different alpha values from 'alpha_list' and cross validates 
+    the predicted value to the previously removed point data. Returns the
+    alpha value which has the smallest covariance.
+    
     data_file: must not contain points outside the boundaries defined
            and it either a pts, txt or csv file. 
@@ -1431 +1437 @@
            alpha that created it. PLUS writes a plot of the results
            
-    NOTE: code will not work if the data_file extend is greater than the
-    boundary_polygon or the north_boundary...west_boundary
+    NOTE: code will not work if the data_file extent is greater than the
+    boundary_polygon or any of the boundaries, eg north_boundary...west_boundary
         
     """
@@ -1491 +1497 @@
     points=G_small.get_data_points()
 
-
-
-
-    #FIXME: Remove points outside boundary polygon
-#    print 'new point',len(points)
-#    
-#    new_points=[]
-#    new_points=array([],typecode=Float)
-#    new_points=resize(new_points,(len(points),2))
-#    print "BOUNDARY", boundary_poly
-#    for i,point in enumerate(points):
-#        if is_inside_polygon(point,boundary_poly, verbose=True):
-#            new_points[i] = point
-#            print"WOW",i,new_points[i]
-#    points = new_points
-
-    
     if verbose: print "Number of points in sample to compare: ", len(points)
     
@@ -1517 +1506 @@
     else:
         alphas=alpha_list
-#    domains = {}
 
     #creates array with columns 1 and 2 are x, y. column 3 is elevation
@@ -1533 +1521 @@
 
     normal_cov=array(zeros([len(alphas),2]),typecode=Float)
-
-
-
-
 
     if verbose: print 'Setup computational domains with different alphas'
@@ -1552 +1536 @@
                     verbose = verbose,
                     alpha = alpha)
-#        domains[alpha]=domain
 
         points_geo=domain.geo_reference.change_points_geo_ref(points)
@@ -1572 +1555 @@
         if verbose: print'Covariance for alpha ',normal_cov[i][0],'= ',normal_cov[i][1]
         if verbose: print'-------------------------------------------- \n'
-#    if verbose: print 'Determine difference between predicted results and actual data'
-#    for i,alpha in enumerate(domains):
-#        if verbose: print'Alpha =',alpha
-#        
-#        points_geo=domains[alpha].geo_reference.change_points_geo_ref(points)
-#        #returns the predicted elevation of the points that were "split" out 
-#        #of the original data set for one particular alpha
-#        elevation_predicted=domains[alpha].quantities[attribute_smoothed].\
-#                            get_values(interpolation_points=points_geo)
-# 
-#        #add predicted elevation to array that starts with x, y, z...
-#        data[:,i+3]=elevation_predicted
-#
-#        sample_cov= cov(elevation_sample)
-#        #print elevation_predicted
-#        ele_cov= cov(elevation_sample-elevation_predicted)
-#        normal_cov[i,:]= [alpha,ele_cov/sample_cov]
-#        print 'memory usage during compare',mem_usage()
-#        
-#
-#        if verbose: print'cov',normal_cov[i][0],'= ',normal_cov[i][1]
 
     normal_cov0=normal_cov[:,0]
@@ -1611 +1573 @@
         print '\n Optimal alpha is: %s ' % normal_cov_new[(argmin(normal_cov_new,axis=0))[1],0]
 
+    # covariance and optimal alpha
     return min(normal_cov_new[:,1]) , normal_cov_new[(argmin(normal_cov_new,axis=0))[1],0]