mg-pso-gui 0.0.208__tar.gz → 0.0.210__tar.gz

{mg-pso-gui-0.0.208 → mg-pso-gui-0.0.210}/PKG-INFO

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

{mg-pso-gui-0.0.208 → mg-pso-gui-0.0.210}/mg_pso_gui.egg-info/PKG-INFO

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

{mg-pso-gui-0.0.208 → mg-pso-gui-0.0.210}/mgpsogui/util/PSORunner.py

@@ -76,20 +76,20 @@ def run_process(stdout_queue, stderr_queue, results_queue, data, folder):
     print(oh_strategy)
     print("\n")
     
-    print("waiting 30 seconds...\n")
-    time.sleep(30)
-    
     print("Running global_best...\n")
 
-    optimizer, trace = global_best(steps,                 # step definition
-            rounds=(int(calibration_map['min_rounds']), int(calibration_map['max_rounds'])),                              # min/max number of rounds
-            args=args,                                  # static arguments    
-            n_particles=int(calibration_map['n_particles']),                             # number of particle candidates for each param
-            iters=int(calibration_map['iters']),                                   # max # of iterations
-            n_threads=int(calibration_map['n_threads']),                               # number of threads to use
-            # ftol=0.00000001,                          # min cost function delta for convergence
-            options=options,       # hyperparameter
-            oh_strategy=oh_strategy,   # adaptive hyperparameter adjustments based on current and max # of iterations 
+    import threading
+
+    
+    optimizer, trace = global_best(steps,   
+            rounds=(int(calibration_map['min_rounds']), int(calibration_map['max_rounds'])),              
+            args=args,      
+            n_particles=int(calibration_map['n_particles']),      
+            iters=int(calibration_map['iters']),  
+            n_threads=int(calibration_map['n_threads']),      
+            # ftol=0.00000001,
+            options=options,
+            oh_strategy=oh_strategy, 
             conf={
                 'service_timeout': int(calibration_map['service_timeout']),
                 'http_retry': int(calibration_map['http_retry']),
@@ -99,7 +99,8 @@ def run_process(stdout_queue, stderr_queue, results_queue, data, folder):
                 'http_read_timeout': int(calibration_map['read_timeout']),
                 'particles_fail': int(calibration_map['particles_fail'])
                 },
-        )  
+        )
+        
     
     stdour_thread.join()
     stderr_thread.join()

{mg-pso-gui-0.0.208 → mg-pso-gui-0.0.210}/setup.py

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