mg-pso-gui 0.1.164__tar.gz → 0.1.166__tar.gz

{mg-pso-gui-0.1.164 → mg-pso-gui-0.1.166}/PKG-INFO

@@ -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 → mg-pso-gui-0.1.166}/mg_pso_gui.egg-info/PKG-INFO

@@ -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 → mg-pso-gui-0.1.166}/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'))

{mg-pso-gui-0.1.164 → mg-pso-gui-0.1.166}/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:

{mg-pso-gui-0.1.164 → mg-pso-gui-0.1.166}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import codecs
 import os
 
-VERSION = '0.1.164'
+VERSION = '0.1.166'
 DESCRIPTION = 'GUI for MG-PSO'
 LONG_DESCRIPTION = open('../README.md').read()