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

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

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

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

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

{mg-pso-gui-0.1.99 → mg-pso-gui-0.1.102}/mg_pso_gui.egg-info/SOURCES.txt

@@ -42,6 +42,7 @@ mgpsogui/gui/images/up.png
 mgpsogui/util/GraphGenerator.py
 mgpsogui/util/PSORunner.py
 mgpsogui/util/__init__.py
+mgpsogui/util/debug.py
 mgpsogui/util/CTkToolTip/__init__.py
 mgpsogui/util/CTkToolTip/ctk_tooltip.py
 mgpsogui/util/recosu/__init__.py

{mg-pso-gui-0.1.99 → mg-pso-gui-0.1.102}/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,18 @@ 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(steps)
     print("\n")
     print(calibration_map)
     print("\n")
@@ -66,9 +78,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 +96,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)

mg-pso-gui-0.1.102/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
+                    }
+            )  

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

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