Changeset 3290

Timestamp:

05/02/08 17:44:41 (3 months ago)

Author:

lmwang

Message:

(lmwang)rename psrc/variables to psrc/abstract_variables; optimized travel data calculation by using array operation instead of loop

Location:

trunk/psrc

Files:

• abstract_variables (moved) (moved from trunk/psrc/variables)
• abstract_variables/abstract_time_space_prism_variable.py (modified) (2 diffs)
• abstract_variables/abstract_travel_time_variable.py (modified) (1 diff)
• household_x_gridcell/workerDDD_am_total_transit_time_walk_from_home_to_work.py (modified) (1 diff)
• household_x_gridcell/workerDDD_travel_time_hbw_am_drive_alone_from_home_to_work.py (modified) (1 diff)
• household_x_parcel/am_total_transit_time_walk_from_home_to_work.py (modified) (1 diff)
• household_x_parcel/travel_time_hbw_am_drive_alone_from_home_to_work.py (modified) (1 diff)
• household_x_parcel/workerDDD_am_total_transit_time_walk_from_home_to_work.py (modified) (1 diff)
• household_x_parcel/workerDDD_travel_time_hbw_am_drive_alone_from_home_to_work.py (modified) (1 diff)
• household_x_zone/am_total_transit_time_walk_from_home_to_work_alt.py (modified) (1 diff)
• household_x_zone/travel_time_hbw_am_drive_alone_from_home_to_work_alt.py (modified) (1 diff)
• household_x_zone/workerDDD_am_total_transit_time_walk_from_home_to_work.py (modified) (1 diff)
• household_x_zone/workerDDD_travel_time_hbw_am_drive_alone_from_home_to_work.py (modified) (1 diff)
• person_x_job/am_total_transit_time_walk_from_home_to_work.py (modified) (1 diff)
• person_x_job/travel_time_hbw_am_drive_alone_from_home_to_work.py (modified) (1 diff)
• person_x_zone/am_total_transit_time_walk_from_home_to_work.py (modified) (1 diff)
• person_x_zone/travel_time_hbw_am_drive_alone_from_home_to_work.py (modified) (1 diff)

trunk/psrc/abstract_variables/abstract_time_space_prism_variable.py

@@ -55 +55 @@
         
         if self.direction_from_agent_to_choice:
-            from_zone = var1
-            to_zone = var2
+            from_zone = var1.astype("int32")
+            to_zone = var2.astype("int32")
         else:
-            from_zone = var2
-            to_zone = var1
-            
+            from_zone = var2.astype("int32")
+            to_zone = var1.astype("int32")
+    
         results = resize(array([self.default_value], dtype=self._return_type), from_zone.shape)
         zone_ids = zones.get_id_attribute()
@@ -68 +68 @@
             t2 = travel_data_attr_mat[tmp_zone, to_zone]
             results[where( t1 + t2 <= agent_resource)] += zones.get_attribute_by_id(self.zone_attribute_to_access, zone)
-                
+        
+        missing_pairs_index = travel_data.get_od_pair_index_not_in_dataset(from_zone, to_zone)
+        if missing_pairs_index[0].size > 0:
+            results[missing_pairs_index] = self.default_value
+            logger.log_warning("zone pairs at index %s are not in travel data; value set to %s." % ( str(missing_pairs_index), self.default_value) )
+
         return results

trunk/psrc/abstract_variables/abstract_travel_time_variable.py

@@ -34 +34 @@
         interaction_dataset = self.get_dataset()
         travel_data = dataset_pool.get_dataset('travel_data')
+        travel_data_attr_mat = travel_data.get_attribute_as_matrix(self.travel_data_attribute, 
+                                                                   fill=self.default_value)
+        
         var1 = interaction_dataset.get_dataset(1).get_attribute_by_index(self.agent_zone_id,
                                                                       interaction_dataset.get_2d_index_of_dataset1())
         var2 = interaction_dataset.get_2d_dataset_attribute(self.location_zone_id)
         if self.direction_from_home:
