mg-pso-gui 0.1.94__py3-none-any.whl → 0.1.96__py3-none-any.whl

{mg_pso_gui-0.1.94.dist-info → mg_pso_gui-0.1.96.dist-info}/METADATA

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

{mg_pso_gui-0.1.94.dist-info → mg_pso_gui-0.1.96.dist-info}/RECORD

@@ -33,21 +33,21 @@ mgpsogui/gui/images/test.png,sha256=MUnVpRK-isxhEHzx4Q6Yh0M6FRZD1qvgCHH2XmiSBbk,
 mgpsogui/gui/images/trash.png,sha256=j8cf0kWbJd-4Jp20lUVV1o1NSeQ4v1Ej4gfcIA3DVRQ,2958
 mgpsogui/gui/images/up.png,sha256=AQvFWCUqSQNaQ1E6LKZ9zNfSvW6t4mgy8uswdg9T2Hg,2457
 mgpsogui/util/GraphGenerator.py,sha256=HhUsFUFhCv3wTYV8CTqU0wo56Ph9c1DocPj25AVIAdI,15076
-mgpsogui/util/PSORunner.py,sha256=xCkt3RSLEsq2BRBiJjfTkWSeGM4oLM1ulT0bjOy_Mkg,3482
+mgpsogui/util/PSORunner.py,sha256=79GCLkyO2AG41uMGskRzA6PAOchDKUkDEheLi3tKDWk,3481
 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
 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=GCKecDTjtjD8tOg67swkf0lFfv84vGXWJ34E7Ask_1s,12827
 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.94.dist-info/METADATA,sha256=iQ1ZHGHG3RUinmd5_EQFJR-djYhankoWicUUm1v0k9s,9458
-mg_pso_gui-0.1.94.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-mg_pso_gui-0.1.94.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.1.94.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.1.94.dist-info/RECORD,,
+mg_pso_gui-0.1.96.dist-info/METADATA,sha256=So-3i9StUZe-MohUQrRvRh6xef1z6qnGC3YF4N_-yPY,9458
+mg_pso_gui-0.1.96.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+mg_pso_gui-0.1.96.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.1.96.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.1.96.dist-info/RECORD,,

mgpsogui/util/PSORunner.py

@@ -87,8 +87,8 @@ def run_process(stdout_queue, stderr_queue, results_queue, cosu_queue, data, fol
                 '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'])
-                #,'step_trace': os.path.join(folder, 'trace.json')
+                'particles_fail': int(calibration_map['particles_fail']),
+                'step_trace': os.path.join(folder, 'trace.json')
                 },
             result_queue = cosu_queue
         )

mgpsogui/util/recosu/pso/pso.py

@@ -178,15 +178,21 @@ 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)
 
+    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 +205,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 +230,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),