mg-pso-gui 0.1.96__tar.gz → 0.1.97__tar.gz

{mg-pso-gui-0.1.96 → mg-pso-gui-0.1.97}/PKG-INFO

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

{mg-pso-gui-0.1.96 → mg-pso-gui-0.1.97}/mg_pso_gui.egg-info/PKG-INFO

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

{mg-pso-gui-0.1.96 → mg-pso-gui-0.1.97}/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
@@ -178,8 +178,6 @@ def global_best(steps: Dict, rounds: Tuple, args: Dict, n_particles: int, iters:
     step_trace['steps'] = copy.deepcopy(steps)
     #step_trace['args'] = args BUG MUST BE REMOVED
 
-    print("Starting PSO with {} rounds, {} threads, {} particles, {} iterations, {} steps")
-
     if step_file is not None:
         with open(step_file, "w") as fo:
             json.dump(step_trace, fo)
@@ -242,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]:

{mg-pso-gui-0.1.96 → mg-pso-gui-0.1.97}/setup.py

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