mg-pso-gui 0.1.140__tar.gz → 0.1.141__tar.gz

{mg-pso-gui-0.1.140 → mg-pso-gui-0.1.141}/PKG-INFO

@@ -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 → mg-pso-gui-0.1.141}/mg_pso_gui.egg-info/PKG-INFO

@@ -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 → mg-pso-gui-0.1.141}/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")

{mg-pso-gui-0.1.140 → mg-pso-gui-0.1.141}/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

{mg-pso-gui-0.1.140 → mg-pso-gui-0.1.141}/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 = ""
     

{mg-pso-gui-0.1.140 → mg-pso-gui-0.1.141}/setup.py

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