mg-pso-gui 0.1.99__py3-none-any.whl → 0.1.101__py3-none-any.whl

{mg_pso_gui-0.1.99.dist-info → mg_pso_gui-0.1.101.dist-info}/METADATA

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

{mg_pso_gui-0.1.99.dist-info → mg_pso_gui-0.1.101.dist-info}/RECORD

@@ -33,8 +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=EsieesahV022aDLFfC_DfPILjvx3crJ8e3BZw_EJm6o,3437
+mgpsogui/util/PSORunner.py,sha256=QQuZJlACioHsvPUNthIdR3AHadAoOX7RtQwrwXIpVoY,3320
 mgpsogui/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mgpsogui/util/debug.py,sha256=JuEmIyGB8XDIkSg_EmpBmerAU_v6DVf9H3NsGXtit7k,3674
 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
@@ -46,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.99.dist-info/METADATA,sha256=thNYGiwKYHwsYGsVzEWLdDtBUYEJ_scc5WHxbSKhOhc,9458
-mg_pso_gui-0.1.99.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-mg_pso_gui-0.1.99.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.1.99.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.1.99.dist-info/RECORD,,
+mg_pso_gui-0.1.101.dist-info/METADATA,sha256=3cOCTGkv-XZ8YTViUfiD85Ye6WzwS30OQgGQ8H5mny0,9459
+mg_pso_gui-0.1.101.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+mg_pso_gui-0.1.101.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.1.101.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.1.101.dist-info/RECORD,,

mgpsogui/util/PSORunner.py

@@ -6,8 +6,8 @@ import threading
 import time
 import os
 
-from cosu.pso import global_best
-#from .recosu.pso import global_best
+#from cosu.pso import global_best
+from .recosu.pso import global_best
 
 def enqueue_output(out, queue):
     for line in iter(out.readline, b''):
@@ -59,6 +59,16 @@ def run_process(stdout_queue, stderr_queue, results_queue, cosu_queue, data, fol
         if "strategy_" in key:
             oh_strategy[key.replace("strategy_", "")] = calibration_map[key]
 
+    config = {
+        'service_timeout': int(calibration_map['service_timeout']),
+        'http_retry': int(calibration_map['http_retry']),
+        'http_allow_redirects': True if calibration_map['allow_redirects'] == "True" else False,
+        'async_call': True if calibration_map['async_call'] == "True" else False,
+        'http_conn_timeout': int(calibration_map['conn_timeout']),
+        'http_read_timeout': int(calibration_map['read_timeout']),
+        'particles_fail': int(calibration_map['particles_fail'])
+    }
+
     print("\n")
     print(calibration_map)
     print("\n")
@@ -66,9 +76,15 @@ def run_process(stdout_queue, stderr_queue, results_queue, cosu_queue, data, fol
     print("\n")
     print(oh_strategy)
     print("\n")
+    print(config)
+    print("\n")
+
+
     
     print("Running global_best...\n")
 
+
+
     optimizer, trace = global_best(steps,   
             rounds=(int(calibration_map['min_rounds']), int(calibration_map['max_rounds'])),              
             args=args,      
@@ -78,17 +94,7 @@ def run_process(stdout_queue, stderr_queue, results_queue, cosu_queue, data, fol
             # ftol=0.00000001,
             options=options,
             oh_strategy=oh_strategy, 
-            conf={
-                'service_timeout': int(calibration_map['service_timeout']),
-                'http_retry': int(calibration_map['http_retry']),
-                'http_allow_redirects': True if calibration_map['allow_redirects'] == "True" else False,
-                'async_call': True if calibration_map['async_call'] == "True" else False,
-                'http_conn_timeout': int(calibration_map['conn_timeout']),
-                'http_read_timeout': int(calibration_map['read_timeout']),
-                'particles_fail': int(calibration_map['particles_fail'])
-                #, 'step_trace': os.path.join(folder, 'trace.json')
-                },
-            #result_queue = cosu_queue
+            conf=config
         )
     
     results_queue.put(trace)

mgpsogui/util/debug.py

@@ -0,0 +1,118 @@
+from recosu.pso import global_best
+
+# 1) COSU steps, definition of parameters to calibrate
+steps = [
+    {    # step 1
+        'param': [
+            {
+                'name': 'soilOutLPS',
+                'bounds': (0.0, 2.0)
+            },
+            {
+                'name': 'lagInterflow',
+                'bounds': (10.0, 80.0)
+            }
+        ],
+        'objfunc': [
+            {
+                'name': 'ns',   # Name (Must be unique)
+                'of':'ns',      # Objective Function
+                'data': ('obs_data02_14.csv/obs/orun[1]',
+                         'output/csip_run/out/Outlet.csv/output/catchmentSimRunoff')
+                            # Optional Weight parameter. If not specified it is 1 or evenly distributed between all objective functions
+            }
+        ]
+    },
+    {  # step 2
+        'param': [
+            {
+                'name': 'flowRouteTA',
+                'bounds': (0.4, 5.0)
+            },
+            {
+                'name': 'soilMaxDPS',
+                'bounds': (0.0, 5.0)
+            }
+        ],
+        'objfunc': [
+            {
+                'name': 'ns',
+                'of':'ns',
+                'data': ('obs_data02_14.csv/obs/orun[1]',
+                         'output/csip_run/out/Outlet.csv/output/catchmentSimRunoff')
+            }
+        ]
+    }
+]
+
+# 2) static ages parameters
+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"
+        }
+    ],
+    # the service url
+    'url': 'http://csip.engr.colostate.edu:8087/csip-oms/m/ages/0.3.0',
+
+    # the files to attach for each run
+     'files': {}
+}
+
+# 3. perform optimization
+optimizer, trace  = global_best(steps,                 # step definition
+                rounds=(1, 2),                              # min/max number of rounds
+                args=args,                                  # static arguments    
+                n_particles=10,                             # number of particle candidates for each param
+                iters=20,                                   # max # of iterations
+                n_threads=10,                               # number of threads to use
+                # ftol=0.00000001,                          # min cost function delta for convergence
+                options={'c1': 2, 'c2': 2, 'w': 0.8},       # hyperparameter
+                oh_strategy={ "w":'adaptive', "c1":'adaptive',"c2":'adaptive'},   # adaptive hyperparameter adjustments based on current and max # of iterations 
+                conf={
+                    'service_timeout': 400.0,
+                    'http_retry': 5,
+                    'http_allow_redirects': True,
+                    'async_call': False,
+                    'http_conn_timeout': 10,
+                    'http_read_timeout': 400,
+                    'particles_fail': 5
+                    }
+            )