mg-pso-gui 0.2.126__tar.gz → 0.2.127__tar.gz

{mg_pso_gui-0.2.126 → mg_pso_gui-0.2.127}/PKG-INFO

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

{mg_pso_gui-0.2.126 → mg_pso_gui-0.2.127}/mg_pso_gui.egg-info/PKG-INFO

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

{mg_pso_gui-0.2.126 → mg_pso_gui-0.2.127}/mg_pso_gui.egg-info/SOURCES.txt

@@ -65,6 +65,7 @@ mgpsogui/util/CTkToolTip/ctk_tooltip.py
 mgpsogui/util/recosu/__init__.py
 mgpsogui/util/recosu/pso/__init__.py
 mgpsogui/util/recosu/pso/csip_access.py
+mgpsogui/util/recosu/pso/csip_access_new.py
 mgpsogui/util/recosu/pso/pso modified.py
 mgpsogui/util/recosu/pso/pso.py
 mgpsogui/util/recosu/pso/pso_new.py

mg_pso_gui-0.2.127/mgpsogui/util/recosu/pso/csip_access.py

@@ -0,0 +1,75 @@
+from cosu import utils
+from csip import Client
+from typing import List, Dict, Tuple
+import queue, os
+
+
+def csip_worker(reqq: queue.Queue, thread_no: int, stop, full_trace,
+                url, files, arg_params, conf: Dict, metainfo: Dict) -> None:
+    async_call = conf.get('async_call', True)  # default is async
+    save_resp = conf.get('save_response_to', None)  # save response, set it to a folder if responses should be saved.
+
+    while not stop():
+        
+        try:
+            (rnd, step, iteration, particle, x, step_param_names, calib_params, objfunc, resq) = reqq.get(True, 0.5)
+            # print(thread_no, particle)
+    
+            c = Client(metainfo=metainfo)
+
+            # static params (from args)
+            for param in arg_params:
+                c.add_data(param['name'], param['value'])
+
+            # particle params  (generated from steps)
+            # for i, value in enumerate(x):
+            for idx, value in enumerate(x[particle, :]):
+                c.add_data(step_param_names[idx], value)
+
+            # other, previously calibrated params (other steps)
+            for name, value in calib_params.items():
+                c.add_data(name, value)
+
+            # objective function info
+            for of in objfunc:
+                c.add_cosu(of['name'], of['of'], of['data'])
+                # c.add_data(of['name'], (of['data'][0], of['data'][1]))
+
+            print('.', end='', flush=True)
+
+            try:
+                # print(c)
+                if async_call:
+                    res = c.execute_async(url, files=files, conf=conf)
+                else:
+                    res = c.execute(url, files=files, conf=conf)
+
+                if res.is_failed():
+                    print(res)
+
+                if save_resp:
+                    res.save_to(os.path.join(save_resp, 'r{}s{}i{}p{}.json'.format(rnd, step, iteration, particle)))
+                    
+                # print(res)
+                print('O', end='', flush=True)
+                
+                cost = utils.calc_cost(res, objfunc)
+
+                if full_trace is not None:
+                    all_params = {}
+                    # for i, value in enumerate(x):
+                    for idx, value in enumerate(x[particle, :]):
+                        all_params[step_param_names[idx]] = value
+                        
+                    for name, value in calib_params.items():
+                        all_params[name] = value
+                    full_trace.append((all_params, cost))
+
+                resq.put((particle, cost))
+            except Exception as e:
+                print(res)
+                print(e)
+
+            reqq.task_done()
+        except queue.Empty:
+            continue

{mg_pso_gui-0.2.126 → mg_pso_gui-0.2.127}/setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-VERSION = '0.2.126'
+VERSION = '0.2.127'
 DESCRIPTION = 'GUI for MG-PSO'
 LONG_DESCRIPTION = open('../README.md').read()