Changeset 3305

Show
Ignore:
Timestamp:
05/06/08 17:29:27 (2 months ago)
Author:
hana
Message:

(hana) script updated

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/inprocess/hana/uncertainty/travel_model_input_file_writer_with_observed_values.py

    r2699 r3305  
    4444                                arguments={'in_storage':storage, 'in_table_name': self.file_with_observed_jobs}) 
    4545        self.observed_zones_with_jobs.load_dataset() 
     46        self.total_number_of_jobs = zeros(self.observed_zones_with_jobs.size(), dtype='int32') 
     47        for attr in self.observed_zones_with_jobs.get_known_attribute_names(): 
     48            if attr not in self.observed_zones_with_jobs.get_id_name(): 
     49                self.total_number_of_jobs = self.total_number_of_jobs + self.observed_zones_with_jobs.get_attribute(attr) 
    4650 
    4751    def generate_travel_model_input(self, zone_set): 
    … …  
    6670        zone_ids = zone_set.get_id_attribute() 
    6771        # set household input 
    68         for dataset_name in self.variables_to_scale.keys(): 
    69             number_of_agents = zone_set.get_attribute("number_of_%ss" % dataset_name) 
    70             logger.log_status('Observed number of %ss' % dataset_name) 
    71             logger.log_status(round_(number_of_agents)) 
    72             for var, ratios in self.variables_to_scale[dataset_name].iteritems(): 
    73                 self.simulated_values[var] = zeros(zone_set.size()) 
    74                 self.simulated_values[var] = (round_(number_of_agents*ratios)).astype(self.simulated_values[var].dtype) 
    75                 logger.log_status(var) 
    76                 logger.log_status(self.simulated_values[var]) 
    77                  
     72        dataset_name = 'household' 
     73        number_of_agents = zone_set.get_attribute("number_of_%ss" % dataset_name) 
     74        logger.log_status('Observed number of %ss' % dataset_name) 
     75        logger.log_status(round_(number_of_agents)) 
     76        for var, ratios in self.variables_to_scale[dataset_name].iteritems(): 
     77            self.simulated_values[var] = zeros(zone_set.size()) 
     78            self.simulated_values[var] = (round_(number_of_agents*ratios)).astype(self.simulated_values[var].dtype) 
     79            logger.log_status(var) 
     80            logger.log_status(self.simulated_values[var]) 
     81 
    7882        # set job input 
    79         for dataset_name in self.variables_for_direct_matching.keys(): 
    80             zone_set.compute_variables(self.variables_for_direct_matching[dataset_name], dataset_pool=self.dataset_pool) 
    81             logger.log_status('Observed values for %ss:' % dataset_name) 
    82             for var in self.variables_for_direct_matching[dataset_name]: 
    83                 self.simulated_values[var] = zone_set.get_attribute(var) 
    84                 logger.log_status(var) 
    85                 logger.log_status(self.simulated_values[var]) 
     83        dataset_name = 'job' 
     84        zone_set.compute_variables(self.variables_for_direct_matching[dataset_name], dataset_pool=self.dataset_pool) 
     85        logger.log_status('Observed values for %ss:' % dataset_name) 
     86        for var in self.variables_for_direct_matching[dataset_name]: 
     87            self.simulated_values[var] = zone_set.get_attribute(var) 
     88            logger.log_status(var) 
     89            logger.log_status(self.simulated_values[var]) 
    8690                 
    8791