mg-pso-gui 0.2.132__py3-none-any.whl → 0.2.134__py3-none-any.whl

{mg_pso_gui-0.2.132.dist-info → mg_pso_gui-0.2.134.dist-info}/METADATA

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

{mg_pso_gui-0.2.132.dist-info → mg_pso_gui-0.2.134.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=9ePDTkI-bGt4gqT__fPKDuJZXDRyz3Kmr-FeVkf7DwU,25986
+mgpsogui/gui/HomePage.py,sha256=RVIQ2MlA1oF_VhhapitywWxHF156aoOt5FD_5eihB_0,25986
 mgpsogui/gui/OptionManager.py,sha256=jyxu8J6YtZ07D2M5L5uVx0fhfMbwYa3FGNIzd8f2Tio,24140
 mgpsogui/gui/OptionManager_backup.py,sha256=TCWfPnHL2foN5id47jsi267lamRG6yGU6y_M29eOOJk,18530
 mgpsogui/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -48,7 +48,7 @@ mgpsogui/gui/images/trash.png,sha256=j8cf0kWbJd-4Jp20lUVV1o1NSeQ4v1Ej4gfcIA3DVRQ
 mgpsogui/gui/images/up.png,sha256=AQvFWCUqSQNaQ1E6LKZ9zNfSvW6t4mgy8uswdg9T2Hg,2457
 mgpsogui/gui/messages/welcome.txt,sha256=fPuBbYcIso3p26vpyLBK0V7FPyk7JQDhyTnVClJFttc,5984
 mgpsogui/util/GraphGenerator.py,sha256=LHHDCvBuJQ0RYQm0azi5tC-etrZ1KLQh-tkahVurPSI,31990
-mgpsogui/util/PSORunner.py,sha256=G_s3lYpbvguPHyVERubPZHYik4G00t9NMtlRr8j-Rb4,15289
+mgpsogui/util/PSORunner.py,sha256=zOpWFmSVnKRIBAq1RE7Qtv-SNdA6KDy8nU6KQhEZs3I,15518
 mgpsogui/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/util/debug.py,sha256=Swzny9_1S-CCONWGssj9iDoSpbwu5Vr4f95g_9L8bec,19759
 mgpsogui/util/helpers.py,sha256=Ht2rge_4pGO7halz6KoLsL2eukB0k2tlkx68lBBmBA8,2669
@@ -73,8 +73,8 @@ mgpsogui/util/recosu/utils/trace_writer.py,sha256=V9BJlOjCbNYGoXGEk3CF5wjifBxvar
 mgpsogui/util/recosu/utils/utils.py,sha256=RFBY6r4D48VXqKV2jaP5kkJ3rpEe_9mpI2C-Gd0om-4,6447
 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.2.132.dist-info/METADATA,sha256=PPeS2quWnEe6wOhGUMbN4LwL6aQ6Ol-0Ceqx__S9G-0,9542
-mg_pso_gui-0.2.132.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-mg_pso_gui-0.2.132.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.2.132.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.2.132.dist-info/RECORD,,
+mg_pso_gui-0.2.134.dist-info/METADATA,sha256=JDQ1i2FYNpYxaP1WNJIju47WL3OEQaAw0aMpmrHt_1k,9542
+mg_pso_gui-0.2.134.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+mg_pso_gui-0.2.134.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.2.134.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.2.134.dist-info/RECORD,,

mgpsogui/gui/HomePage.py

@@ -116,7 +116,7 @@ class App(customtkinter.CTk):
 		self.running_loop_ticks = 1
 
 		# Configure window
-		version = "v0.2.132"
+		version = "v0.2.134"
 		self.title("COSU Manager (" + version + ")")
 
 		screen_width = self.winfo_screenwidth()

mgpsogui/util/PSORunner.py

@@ -73,12 +73,6 @@ def run_process(stdout_queue, stderr_queue, results_queue, data, folder, mode):
         else:
             print("Invalid mode")
 
-        stdout_thread.join()
-        stderr_thread.join()
-        
-        sys.stdout = old_stdout
-        sys.stderr = old_stderr
-
     except Exception as e:
         print("An exception occurred: ", flush=True)
         print(str(e))
@@ -91,13 +85,31 @@ def run_process(stdout_queue, stderr_queue, results_queue, data, folder, mode):
             f.write(str(e))
             f.write("\n")
             traceback.print_exc(file=f)
+
     finally:
-        stdout_thread.join()
-        stderr_thread.join()
-        
+        try:
+            stdout_thread.join()
+            stderr_thread.join()
+        except:
+            pass
+
         sys.stdout = old_stdout
         sys.stderr = old_stderr
 
+        try:
+            stdout_queue.close()
+            stdout_queue.join_thread()
+
+            stderr_queue.close()
+            stderr_queue.join_thread()
+
+            results_queue.close()
+            results_queue.join_thread()
+        except:
+            pass 
+
+        os._exit(0)
+
 def process_list(data, parameter_map, args, options, oh_strategy, config, metainfo, list_name):
     """_summary_
 
@@ -357,7 +369,7 @@ def run_optimization(data, folder, results_queue):
     
     results_queue.put(trace)
     print(trace, flush=True)
-    pass
+
 
 
 
@@ -371,7 +383,7 @@ def run_sensitivity_analysis(data, folder, results_queue):
     """
     print("Running Sensitivity Analysis", flush=True)
 
-    shutil.copyfile(data["sensitivity_analysis_path"], os.path.join(folder, 'results', 'trace.csv'))
+    shutil.copyfile(os.path.join(folder, 'results', data["sensitivity_analysis_path"]), os.path.join(folder, 'results', 'trace.csv'))
     trace_path = os.path.join(folder, 'results', 'trace.csv')
 
     output_steps = process_steps(data)