mg-pso-gui 0.1.102__py3-none-any.whl → 0.1.104__py3-none-any.whl

{mg_pso_gui-0.1.102.dist-info → mg_pso_gui-0.1.104.dist-info}/METADATA

@@ -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.dist-info → mg_pso_gui-0.1.104.dist-info}/RECORD

@@ -33,9 +33,9 @@ mgpsogui/gui/images/test.png,sha256=MUnVpRK-isxhEHzx4Q6Yh0M6FRZD1qvgCHH2XmiSBbk,
 mgpsogui/gui/images/trash.png,sha256=j8cf0kWbJd-4Jp20lUVV1o1NSeQ4v1Ej4gfcIA3DVRQ,2958
 mgpsogui/gui/images/up.png,sha256=AQvFWCUqSQNaQ1E6LKZ9zNfSvW6t4mgy8uswdg9T2Hg,2457
 mgpsogui/util/GraphGenerator.py,sha256=HhUsFUFhCv3wTYV8CTqU0wo56Ph9c1DocPj25AVIAdI,15076
-mgpsogui/util/PSORunner.py,sha256=jHuNc5KdVVbdd3a1bMFsxqZ-rL58Qx2XruAplToMUIE,3353
+mgpsogui/util/PSORunner.py,sha256=8hC_4CCP7ktscIRi14Fd1-qAYApWwWO-u1aj22gOjcc,3472
 mgpsogui/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mgpsogui/util/debug.py,sha256=JuEmIyGB8XDIkSg_EmpBmerAU_v6DVf9H3NsGXtit7k,3674
+mgpsogui/util/debug.py,sha256=R-OBdE7XH5ejfDGoOHIgKr-TomzFy-jPvUhVzhSbzm0,5159
 mgpsogui/util/CTkToolTip/__init__.py,sha256=G1jxV55hGtGgwyC1sR-uUUdasDdh0XZgcI-aILgGYA0,225
 mgpsogui/util/CTkToolTip/ctk_tooltip.py,sha256=SZMovpQIGvdpDRbqCKl9SHs92DrFCO2MOYL2ifolvOE,6329
 mgpsogui/util/recosu/__init__.py,sha256=T7_iigIlowGbPOHLO3hwihjw2kbwIg6olOMhFhNiL38,236
@@ -47,8 +47,8 @@ mgpsogui/util/recosu/utils/trace_writer.py,sha256=V9BJlOjCbNYGoXGEk3CF5wjifBxvar
 mgpsogui/util/recosu/utils/utils.py,sha256=QB8vftq3142ekG0ORjz0ZBHU5YknXbR0oTsrxrPAsF0,3951
 mgpsogui/util/recosu/utils/plot/__init__.py,sha256=h1KjM7_tNDv351pcwt8A6Ibb1jhwWyx5Gbu-zj-sI3Q,71
 mgpsogui/util/recosu/utils/plot/cost_steps.py,sha256=1Ce11AJyweWkmvjXPxEygzS-h8yVLmQEDLS53yjPLqQ,3779
-mg_pso_gui-0.1.102.dist-info/METADATA,sha256=Fj9z3HnieiYL0_GjQDGb0sXzjEFZKyOFZxZFnA80NLU,9459
-mg_pso_gui-0.1.102.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-mg_pso_gui-0.1.102.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.1.102.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.1.102.dist-info/RECORD,,
+mg_pso_gui-0.1.104.dist-info/METADATA,sha256=YjvLjH3HLNh94nf6S0DoOiWAYNl5IIm4Obh_6Mi-FeA,9459
+mg_pso_gui-0.1.104.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+mg_pso_gui-0.1.104.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.1.104.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.1.104.dist-info/RECORD,,

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)

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