-            home_zone = var1
-            work_zone = var2
+            home_zone = var1.astype("int32")
+            work_zone = var2.astype("int32")
         else:
-            home_zone = var2
-            work_zone = var1
-        times = resize(array([self.default_value], dtype=float32), home_zone.shape)
-        positions = ones(home_zone.shape, dtype="int32")
-        #create indices for 2d array of (origin, destination)
-        ij = map(lambda x, y: (x, y), where(positions)[0], where(positions)[1])
-        for a in ij:
-            i, j = a
-            try:
-                times[i,j] = travel_data.get_attribute_by_id(self.travel_data_attribute, (home_zone[i,j], work_zone[i,j]))
-            except:
-                logger.log_warning("zone pairs (%s, %s) is not in zoneset; value set to %s." % (home_zone[i,j], work_zone[i,j], self.default_value))
-
-        return times
+            home_zone = var2.astype("int32")
+            work_zone = var1.astype("int32")
+        
+        results = resize(array([self.default_value], dtype=float32), home_zone.shape)
+        results = travel_data_attr_mat[home_zone, work_zone]
+        
+        missing_pairs_index = travel_data.get_od_pair_index_not_in_dataset(home_zone, work_zone)
+        if missing_pairs_index[0].size > 0:
+            results[missing_pairs_index] = self.default_value
+            logger.log_warning("zone pairs at index %s are not in travel data; value set to %s." % ( str(missing_pairs_index), self.default_value) )
+        
+        return results

trunk/psrc/household_x_gridcell/workerDDD_am_total_transit_time_walk_from_home_to_work.py

@@ -13 +13 @@
 #
 
-from psrc.variables.abstract_travel_time_variable import abstract_travel_time_variable
+from psrc.abstract_variables.abstract_travel_time_variable import abstract_travel_time_variable
 
 class workerDDD_am_total_transit_time_walk_from_home_to_work(abstract_travel_time_variable):

trunk/psrc/household_x_gridcell/workerDDD_travel_time_hbw_am_drive_alone_from_home_to_work.py

@@ -13 +13 @@
 #
 
-from psrc.variables.abstract_travel_time_variable import abstract_travel_time_variable
+from psrc.abstract_variables.abstract_travel_time_variable import abstract_travel_time_variable
 
 class workerDDD_travel_time_hbw_am_drive_alone_from_home_to_work(abstract_travel_time_variable):

trunk/psrc/household_x_parcel/am_total_transit_time_walk_from_home_to_work.py

@@ -13 +13 @@
 #
 
-from psrc.variables.abstract_travel_time_variable import abstract_travel_time_variable
+from psrc.abstract_variables.abstract_travel_time_variable import abstract_travel_time_variable
 
 class am_total_transit_time_walk_from_home_to_work(abstract_travel_time_variable):

trunk/psrc/household_x_parcel/travel_time_hbw_am_drive_alone_from_home_to_work.py

@@ -13 +13 @@
 #
 
-from psrc.variables.abstract_travel_time_variable import abstract_travel_time_variable
+from psrc.abstract_variables.abstract_travel_time_variable import abstract_travel_time_variable
 
 class travel_time_hbw_am_drive_alone_from_home_to_work(abstract_travel_time_variable):

trunk/psrc/household_x_parcel/workerDDD_am_total_transit_time_walk_from_home_to_work.py

@@ -12 +12 @@
 # other acknowledgments.
 #
-from psrc.variables.abstract_travel_time_variable import abstract_travel_time_variable
+from psrc.abstract_variables.abstract_travel_time_variable import abstract_travel_time_variable
 
 class workerDDD_am_total_transit_time_walk_from_home_to_work(abstract_travel_time_variable):

trunk/psrc/household_x_parcel/workerDDD_travel_time_hbw_am_drive_alone_from_home_to_work.py

