mg-pso-gui 0.1.95__py3-none-any.whl → 0.1.97__py3-none-any.whl

{mg_pso_gui-0.1.95.dist-info → mg_pso_gui-0.1.97.dist-info}/METADATA

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

{mg_pso_gui-0.1.95.dist-info → mg_pso_gui-0.1.97.dist-info}/RECORD

@@ -40,14 +40,14 @@ mgpsogui/util/CTkToolTip/ctk_tooltip.py,sha256=SZMovpQIGvdpDRbqCKl9SHs92DrFCO2MO
 mgpsogui/util/recosu/__init__.py,sha256=T7_iigIlowGbPOHLO3hwihjw2kbwIg6olOMhFhNiL38,236
 mgpsogui/util/recosu/pso/__init__.py,sha256=PQ548aEKVOk6MMzxxDg7yMO_1hHfoEoYLLkGLeij73Y,247
 mgpsogui/util/recosu/pso/csip_access.py,sha256=jBli1MSShUUwQCMKOUvMaGuNwBViCrjXJi_FmSEJsZA,2721
-mgpsogui/util/recosu/pso/pso.py,sha256=dc45ZlysCnqhag5WFyxOMd87a5Xx5r4WDdWcGk_3VNw,12590
+mgpsogui/util/recosu/pso/pso.py,sha256=8tvrZIBNxvWv4AXgLYIYdGwvslFNr_fcQsg1Y3CSRjU,12821
 mgpsogui/util/recosu/utils/__init__.py,sha256=TXz_TpNif2GeGu22pzTnkUQvaP-PmLQ9Sz4BgMIS6ig,196
 mgpsogui/util/recosu/utils/trace_writer.py,sha256=V9BJlOjCbNYGoXGEk3CF5wjifBxvarrMRXJMbDBWqI8,3023
 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.95.dist-info/METADATA,sha256=P-Z2Vlr3KoV_aAGwE6TEDRjF2DDLsO2fdCgwyfUFScE,9458
-mg_pso_gui-0.1.95.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-mg_pso_gui-0.1.95.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.1.95.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.1.95.dist-info/RECORD,,
+mg_pso_gui-0.1.97.dist-info/METADATA,sha256=vAc6hAkrwVnkzpxa8mIafa61g-0oIv8mn1fI4iu_RQ4,9458
+mg_pso_gui-0.1.97.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+mg_pso_gui-0.1.97.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.1.97.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.1.97.dist-info/RECORD,,

mgpsogui/util/recosu/pso/pso.py

@@ -22,7 +22,7 @@ import datetime
 import queue
 import json
 import os
-from multiprocessing import Queue
+from multiprocessing import Queue as MPQueue
 
 
 def eval_cost(x, iteration, step_param_names, step_objfunc, calib_params, req_queue, files, url, param, conf: Dict, rnd,
@@ -82,7 +82,7 @@ def eval_cost(x, iteration, step_param_names, step_objfunc, calib_params, req_qu
 def global_best(steps: Dict, rounds: Tuple, args: Dict, n_particles: int, iters: int, options: Dict,
                 oh_strategy: Dict = None, n_threads: int = 4, rtol: float = 0.001, ftol: float = -np.inf,
                 ftol_iter: int = 1, full_trace: List = None, rtol_iter: int = 1,
-                conf: Dict = None, metainfo: Dict = None, cost_target: float = -np.inf, result_queue: Queue = None) -> Tuple:
+                conf: Dict = None, metainfo: Dict = None, cost_target: float = -np.inf, result_queue: MPQueue = None) -> Tuple:
     """Performs a stepwise particle swarm optimization PSO using a global best approach.
 
         Parameters
@@ -182,11 +182,15 @@ def global_best(steps: Dict, rounds: Tuple, args: Dict, n_particles: int, iters:
         with open(step_file, "w") as fo:
             json.dump(step_trace, fo)
 
+    print("Wrote step trace")
+
     # best round cost
     best_round_cost = np.inf
 
     # request queue for worker
     req_queue = queue.Queue()
+    
+    print("Created queue")
 
     conf = conf or {}
     done = False
@@ -199,6 +203,8 @@ def global_best(steps: Dict, rounds: Tuple, args: Dict, n_particles: int, iters:
         thread_pool.append(worker)
         worker.start()
 
+    print("Started worker threads")
+
     r_below = 0
     early_exit = False
     start_time = datetime.datetime.now()
@@ -222,6 +228,8 @@ def global_best(steps: Dict, rounds: Tuple, args: Dict, n_particles: int, iters:
             args['req_queue'] = req_queue
             args['conf'] = conf
 
+            print("Calling global best..")
+
             # create optimizer in the first round.
             if optimizer[s] is None:
                 optimizer[s] = GlobalBestPSO(step.get('n_particles', n_particles),
@@ -232,21 +240,27 @@ def global_best(steps: Dict, rounds: Tuple, args: Dict, n_particles: int, iters:
                                              ftol=step.get('ftol', ftol),
                                              ftol_iter=step.get('ftol_iter', ftol_iter),
                                              cost_target=step.get('cost_target', cost_target))
-            print('\n>>>>> R{}/S{}  particle params: {}  calibrated params: {}\n'.format(r + 1, s + 1, param_names,
-                                                                                         args['calib_params']))
+                
+            print('\n>>>>> R{}/S{}  particle params: {}  calibrated params: {}\n'.format(r + 1, s + 1, param_names, args['calib_params']))
 
-            if result_queue is not None:
-                result_queue.put('\n>>>>> R{}/S{}  particle params: {}  calibrated params: {}\n'.format(r + 1, s + 1, param_names, args['calib_params']))
+            #if result_queue is not None:
+            #    result_queue.put('\n>>>>> R{}/S{}  particle params: {}  calibrated params: {}\n'.format(r + 1, s + 1, param_names, args['calib_params']))
+            
+            print("Filled request queue...")
             
             args['rnd'] = r + 1
             args['step'] = s + 1
 
+            print("Evaluating cost...")
+
             # perform optimization
             cost, pos = optimizer[s].optimize(eval_cost, iters=step.get('iters', iters), **args)
             if cost is None:
                 early_exit = True
                 break
 
+            print("Finished evaluation...")
+
             # capture the best cost
             # if cost < best_cost[s] and np.abs(cost - best_cost[s]) > rtol:
             if cost < best_cost[s]: