mg-pso-gui 0.1.202__py3-none-any.whl → 0.1.204__py3-none-any.whl

{mg_pso_gui-0.1.202.dist-info → mg_pso_gui-0.1.204.dist-info}/METADATA

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

{mg_pso_gui-0.1.202.dist-info → mg_pso_gui-0.1.204.dist-info}/RECORD

@@ -35,7 +35,7 @@ mgpsogui/gui/images/test.png,sha256=MUnVpRK-isxhEHzx4Q6Yh0M6FRZD1qvgCHH2XmiSBbk,
 mgpsogui/gui/images/trash.png,sha256=j8cf0kWbJd-4Jp20lUVV1o1NSeQ4v1Ej4gfcIA3DVRQ,2958
 mgpsogui/gui/images/up.png,sha256=AQvFWCUqSQNaQ1E6LKZ9zNfSvW6t4mgy8uswdg9T2Hg,2457
 mgpsogui/util/GraphGenerator.py,sha256=OyCPwIDkbRzNZiJQII3F76yTKj_EdeMiE8vaih-n5lE,22811
-mgpsogui/util/PSORunner.py,sha256=H0LtHxWqnIipKO0FvrPewIjvIde4Ma3hZAtVbxGc7PI,10275
+mgpsogui/util/PSORunner.py,sha256=ELpRgEpUiLV4hW-A-y4yzfkFN1BXgH7LZ0qlwWBRz3s,11012
 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
@@ -60,8 +60,8 @@ mgpsogui/util/recosu/utils/trace_writer.py,sha256=V9BJlOjCbNYGoXGEk3CF5wjifBxvar
 mgpsogui/util/recosu/utils/utils.py,sha256=QB8vftq3142ekG0ORjz0ZBHU5YknXbR0oTsrxrPAsF0,3951
 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.1.202.dist-info/METADATA,sha256=36m7jWxHdHEdinpJYGkU_MrkxQvL2eFh_eLkkX5G6m8,9456
-mg_pso_gui-0.1.202.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
-mg_pso_gui-0.1.202.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.1.202.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.1.202.dist-info/RECORD,,
+mg_pso_gui-0.1.204.dist-info/METADATA,sha256=tdWt8lx-iN5HvTlUc5fXK6YG-19LCCGsH_ES9YttD4Q,9456
+mg_pso_gui-0.1.204.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
+mg_pso_gui-0.1.204.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.1.204.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.1.204.dist-info/RECORD,,

mgpsogui/util/PSORunner.py

@@ -11,6 +11,7 @@ from csip import Client
 import traceback
 import urllib
 import shutil
+import json
 
 def enqueue_output(out, queue):
     for line in iter(out.readline, b''):
@@ -123,6 +124,7 @@ def run_process(stdout_queue, stderr_queue, results_queue, data, folder):
                                 offset=int(calibration_map['offset']))
             results_queue.put(trace)
             print(trace, flush=True)
+            print("\n", flush=True)
             
         elif my_mode == "Sampling: Random":
             print("Running Random Sampling...\n", flush=True)
@@ -135,7 +137,12 @@ def run_process(stdout_queue, stderr_queue, results_queue, data, folder):
                     trace_file=os.path.join(folder, 'results', 'random_trace.csv'))
             results_queue.put(trace)
             print(trace, flush=True)
+            print("\n", flush=True)
+
         elif my_mode == "Sensitivity: Halton":
+            
+            print("Running Halton Sensitivity Analysis", flush=True)
+
             shutil.copyfile(os.path.join(folder, 'results', 'halton_trace.csv'), os.path.join(folder, 'results', 'trace.csv'))
             trace_path = os.path.join(folder, 'results', 'trace.csv')
 
@@ -166,13 +173,23 @@ def run_process(stdout_queue, stderr_queue, results_queue, data, folder):
                     }
                 ]
             }
-            # Write the request to a file
-            with open(os.path.join(folder, 'results', 'request.json'), 'w') as f:
-                f.write(str(request_json))
+            
+            with open(os.path.join(folder, 'results', 'request.json'), 'w') as json_file:
+                json.dump(request_json, json_file, indent=4)
+            
             request_path = os.path.join(folder, 'results', 'request.json')
 
-            sensitivity_analysis(args['url'], request_path, trace_path, folder)
+            output_directory = os.path.join(folder, 'results')
+
+            print("Starting ", args['url'], request_path, trace_path, output_directory, flush=True)
+
+            sensitivity_analysis(args['url'], request_path, trace_path, output_directory)
+
+            print("Finished Sensitivity Analysis", flush=True)
         elif my_mode == "Sensitivity: Random":
+            
+            print("Running Random Sensitivity Analysis", flush=True)
+
             shutil.copyfile(os.path.join(folder, 'results', 'random_trace.csv'), os.path.join(folder, 'results', 'trace.csv'))
             trace_path = os.path.join(folder, 'results', 'trace.csv')
             
@@ -203,12 +220,19 @@ def run_process(stdout_queue, stderr_queue, results_queue, data, folder):
                     }
                 ]
             }
-            # Write the request to a file
-            with open(os.path.join(folder, 'results', 'request.json'), 'w') as f:
-                f.write(str(request_json))
+            
+            with open(os.path.join(folder, 'results', 'request.json'), 'w') as json_file:
+                json.dump(request_json, json_file, indent=4)
+
             request_path = os.path.join(folder, 'results', 'request.json')
 
-            sensitivity_analysis(args['url'], request_path, trace_path, folder)
+            output_directory = os.path.join(folder, 'results')
+
+            print("Starting ", args['url'], request_path, trace_path, output_directory, flush=True)
+
+            sensitivity_analysis(args['url'], request_path, trace_path, output_directory)
+
+            print("Finished Sensitivity Analysis", flush=True)
         else:
             print("Running MG-PSO Optimization...\n", flush=True)
             optimizer, trace = global_best(steps,