mg-pso-gui 0.1.102__tar.gz → 0.1.104__tar.gz

{mg-pso-gui-0.1.102 → mg-pso-gui-0.1.104}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mg-pso-gui
-Version: 0.1.102
+Version: 0.1.104
 Summary: GUI for MG-PSO
 Author: Robert Cordingly
 Author-email: <rcording@uw.ed>

{mg-pso-gui-0.1.102 → mg-pso-gui-0.1.104}/mg_pso_gui.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mg-pso-gui
-Version: 0.1.102
+Version: 0.1.104
 Summary: GUI for MG-PSO
 Author: Robert Cordingly
 Author-email: <rcording@uw.ed>

{mg-pso-gui-0.1.102 → mg-pso-gui-0.1.104}/mgpsogui/util/PSORunner.py

@@ -19,6 +19,10 @@ def run_process(stdout_queue, stderr_queue, results_queue, cosu_queue, data, fol
     args = data['arguments']
     calib = data['calibration_parameters']
     
+    # If "mode" in args remove it
+    if "mode" in args:
+        del args["mode"]
+    
     calibration_map = {}
     for param in calib:
         param_name = param['name']
@@ -72,6 +76,8 @@ def run_process(stdout_queue, stderr_queue, results_queue, cosu_queue, data, fol
     print("\n")
     print(steps)
     print("\n")
+    print(args)
+    print("\n")
     print(calibration_map)
     print("\n")
     print(options)

{mg-pso-gui-0.1.102 → mg-pso-gui-0.1.104}/mgpsogui/util/debug.py

@@ -45,6 +45,8 @@ steps = [
     }
 ]
 
+steps = [{'param': [{'name': 'soilOutLPS', 'bounds': (0.0, 2.0), 'default_value': 1.0, 'optimal_value': 0.0, 'type': 'float', 'calibration_strategy': 'none'}, {'name': 'lagInterflow', 'bounds': (10.0, 80.0), 'default_value': 1.0, 'optimal_value': 0.0, 'type': 'float', 'calibration_strategy': 'none'}], 'objfunc': [{'name': 'ns', 'of': 'ns', 'weight': 1.0, 'data': ('obs_data02_14.csv/obs/orun[1]', 'output/csip_run/out/Outlet.csv/output/catchmentSimRunoff')}]}, {'param': [{'name': 'flowRouteTA', 'bounds': (0.4, 5.0), 'default_value': 1.0, 'optimal_value': 0.0, 'type': 'float', 'calibration_strategy': 'none'}, {'name': 'soilMaxDPS', 'bounds': (0.0, 5.0), 'default_value': 1.0, 'optimal_value': 0.0, 'type': 'float', 'calibration_strategy': 'none'}], 'objfunc': [{'name': 'ns', 'of': 'ns', 'weight': 1.0, 'data': ('obs_data02_14.csv/obs/orun[1]', 'output/csip_run/out/Outlet.csv/output/catchmentSimRunoff')}]}]
+
 # 2) static ages parameters
 args = {
     'param': [
@@ -96,6 +98,8 @@ args = {
      'files': {}
 }
 
+args = {'param': [{'name': 'startTime', 'value': '2002-01-01'}, {'name': 'endTime', 'value': '2006-12-31'}, {'name': 'dataStartTime', 'value': '2002-01-01'}, {'name': 'dataEndTime', 'value': '2006-12-31'}, {'name': 'cal_startTime', 'value': '2003-01-01'}, {'name': 'cal_endTime', 'value': '2006-12-31'}, {'name': 'parallelismThreads', 'value': '2'}, {'name': 'flagLoadState', 'value': 'True'}, {'name': 'payload', 'value': 'false'}, {'name': 'project', 'value': 'SFIR3'}], 'url': 'http://csip.engr.colostate.edu:8087/csip-oms/m/ages/0.3.0', 'mode': 'PSO', 'files': {}}
+
 # 3. perform optimization
 optimizer, trace  = global_best(steps,                 # step definition
                 rounds=(1, 2),                              # min/max number of rounds

{mg-pso-gui-0.1.102 → mg-pso-gui-0.1.104}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import codecs
 import os
 
-VERSION = '0.1.102'
+VERSION = '0.1.104'
 DESCRIPTION = 'GUI for MG-PSO'
 LONG_DESCRIPTION = open('../README.md').read()