@@ -13 +13 @@
 #
 
-from psrc.variables.abstract_travel_time_variable import abstract_travel_time_variable
+from psrc.abstract_variables.abstract_travel_time_variable import abstract_travel_time_variable
 
 class workerDDD_travel_time_hbw_am_drive_alone_from_home_to_work(abstract_travel_time_variable):

trunk/psrc/household_x_zone/am_total_transit_time_walk_from_home_to_work_alt.py

@@ -13 +13 @@
 #
 
-from psrc.variables.abstract_travel_time_variable import abstract_travel_time_variable
+from psrc.abstract_variables.abstract_travel_time_variable import abstract_travel_time_variable
 
 class am_total_transit_time_walk_from_home_to_work_alt(abstract_travel_time_variable):

trunk/psrc/household_x_zone/travel_time_hbw_am_drive_alone_from_home_to_work_alt.py

@@ -13 +13 @@
 #
 
-from psrc.variables.abstract_travel_time_variable import abstract_travel_time_variable
+from psrc.abstract_variables.abstract_travel_time_variable import abstract_travel_time_variable
 
 class travel_time_hbw_am_drive_alone_from_home_to_work_alt(abstract_travel_time_variable):

trunk/psrc/household_x_zone/workerDDD_am_total_transit_time_walk_from_home_to_work.py

@@ -13 +13 @@
 #
 
-from psrc.variables.abstract_travel_time_variable import abstract_travel_time_variable
+from psrc.abstract_variables.abstract_travel_time_variable import abstract_travel_time_variable
 
 class workerDDD_am_total_transit_time_walk_from_home_to_work(abstract_travel_time_variable):

trunk/psrc/household_x_zone/workerDDD_travel_time_hbw_am_drive_alone_from_home_to_work.py

@@ -13 +13 @@
 #
 
-from psrc.variables.abstract_travel_time_variable import abstract_travel_time_variable
+from psrc.abstract_variables.abstract_travel_time_variable import abstract_travel_time_variable
 
 class workerDDD_travel_time_hbw_am_drive_alone_from_home_to_work(abstract_travel_time_variable):

trunk/psrc/person_x_job/am_total_transit_time_walk_from_home_to_work.py

@@ -13 +13 @@
 #
 
-from psrc.variables.abstract_travel_time_variable import abstract_travel_time_variable
+from psrc.abstract_variables.abstract_travel_time_variable import abstract_travel_time_variable
 
 class am_total_transit_time_walk_from_home_to_work(abstract_travel_time_variable):

trunk/psrc/person_x_job/travel_time_hbw_am_drive_alone_from_home_to_work.py

@@ -12 +12 @@
 # other acknowledgments.
 #
-from psrc.variables.abstract_travel_time_variable import abstract_travel_time_variable
+from psrc.abstract_variables.abstract_travel_time_variable import abstract_travel_time_variable
 
 class travel_time_hbw_am_drive_alone_from_home_to_work(abstract_travel_time_variable):

trunk/psrc/person_x_zone/am_total_transit_time_walk_from_home_to_work.py

@@ -12 +12 @@
 # other acknowledgments.
 #
-from psrc.variables.abstract_travel_time_variable import abstract_travel_time_variable
+from psrc.abstract_variables.abstract_travel_time_variable import abstract_travel_time_variable
 
 class am_total_transit_time_walk_from_home_to_work(abstract_travel_time_variable):

trunk/psrc/person_x_zone/travel_time_hbw_am_drive_alone_from_home_to_work.py

@@ -12 +12 @@
 # other acknowledgments.
 #
-from psrc.variables.abstract_travel_time_variable import abstract_travel_time_variable
+from psrc.abstract_variables.abstract_travel_time_variable import abstract_travel_time_variable
 
 class travel_time_hbw_am_drive_alone_from_home_to_work(abstract_travel_time_variable):