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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: mg-pso-gui
3
- Version: 0.2.132
3
+ Version: 0.2.134
4
4
  Summary: GUI for MG-PSO
5
5
  Author: Robert Cordingly
6
6
  Author-email: <rcording@uw.ed>
@@ -1,7 +1,7 @@
1
1
  mgpsogui/__init__.py,sha256=q7AfBjeJABnFtbsZnsObpUwaXKPDVYtz46G6MKXLF74,42
2
2
  mgpsogui/mgpsogui.py,sha256=NIZmyNcbwC8EgSwf1ubdMUSJscrIEgoD4jLYziqHQ-k,148
3
3
  mgpsogui/start.yaml,sha256=ZjCVLb-MLqAxrGRm9kA7_SDpa-45EuKIELNQ2QqCAiU,4713
4
- mgpsogui/gui/HomePage.py,sha256=9ePDTkI-bGt4gqT__fPKDuJZXDRyz3Kmr-FeVkf7DwU,25986
4
+ mgpsogui/gui/HomePage.py,sha256=RVIQ2MlA1oF_VhhapitywWxHF156aoOt5FD_5eihB_0,25986
5
5
  mgpsogui/gui/OptionManager.py,sha256=jyxu8J6YtZ07D2M5L5uVx0fhfMbwYa3FGNIzd8f2Tio,24140
6
6
  mgpsogui/gui/OptionManager_backup.py,sha256=TCWfPnHL2foN5id47jsi267lamRG6yGU6y_M29eOOJk,18530
7
7
  mgpsogui/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -48,7 +48,7 @@ mgpsogui/gui/images/trash.png,sha256=j8cf0kWbJd-4Jp20lUVV1o1NSeQ4v1Ej4gfcIA3DVRQ
48
48
  mgpsogui/gui/images/up.png,sha256=AQvFWCUqSQNaQ1E6LKZ9zNfSvW6t4mgy8uswdg9T2Hg,2457
49
49
  mgpsogui/gui/messages/welcome.txt,sha256=fPuBbYcIso3p26vpyLBK0V7FPyk7JQDhyTnVClJFttc,5984
50
50
  mgpsogui/util/GraphGenerator.py,sha256=LHHDCvBuJQ0RYQm0azi5tC-etrZ1KLQh-tkahVurPSI,31990
51
- mgpsogui/util/PSORunner.py,sha256=G_s3lYpbvguPHyVERubPZHYik4G00t9NMtlRr8j-Rb4,15289
51
+ mgpsogui/util/PSORunner.py,sha256=zOpWFmSVnKRIBAq1RE7Qtv-SNdA6KDy8nU6KQhEZs3I,15518
52
52
  mgpsogui/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
53
53
  mgpsogui/util/debug.py,sha256=Swzny9_1S-CCONWGssj9iDoSpbwu5Vr4f95g_9L8bec,19759
54
54
  mgpsogui/util/helpers.py,sha256=Ht2rge_4pGO7halz6KoLsL2eukB0k2tlkx68lBBmBA8,2669
@@ -73,8 +73,8 @@ mgpsogui/util/recosu/utils/trace_writer.py,sha256=V9BJlOjCbNYGoXGEk3CF5wjifBxvar
73
73
  mgpsogui/util/recosu/utils/utils.py,sha256=RFBY6r4D48VXqKV2jaP5kkJ3rpEe_9mpI2C-Gd0om-4,6447
74
74
  mgpsogui/util/recosu/utils/plot/__init__.py,sha256=h1KjM7_tNDv351pcwt8A6Ibb1jhwWyx5Gbu-zj-sI3Q,71
75
75
  mgpsogui/util/recosu/utils/plot/cost_steps.py,sha256=1Ce11AJyweWkmvjXPxEygzS-h8yVLmQEDLS53yjPLqQ,3779
76
- mg_pso_gui-0.2.132.dist-info/METADATA,sha256=PPeS2quWnEe6wOhGUMbN4LwL6aQ6Ol-0Ceqx__S9G-0,9542
77
- mg_pso_gui-0.2.132.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
78
- mg_pso_gui-0.2.132.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
79
- mg_pso_gui-0.2.132.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
80
- mg_pso_gui-0.2.132.dist-info/RECORD,,
76
+ mg_pso_gui-0.2.134.dist-info/METADATA,sha256=JDQ1i2FYNpYxaP1WNJIju47WL3OEQaAw0aMpmrHt_1k,9542
77
+ mg_pso_gui-0.2.134.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
78
+ mg_pso_gui-0.2.134.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
79
+ mg_pso_gui-0.2.134.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
80
+ mg_pso_gui-0.2.134.dist-info/RECORD,,
mgpsogui/gui/HomePage.py CHANGED
@@ -116,7 +116,7 @@ class App(customtkinter.CTk):
116
116
  self.running_loop_ticks = 1
117
117
 
118
118
  # Configure window
119
- version = "v0.2.132"
119
+ version = "v0.2.134"
120
120
  self.title("COSU Manager (" + version + ")")
121
121
 
122
122
  screen_width = self.winfo_screenwidth()
@@ -73,12 +73,6 @@ def run_process(stdout_queue, stderr_queue, results_queue, data, folder, mode):
73
73
  else:
74
74
  print("Invalid mode")
75
75
 
76
- stdout_thread.join()
77
- stderr_thread.join()
78
-
79
- sys.stdout = old_stdout
80
- sys.stderr = old_stderr
81
-
82
76
  except Exception as e:
83
77
  print("An exception occurred: ", flush=True)
84
78
  print(str(e))
@@ -91,13 +85,31 @@ def run_process(stdout_queue, stderr_queue, results_queue, data, folder, mode):
91
85
  f.write(str(e))
92
86
  f.write("\n")
93
87
  traceback.print_exc(file=f)
88
+
94
89
  finally:
95
- stdout_thread.join()
96
- stderr_thread.join()
97
-
90
+ try:
91
+ stdout_thread.join()
92
+ stderr_thread.join()
93
+ except:
94
+ pass
95
+
98
96
  sys.stdout = old_stdout
99
97
  sys.stderr = old_stderr
100
98
 
99
+ try:
100
+ stdout_queue.close()
101
+ stdout_queue.join_thread()
102
+
103
+ stderr_queue.close()
104
+ stderr_queue.join_thread()
105
+
106
+ results_queue.close()
107
+ results_queue.join_thread()
108
+ except:
109
+ pass
110
+
111
+ os._exit(0)
112
+
101
113
  def process_list(data, parameter_map, args, options, oh_strategy, config, metainfo, list_name):
102
114
  """_summary_
103
115
 
@@ -357,7 +369,7 @@ def run_optimization(data, folder, results_queue):
357
369
 
358
370
  results_queue.put(trace)
359
371
  print(trace, flush=True)
360
- pass
372
+
361
373
 
362
374
 
363
375
 
@@ -371,7 +383,7 @@ def run_sensitivity_analysis(data, folder, results_queue):
371
383
  """
372
384
  print("Running Sensitivity Analysis", flush=True)
373
385
 
374
- shutil.copyfile(data["sensitivity_analysis_path"], os.path.join(folder, 'results', 'trace.csv'))
386
+ shutil.copyfile(os.path.join(folder, 'results', data["sensitivity_analysis_path"]), os.path.join(folder, 'results', 'trace.csv'))
375
387
  trace_path = os.path.join(folder, 'results', 'trace.csv')
376
388
 
377
389
  output_steps = process_steps(data)