mg-pso-gui 0.1.133__py3-none-any.whl → 0.1.135__py3-none-any.whl

{mg_pso_gui-0.1.133.dist-info → mg_pso_gui-0.1.135.dist-info}/METADATA

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

{mg_pso_gui-0.1.133.dist-info → mg_pso_gui-0.1.135.dist-info}/RECORD

@@ -32,11 +32,11 @@ mgpsogui/gui/images/stop.png,sha256=JPuxXQerCGpLikcp7cAj3iLCOjULMYYZ2sZe0lArh68,
 mgpsogui/gui/images/test.png,sha256=MUnVpRK-isxhEHzx4Q6Yh0M6FRZD1qvgCHH2XmiSBbk,3642
 mgpsogui/gui/images/trash.png,sha256=j8cf0kWbJd-4Jp20lUVV1o1NSeQ4v1Ej4gfcIA3DVRQ,2958
 mgpsogui/gui/images/up.png,sha256=AQvFWCUqSQNaQ1E6LKZ9zNfSvW6t4mgy8uswdg9T2Hg,2457
-mgpsogui/util/GraphGenerator.py,sha256=yaVb_oxo5vR-UhrydiHPkRFdiklVNcgtnndE1BJ54hw,14987
-mgpsogui/util/PSORunner.py,sha256=YmzsZbbTH8axrwJYq7ypCiOeMW4w4dnoLquv1mSGKSU,5729
+mgpsogui/util/GraphGenerator.py,sha256=KC-qVr4H17rmgfhxZs1P96EEhrBbFgV0vjoTkPvrS9M,15011
+mgpsogui/util/PSORunner.py,sha256=voiF0-Eo49yZGfnxFsZof6vizEheDcBUqASrqk9z4wE,5912
 mgpsogui/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/util/debug.py,sha256=Swzny9_1S-CCONWGssj9iDoSpbwu5Vr4f95g_9L8bec,19759
-mgpsogui/util/helpers.py,sha256=rG89dG8v2W0U8kuawGWFhxQiJkRzl6A7l7UAM_jHWAk,1995
+mgpsogui/util/helpers.py,sha256=4Whv75Xe_5Qc5GBVfcglfOWsOTsvKmUTytgDcZzBG9s,2009
 mgpsogui/util/sampler_test_driver.py,sha256=1iJTLVFZ_VCsuIdl3mXQBA1GNAH5jJO3z5h4E_bd5U8,3703
 mgpsogui/util/CTkToolTip/__init__.py,sha256=G1jxV55hGtGgwyC1sR-uUUdasDdh0XZgcI-aILgGYA0,225
 mgpsogui/util/CTkToolTip/ctk_tooltip.py,sha256=SZMovpQIGvdpDRbqCKl9SHs92DrFCO2MOYL2ifolvOE,6329
@@ -58,8 +58,8 @@ mgpsogui/util/recosu/utils/trace_writer.py,sha256=V9BJlOjCbNYGoXGEk3CF5wjifBxvar
 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.133.dist-info/METADATA,sha256=xt7m13uQiOZu9o5KFV_iWdAjE0JhgVWTY3ny9ZfcwTM,9460
-mg_pso_gui-0.1.133.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-mg_pso_gui-0.1.133.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.1.133.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.1.133.dist-info/RECORD,,
+mg_pso_gui-0.1.135.dist-info/METADATA,sha256=ws7fB3VzT9Hv_za_65A05MtIBVc0zOxQeY-cWTQeLqA,9460
+mg_pso_gui-0.1.135.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+mg_pso_gui-0.1.135.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.1.135.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.1.135.dist-info/RECORD,,

mgpsogui/util/GraphGenerator.py

@@ -159,7 +159,7 @@ def best_cost_by_round(config, data, option_manager):
         #step_index = ((iteration) % total_steps)
         #round_index = ((iteration) // total_steps)
 
-        fig.add_trace(go.Scatter(x=np.array(data['percent']) + (100 * round_index), y=data['best_cost'], name=round_step))
+        fig.add_trace(go.Scatter(x=np.array(data[round_step]['percent']) + (100 * round_index), y=data[round_step]['best_cost'], name=round_step))
         
         #fig.add_trace(go.Scatter(x=df['completed_rounds'] + (df['total_rounds'] * round_index), y=df['best_cost'], name='Group ' + str(step_index + 1)))
         

mgpsogui/util/PSORunner.py

@@ -68,16 +68,7 @@ def run_process(stdout_queue, stderr_queue, results_queue, data, folder):
             if "strategy_" in key:
                 oh_strategy[key.replace("strategy_", "")] = calibration_map[key]
 
-        config = {
-            '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']),
-            'step_trace': os.path.join(folder, 'pso_step_trace.json')
-        }
+        config = {}
 
         if my_mode == "Sampling: Halton" or my_mode == "Sampling: Random":
             config = {
@@ -90,6 +81,17 @@ def run_process(stdout_queue, stderr_queue, results_queue, data, folder):
                 'particles_fail': int(calibration_map['particles_fail']),
                 'step_trace': os.path.join(folder, 'pso_step_trace.json')
             }
+        else:
+            config = {
+                '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']),
+                'step_trace': os.path.join(folder, 'pso_step_trace.json')
+            }
 
         print("\n")
         print(steps)
@@ -105,9 +107,8 @@ def run_process(stdout_queue, stderr_queue, results_queue, data, folder):
         print(config)
         print("\n")
 
-        print("Running global_best...\n")
-
         if my_mode == "Sampling: Halton":
+            print("Running Halton Sampling..\n")
             trace = run_sampler(steps, 
                                 args, 
                                 int(calibration_map['count']), 
@@ -120,6 +121,7 @@ def run_process(stdout_queue, stderr_queue, results_queue, data, folder):
             print(trace)
             
         elif my_mode == "Sampling: Random":
+            print("Running Random Sampling...\n")
             trace = run_sampler(steps, 
                     args, 
                     int(calibration_map['count']), 
@@ -130,7 +132,7 @@ def run_process(stdout_queue, stderr_queue, results_queue, data, folder):
             results_queue.put(trace)
             print(trace)
         else:
-
+            print("Running MG-PSO Optimization...\n")
             optimizer, trace = global_best(steps,   
                     rounds=(int(calibration_map['min_rounds']), int(calibration_map['max_rounds'])),              
                     args=args,      

mgpsogui/util/helpers.py

@@ -50,8 +50,8 @@ def parse_pso_error(file_path, num_steps):
             in100s = True
 
             round_steps[f"Round: {round} - Step: {step}"] = {
-                "best_cost": best_costs,
-                "percent": percents
+                "best_cost": best_costs.copy(),
+                "percent": percents.copy()
             }
 
             best_costs = []