mg-pso-gui 0.0.191__tar.gz → 0.0.193__tar.gz

{mg-pso-gui-0.0.191 → mg-pso-gui-0.0.193}/PKG-INFO

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

{mg-pso-gui-0.0.191 → mg-pso-gui-0.0.193}/mg_pso_gui.egg-info/PKG-INFO

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

{mg-pso-gui-0.0.191 → mg-pso-gui-0.0.193}/mgpsogui/gui/HomePage.py

@@ -193,7 +193,7 @@ class App(customtkinter.CTk):
             self.graph_image_obj = Image.open(image_path)
             self.graph_image = customtkinter.CTkImage(self.graph_image_obj, size=(self.image_width, self.image_height))
             self.graph_label.configure(image=self.graph_image)
-        elif (selected_graph == "Table"):
+        elif (selected_graph == "Iteration Table"):
             self.selected_graph_name = "table"
             image_path = os.path.join(folder, self.selected_graph_name + ".png")
             if not os.path.exists(image_path):
@@ -341,8 +341,8 @@ class App(customtkinter.CTk):
             info = self.option_manager.get_project_data()
             folder = os.path.join(info['path'], info['name'])
             
-            
-            self.train_process = Process(target=PSORunner.run_process, args=(metrics, folder))
+            self.process_queue = Queue()
+            self.train_process = Process(target=PSORunner.run_process, args=(self.process_queue, metrics, folder))
             self.train_process.daemon = True
             self.train_process.start()
             self.after(1000, self.watch_loop)
@@ -504,6 +504,16 @@ class App(customtkinter.CTk):
         if self.train_process.is_alive():
             self.after(1000, self.watch_loop)
         else:
+            # Check if queue is empty
+            if (self.process_queue.empty()):
+                print("PROCESS FINISHED BUT WE GOT NO OBJECTS :(")
+                self.footer_progress_label.configure(text="Failed")
+            else:
+                self.final_results = self.process_queue.get()
+                print("PROCESS FINISHED WE GOT THINGS")
+                print(self.final_results)
+                self.footer_progress_label.configure(text="Finished")
+            
             #self.progress_bar.stop()
             self.footer_progress_bar.stop()
             #self.progress_bar.configure(mode="indeterminate")
@@ -513,7 +523,6 @@ class App(customtkinter.CTk):
             self.progress_message_left.configure(text="")
             self.progress_message_middle.configure(text="Calibration finished!")
             self.progress_message_right.configure(text="")
-            self.footer_progress_label.configure(text="Finished")
             self.textbox.insert("0.0", "\nCalibration finished!\n")
 
 def start():

{mg-pso-gui-0.0.191 → mg-pso-gui-0.0.193}/mgpsogui/gui/VisualizeTab/VisualizeTab.py

@@ -61,11 +61,11 @@ def create_tab(self, tab):
     
     self.graph_selector_value = tk.StringVar()
     self.graph_selector_value.set("Best Cost Stacked")
-    self.graph_selector = customtkinter.CTkOptionMenu(self.graph_sidebar, values=["Best Cost Stacked", "Best Cost by Round", "Calibrated Parameters", "Table"], variable=self.graph_selector_value, command=self.update_graph)
+    self.graph_selector = customtkinter.CTkOptionMenu(self.graph_sidebar, width=250, values=["Best Cost Stacked", "Best Cost by Round", "Calibrated Parameters", "Iteration Table"], variable=self.graph_selector_value, command=self.update_graph)
     self.graph_selector.grid(row=0, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")
     
     # Add a button to call open_graph_in_browser
-    self.graph_button = customtkinter.CTkButton(self.graph_sidebar, text="Open Graph in Browser", command=open_graph_in_browser)
+    self.graph_button = customtkinter.CTkButton(self.graph_sidebar, text="Open in Browser", width=250, command=open_graph_in_browser)
     self.graph_button.grid(row=9, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")
     
     self.graph_image_obj = Image.open(os.path.join("./images", "refresh_hd.png"))

{mg-pso-gui-0.0.191 → mg-pso-gui-0.0.193}/mgpsogui/util/PSORunner.py

@@ -8,7 +8,7 @@ import os
 
 from cosu.pso import global_best
 
-def run_process(data, folder):
+def run_process(process_queue, data, folder):
     steps = data['steps']
     args = data['arguments']
     calib = data['calibration_parameters']
@@ -69,4 +69,6 @@ def run_process(data, folder):
                 'particles_fail': int(calibration_map['particles_fail'])
                 },
         )  
+    
+    process_queue.put((optimizer, trace))
 

{mg-pso-gui-0.0.191 → mg-pso-gui-0.0.193}/setup.py

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