mg-pso-gui 0.1.140__py3-none-any.whl → 0.1.141__py3-none-any.whl

{mg_pso_gui-0.1.140.dist-info → mg_pso_gui-0.1.141.dist-info}/METADATA

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

{mg_pso_gui-0.1.140.dist-info → mg_pso_gui-0.1.141.dist-info}/RECORD

@@ -1,7 +1,7 @@
 mgpsogui/__init__.py,sha256=q7AfBjeJABnFtbsZnsObpUwaXKPDVYtz46G6MKXLF74,42
 mgpsogui/mgpsogui.py,sha256=NIZmyNcbwC8EgSwf1ubdMUSJscrIEgoD4jLYziqHQ-k,148
 mgpsogui/start.yaml,sha256=ZjCVLb-MLqAxrGRm9kA7_SDpa-45EuKIELNQ2QqCAiU,4713
-mgpsogui/gui/HomePage.py,sha256=Np-Lvp2-I_CNm2OzYj25M1kV9Kdf6irXYzWdN69z2X0,23876
+mgpsogui/gui/HomePage.py,sha256=r_daju75mOzuneI9MO9WJo4k9NwD_6MQJJ_Jip0sBtg,24058
 mgpsogui/gui/OptionManager.py,sha256=36_MlFd6nLt6xd6HHE2sHtL8oW7VBOZbCvJ8er-wWJ4,12544
 mgpsogui/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/PlatformTab/PlatformTab.py,sha256=KyIoHlMKD9nfQqHeGJwRDA4RCoe4UykjB2l6xMTKK_M,10486
@@ -33,10 +33,10 @@ 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=KC-qVr4H17rmgfhxZs1P96EEhrBbFgV0vjoTkPvrS9M,15011
-mgpsogui/util/PSORunner.py,sha256=MC4K_TjkH1LX0DQ6DtXO-ZjZojjEDegVTaoMUCK4Zok,6018
+mgpsogui/util/PSORunner.py,sha256=Bk6IXsBKSB33uccTJX7xagYwXHLgUbvpcM5qoi1MXHo,6170
 mgpsogui/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/util/debug.py,sha256=Swzny9_1S-CCONWGssj9iDoSpbwu5Vr4f95g_9L8bec,19759
-mgpsogui/util/helpers.py,sha256=4Whv75Xe_5Qc5GBVfcglfOWsOTsvKmUTytgDcZzBG9s,2009
+mgpsogui/util/helpers.py,sha256=nnRgQ9hCGp5RhyesfT_ZI01CthyuK-VX62yx7ukyTdY,2441
 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.140.dist-info/METADATA,sha256=LDhf585nry7IF4F9BhoO39fb01qP3BW5ixRDEMH0qd4,9460
-mg_pso_gui-0.1.140.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-mg_pso_gui-0.1.140.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.1.140.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.1.140.dist-info/RECORD,,
+mg_pso_gui-0.1.141.dist-info/METADATA,sha256=VXK6Av86Oz3FEX_EUdL76-kvEx3bSsJ81zOwK4Eukf0,9460
+mg_pso_gui-0.1.141.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+mg_pso_gui-0.1.141.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.1.141.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.1.141.dist-info/RECORD,,

mgpsogui/gui/HomePage.py

@@ -546,7 +546,13 @@ class App(customtkinter.CTk):
 				
 		if (os.path.exists(os.path.join(folder, 'error.txt'))):
 
-			data = hp.parse_pso_error(os.path.join(folder, 'error.txt'), len(self.option_manager.get_steps()))
+
+			mode = self.option_manager.get_arguments()['mode'].get()
+
+			if mode == "Optimization: MG-PSO":
+				data = hp.parse_pso_error(os.path.join(folder, 'error.txt'), len(self.option_manager.get_steps()))
+			else:
+				data = hp.parse_sampling_output(os.path.join(folder, 'output.txt'))
 			self.progress_data = data["data"]
 			self.footer_progress_bar.stop()
 			self.footer_progress_bar.configure(mode="determinate")

mgpsogui/util/PSORunner.py

@@ -102,34 +102,34 @@ def run_process(stdout_queue, stderr_queue, results_queue, data, folder):
         print(oh_strategy)
         print("\n")
         print(config)
-        print("\n")
+        print("\n", flush=True)
 
         if my_mode == "Sampling: Halton":
-            print("Running Halton Sampling..\n")
+            print("Running Halton Sampling..\n", flush=True)
             trace = run_sampler(steps, 
                                 args, 
                                 int(calibration_map['count']), 
                                 int(calibration_map['num_threads']), 
                                 "halton", 
                                 conf=config, 
-                                trace_file="halton_trace.csv",
+                                trace_file=os.path.join(folder, 'halton_trace.txt'),
                                 offset=int(calibration_map['offset']))
             results_queue.put(trace)
-            print(trace)
+            print(trace, flush=True)
             
         elif my_mode == "Sampling: Random":
-            print("Running Random Sampling...\n")
+            print("Running Random Sampling...\n", flush=True)
             trace = run_sampler(steps, 
                     args, 
                     int(calibration_map['count']), 
                     int(calibration_map['num_threads']), 
                     "random", 
                     conf=config, 
-                    trace_file="random_trace.csv")
+                    trace_file=os.path.join(folder, 'random_trace.txt'))
             results_queue.put(trace)
-            print(trace)
+            print(trace, flush=True)
         else:
-            print("Running MG-PSO Optimization...\n")
+            print("Running MG-PSO Optimization...\n", flush=True)
             optimizer, trace = global_best(steps,   
                     rounds=(int(calibration_map['min_rounds']), int(calibration_map['max_rounds'])),              
                     args=args,      
@@ -142,12 +142,12 @@ def run_process(stdout_queue, stderr_queue, results_queue, data, folder):
                 )
             
             results_queue.put(trace)
-            print(trace)
+            print(trace, flush=True)
         
-        print("Finishing up...")
+        print("Finishing up...", flush=True)
         time.sleep(5)
     except Exception as e:
-        print("An exception occurred: ")
+        print("An exception occurred: ", flush=True)
         print(str(e))
         # Print stack trace
         import traceback

mgpsogui/util/helpers.py

@@ -21,6 +21,23 @@ def extract_final_round_values(data):
                 final_value["index"] = key
     return final_value
 
+def parse_sampling_output(file_path):
+    lines = ""
+
+    with open(file_path, 'r') as f:
+        lines = f.readlines()
+
+    # Remove any lines that don't contain "% Done "
+    lines = [line for line in lines if '% Done ' in line]
+
+    percents = []
+    percent = 0
+    for line in lines:
+        percent = float(line.split('% Done ')[0].strip())
+        percents.append(percent)
+
+    return {"percent": percent, "data": percents}
+
 def parse_pso_error(file_path, num_steps):
     lines = ""