mg-pso-gui 0.1.164__py3-none-any.whl → 0.1.166__py3-none-any.whl

{mg_pso_gui-0.1.164.dist-info → mg_pso_gui-0.1.166.dist-info}/METADATA

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

{mg_pso_gui-0.1.164.dist-info → mg_pso_gui-0.1.166.dist-info}/RECORD

@@ -32,8 +32,8 @@ mgpsogui/gui/images/stop.png,sha256=JPuxXQerCGpLikcp7cAj3iLCOjULMYYZ2sZe0lArh68,
 mgpsogui/gui/images/test.png,sha256=MUnVpRK-isxhEHzx4Q6Yh0M6FRZD1qvgCHH2XmiSBbk,3642
 mgpsogui/gui/images/trash.png,sha256=j8cf0kWbJd-4Jp20lUVV1o1NSeQ4v1Ej4gfcIA3DVRQ,2958
 mgpsogui/gui/images/up.png,sha256=AQvFWCUqSQNaQ1E6LKZ9zNfSvW6t4mgy8uswdg9T2Hg,2457
-mgpsogui/util/GraphGenerator.py,sha256=-TF2N2JbUDA3cnypsQdyH-HSdJAWE1E0_8PPXh6Q-Jg,17281
-mgpsogui/util/PSORunner.py,sha256=Bk6IXsBKSB33uccTJX7xagYwXHLgUbvpcM5qoi1MXHo,6170
+mgpsogui/util/GraphGenerator.py,sha256=q4Iy0cnGeP1coqU1CajzJHMppha_hC-cFX56_gEwA84,17279
+mgpsogui/util/PSORunner.py,sha256=sWgickFGl97p3ybWz97LR5qeYhnNqryKx5nWAa-NhwA,6306
 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
@@ -58,8 +58,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.164.dist-info/METADATA,sha256=gl3Ikc5yx-S4QY8t37ztHZxVM3UhQbcP3tof_rZ0Bw0,9460
-mg_pso_gui-0.1.164.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-mg_pso_gui-0.1.164.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.1.164.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.1.164.dist-info/RECORD,,
+mg_pso_gui-0.1.166.dist-info/METADATA,sha256=hE-sYExHfr-FAg2910a6uU45x5qjPoxPXQzx9afamCc,9460
+mg_pso_gui-0.1.166.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+mg_pso_gui-0.1.166.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.1.166.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.1.166.dist-info/RECORD,,

mgpsogui/util/GraphGenerator.py

@@ -460,11 +460,11 @@ def sampling_csv(homepage, option_manager):
         
     yy = pd.to_numeric(data[val], errors="coerce")
     
-    yy_unit = "-"
+    yy_unit = ""
     
     yy2 = pd.to_numeric(data[val2], errors="coerce")
     
-    yy2_unit = "-"
+    yy2_unit = ""
 
     fig.add_trace(go.Scatter(x=xx, y=yy, name=val, mode='markers'))
     fig.add_trace(go.Scatter(x=xx, y=yy2, name=val2, yaxis='y2', mode='markers'))

mgpsogui/util/PSORunner.py

@@ -33,6 +33,9 @@ def run_process(stdout_queue, stderr_queue, results_queue, data, folder):
     if not os.path.exists(folder):
         os.makedirs(folder)
 
+    if not os.path.exists(os.path.join(folder, "results")):
+        os.makedirs(os.path.join(folder, "results"))
+
     if (os.path.exists(os.path.join(folder, 'output.txt'))):
         os.remove(os.path.join(folder, 'output.txt'))
         
@@ -112,7 +115,7 @@ def run_process(stdout_queue, stderr_queue, results_queue, data, folder):
                                 int(calibration_map['num_threads']), 
                                 "halton", 
                                 conf=config, 
-                                trace_file=os.path.join(folder, 'halton_trace.txt'),
+                                trace_file=os.path.join(folder, 'results', 'halton_trace.csv'),
                                 offset=int(calibration_map['offset']))
             results_queue.put(trace)
             print(trace, flush=True)
@@ -125,7 +128,7 @@ def run_process(stdout_queue, stderr_queue, results_queue, data, folder):
                     int(calibration_map['num_threads']), 
                     "random", 
                     conf=config, 
-                    trace_file=os.path.join(folder, 'random_trace.txt'))
+                    trace_file=os.path.join(folder, 'results', 'random_trace.csv'))
             results_queue.put(trace)
             print(trace, flush=True)
         else: