Changeset 3313 for trunk/urbansim/estimation/estimator.py

Timestamp:

05/08/08 16:00:09 (3 months ago)

Author:

lmwang

Message:

(lmwang)update run_year_name_space for predict() to work in interactive mode

Files:

• trunk/urbansim/estimation/estimator.py (modified) (3 diffs)

trunk/urbansim/estimation/estimator.py

@@ -155 +155 @@
             new_choices = agents.get_attribute(choice_id_name).copy()
             agents.modify_attribute(name=choice_id_name, data=current_choices)
-            agents.add_primary_attribute(name=predicted_choice_id_name, data=new_choices)
+            if predicted_choice_id_name not in agents.get_known_attribute_names():
+                agents.add_primary_attribute(name=predicted_choice_id_name, data=new_choices)
+            else:
+                agents.modify_attribute(name=predicted_choice_id_name, data=new_choices)
             logger.log_status("Predictions saved into attribute " + predicted_choice_id_name)
             return True
@@ -168 +171 @@
                                         predicted_choice_id_prefix="predicted_", 
                                         predicted_choice_id_name=None,
-                                        log_to_file=None):
+                                        log_to_file=None,
+                                        force_predict=True):
         agents = self.get_agent_set()
         choices = self.get_choice_set()
@@ -175 +179 @@
             predicted_choice_id_name = predicted_choice_id_prefix + choice_id_name
             
-        if not predicted_choice_id_name in agents.get_known_attribute_names():
+        if force_predict or (predicted_choice_id_name not in agents.get_known_attribute_names()):
             if not self.predict(predicted_choice_id_prefix=predicted_choice_id_prefix, 
                                 predicted_choice_id_name=predicted_choice_id_name):