Changeset 3303

Timestamp:

05/04/08 13:36:37 (2 months ago)

Author:

borning

Message:

fixed estimation runner in GUI to use the general estimation runner tool; refactored the tool to pass xml_configuration as an instance of XMLConfiguration rather than as a file name

Location:

trunk

Files:

• opus_gui/run/estimation/gui_estimation_runner.py (deleted)
• opus_gui/run/estimation/opusrunestimation.py (modified) (3 diffs)
• urbansim/estimation/estimation_runner.py (modified) (5 diffs)
• urbansim/tools/start_estimation.py (modified) (2 diffs)

trunk/opus_gui/run/estimation/opusrunestimation.py

@@ -17 +17 @@
 from PyQt4.QtGui import *
 import os, sys, time
-
-
 try:
-    import os
     from opus_core.configurations.xml_configuration import XMLConfiguration
-    # from psrc_parcel.estimation.run_estimation import EstimationRunner
-    from gui_estimation_runner import EstimationRunner
+    from urbansim.estimation.estimation_runner import EstimationRunner
     WithOpus = True
 except ImportError:
     WithOpus = False
     print "Unable to import opus core libs"
-
+    
 class RunEstimationThread(QThread):
     def __init__(self, parentThread,parent,xml_file):
@@ -113 +109 @@
     def run(self):
         if WithOpus:
-            # Run the Eugene model using the XML version of the Eugene configuration.
-            # This code adapted from opus_core/tools/start_run.py
+            # Start the estimation. This code adapted from urbansim/tools/start_estimation.py
             # statusdir is a temporary directory into which to write a status file
             # regarding the progress of the simulation - the progress bar reads this file
             statusfile = None
-            statusdir = None
             succeeded = False
             try:
                 fileNameInfo = QFileInfo(self.xml_path)
                 filename = fileNameInfo.absoluteFilePath().trimmed()
-                print filename
                 xml_config = XMLConfiguration(str(filename))
                 estimation_section = xml_config.get_section('model_manager/estimation')
@@ -137 +130 @@
                     if self.cancelled:
                         break
-                    model_config = estimation_config['model_parameters'][model_name]
-                    model = (model_config['abbreviation'], model_config['full_name'])
-                    if 'location' in model_config:
-                        model = model , (model_config['location'], model_config['add_member_prefix'])
-                    specification = xml_config.get_estimation_specification(model_config['full_name'])
-                    self.er = EstimationRunner()
+                    self.er = EstimationRunner(model=model_name, xml_configuration=xml_config, configuration=None)
                     self.running = True
-                    self.er.run_estimation(estimation_config, model,
-                                      specification, save_estimation_results=False, diagnose=False)
+                    self.er.estimate()
                     self.running = False
                 succeeded = True

trunk/urbansim/estimation/estimation_runner.py

@@ -15 +15 @@
 
 from opus_core.configuration import Configuration
-from opus_core.configurations.xml_configuration import XMLConfiguration
 from urbansim.estimation.estimator import Estimator
 from urbansim.estimation.estimator import plot_utility_diagnose
@@ -26 +25 @@
         """
         If 'specification_module' is given, it contains the specification defined as a dictionary in a module.
-        Alternatively, the specification can be passed in an xml format in the 'xml_configuration' argument (It is a full path to the xml file). 
+        Alternatively, the specification can be passed in an xml format in the 'xml_configuration' argument 
+        (which should be an instance of XMLConfiguration).
         If both of those arguments are None, the specification is taken from the cache.
         'configuration' is an Opus configuration. 
@@ -39 +39 @@
         self.model_group = model_group
         self.estimated_model = model
-        
-        xml_config = None
-        if self.xml_configuration is not None:
-            xml_config = XMLConfiguration(self.xml_configuration)
-            
+                    
         if configuration is None:
-            if xml_config is None:
+            if self.xml_configuration is None:
                 raise StandardError, "Either dictionary based or XML based configuration must be given."
-            estimation_section = xml_config.get_section('model_manager/estimation')
+            estimation_section = self.xml_configuration.get_section('model_manager/estimation')
             config = estimation_section['estimation_config']
-            xml_config._merge_controllers(config)
+            self.xml_configuration._merge_controllers(config)
         else:
             config = Configuration(configuration)
@@ -55 +51 @@
         
         specification_dict=None
-        if xml_config is not None:
-            specification_dict = xml_config.get_estimation_specification(model)
+        if self.xml_configuration is not None:
+            specification_dict = self.xml_configuration.get_estimation_specification(model)
             
         if model_group is None:
@@ -97 +93 @@
         specification_dict=None
         if self.xml_configuration is not None:
-            specification_dict = XMLConfiguration(self.xml_configuration).get_estimation_specification(self.estimated_model)
+            specification_dict = self.self.xml_configuration.get_estimation_specification(self.estimated_model)
         Estimator.reestimate(self, self.specification_module, specification_dict=specification_dict, type=self.model_group, submodels=submodels)
         

trunk/urbansim/tools/start_estimation.py

@@ -13 +13 @@
 # 
 
-from optparse import OptionParser, OptionGroup
+from optparse import OptionParser
 from opus_core.misc import get_config_from_opus_path
 from opus_core.logger import logger
+from opus_core.configurations.xml_configuration import XMLConfiguration
 from urbansim.estimation.estimation_runner import EstimationRunner
 
@@ -47 +48 @@
     if (options.specification is None) and (options.xml_configuration is None):
         logger.log_warning("No specification given (arguments -s or -x). Specification taken from the cache.")
-
+    if options.xml_configuration is not None:
+        xconfig = XMLConfiguration(options.xml_configuration)
+    else:
+        xconfig = None
     if options.configuration_path is None:
         config = None
     else:
         config = get_config_from_opus_path(options.configuration_path)
-    estimator = EstimationRunner(model=options.model_name, specification_module=options.specification, xml_configuration=options.xml_configuration, 
+    estimator = EstimationRunner(model=options.model_name, specification_module=options.specification, xml_configuration=xconfig, 
                                  model_group=options.model_group,
                                  configuration=config,