mg-pso-gui 0.0.209__py3-none-any.whl → 0.0.210__py3-none-any.whl

{mg_pso_gui-0.0.209.dist-info → mg_pso_gui-0.0.210.dist-info}/METADATA

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

{mg_pso_gui-0.0.209.dist-info → mg_pso_gui-0.0.210.dist-info}/RECORD

@@ -30,12 +30,12 @@ mgpsogui/gui/images/stop.png,sha256=JPuxXQerCGpLikcp7cAj3iLCOjULMYYZ2sZe0lArh68,
 mgpsogui/gui/images/trash.png,sha256=j8cf0kWbJd-4Jp20lUVV1o1NSeQ4v1Ej4gfcIA3DVRQ,2958
 mgpsogui/gui/images/up.png,sha256=AQvFWCUqSQNaQ1E6LKZ9zNfSvW6t4mgy8uswdg9T2Hg,2457
 mgpsogui/util/GraphGenerator.py,sha256=hEPhka0ZKQJ9DSSywDfwoXFQMsk3RHyG8QyTLOQnN4M,7851
-mgpsogui/util/PSORunner.py,sha256=vT1LC6MlzQasgYDmmFRbPaRBhi3aUSqbcfqhHbpcR04,7447
+mgpsogui/util/PSORunner.py,sha256=nOoaV51bpN4h3Xgw14xd-UKs43YjmjEQUelQXX1qXWg,6502
 mgpsogui/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/util/CTkToolTip/__init__.py,sha256=G1jxV55hGtGgwyC1sR-uUUdasDdh0XZgcI-aILgGYA0,225
 mgpsogui/util/CTkToolTip/ctk_tooltip.py,sha256=SZMovpQIGvdpDRbqCKl9SHs92DrFCO2MOYL2ifolvOE,6329
-mg_pso_gui-0.0.209.dist-info/METADATA,sha256=aT7ZkYLH8fr8sEuLLpQWcv33C-eoMU-G2YtfMrDx5Lk,9459
-mg_pso_gui-0.0.209.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-mg_pso_gui-0.0.209.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.0.209.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.0.209.dist-info/RECORD,,
+mg_pso_gui-0.0.210.dist-info/METADATA,sha256=uirsQDKQDAA1gfG9nkoBvsqyBnY36kJCoGXW9GGyLCc,9459
+mg_pso_gui-0.0.210.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
+mg_pso_gui-0.0.210.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.0.210.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.0.210.dist-info/RECORD,,

mgpsogui/util/PSORunner.py

@@ -80,33 +80,27 @@ def run_process(stdout_queue, stderr_queue, results_queue, data, folder):
 
     import threading
 
-    def run_optimizer_thread(steps, calibration_map, args, options, oh_strategy, results_queue):
-        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 
-                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'])
-                    },
-            )
-        results_queue.put((optimizer, trace))
-
-    results_queue = Queue()
-    optimizer_thread = threading.Thread(target=run_optimizer_thread, args=(steps, calibration_map, args, options, oh_strategy, results_queue))
-    optimizer_thread.start()
-    optimizer_thread.join()
-    optimizer, trace = results_queue.get()
+    
+    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']),
+                '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'])
+                },
+        )
+        
     
     stdour_thread.join()
     stderr_thread.join()