mg-pso-gui 0.0.192__py3-none-any.whl → 0.0.193__py3-none-any.whl

{mg_pso_gui-0.0.192.dist-info → mg_pso_gui-0.0.193.dist-info}/METADATA

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

{mg_pso_gui-0.0.192.dist-info → mg_pso_gui-0.0.193.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=3u3N4-t8LHL-uL67r3MTyBjakUnS8sR9UodH0gKw9kQ,24299
+mgpsogui/gui/HomePage.py,sha256=Zd6g8URhhScwr6lmgz3c-1SK4aylDT-dK1HFB0opl90,24760
 mgpsogui/gui/OptionManager.py,sha256=bFN2jWJbx1Din3waOFLmbWGt0BXD_KthGJ8Mgue_FEE,11712
 mgpsogui/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/PlatformTab/PlatformTab.py,sha256=KyIoHlMKD9nfQqHeGJwRDA4RCoe4UykjB2l6xMTKK_M,10486
@@ -17,7 +17,7 @@ mgpsogui/gui/SetupTab/SetupTab.py,sha256=Doy_6xLq1BjhLTFHRQm7CAbpQzUnNJW4KkBcdfr
 mgpsogui/gui/SetupTab/StaticParameterView.py,sha256=iEG-UpBBlAJabZo3MG768oLqOROjUPc23tKOSd47IUc,2739
 mgpsogui/gui/SetupTab/StepView.py,sha256=oG5Q-3xpTRP1f_PbNvohKctrbpD63zLAJzHD00bN44k,5531
 mgpsogui/gui/SetupTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mgpsogui/gui/VisualizeTab/VisualizeTab.py,sha256=V37Rkd6B6JP0ILQMfA89Gny5cmv6sr6vkT3zBRWVWOQ,3276
+mgpsogui/gui/VisualizeTab/VisualizeTab.py,sha256=rrti0q3tXfmCRwt87ZvnO2M6asOkS2Tp1kcv2ERjbSk,3292
 mgpsogui/gui/VisualizeTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/images/collapse.png,sha256=yicb16LaY7Nl5q9V8HHlht-Fbg5xU-l4_LJ_Arfmu1c,2989
 mgpsogui/gui/images/down.png,sha256=pspJkvUitD648C_2y8JLLD4Eagpk4MDEKQJGOO_yIaY,2654
@@ -29,12 +29,12 @@ mgpsogui/gui/images/stop.png,sha256=JPuxXQerCGpLikcp7cAj3iLCOjULMYYZ2sZe0lArh68,
 mgpsogui/gui/images/trash.png,sha256=j8cf0kWbJd-4Jp20lUVV1o1NSeQ4v1Ej4gfcIA3DVRQ,2958
 mgpsogui/gui/images/up.png,sha256=AQvFWCUqSQNaQ1E6LKZ9zNfSvW6t4mgy8uswdg9T2Hg,2457
 mgpsogui/util/GraphGenerator.py,sha256=hEPhka0ZKQJ9DSSywDfwoXFQMsk3RHyG8QyTLOQnN4M,7851
-mgpsogui/util/PSORunner.py,sha256=7iUYRUXgpZ0l0rqoyHQYY1Yg9q0gl9TE0jNaHZMv04c,2921
+mgpsogui/util/PSORunner.py,sha256=6dx8kz_fODGKhG--oDW3gr9jNr_RAK311Cp1OY1jyuA,2983
 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
-mg_pso_gui-0.0.192.dist-info/METADATA,sha256=3sYHKLOo6H3SGmjKGYdNevq4rtG7Ime1O8q3f5Qw2r4,9459
-mg_pso_gui-0.0.192.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-mg_pso_gui-0.0.192.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.0.192.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.0.192.dist-info/RECORD,,
+mg_pso_gui-0.0.193.dist-info/METADATA,sha256=Z7EmvVSsFfbuu2BsiwZykqelGlGd6pZ5A88l4Mrygmk,9459
+mg_pso_gui-0.0.193.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
+mg_pso_gui-0.0.193.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.0.193.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.0.193.dist-info/RECORD,,

mgpsogui/gui/HomePage.py

@@ -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():

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", "Iteration 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"))

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))