mg-pso-gui 0.1.77__tar.gz → 0.1.79__tar.gz

{mg-pso-gui-0.1.77 → mg-pso-gui-0.1.79}/PKG-INFO

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

{mg-pso-gui-0.1.77 → mg-pso-gui-0.1.79}/mg_pso_gui.egg-info/PKG-INFO

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

{mg-pso-gui-0.1.77 → mg-pso-gui-0.1.79}/mgpsogui/gui/VisualizeTab/SideBar.py

@@ -40,20 +40,21 @@ class SideBar(CTkScrollableFrame):
         selected_graph = self.home_page.graph_selector_value.get()
         
         if (selected_graph == "Best Cost Stacked"):
-            self.graph_label = CTkLabel(self.containerFrame, text="Best Cost Stacked")
-            self.graph_label.grid(row=0, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")
+            #self.graph_label = CTkLabel(self.containerFrame, text="Best Cost Stacked")
+            #self.graph_label.grid(row=0, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")
             pass
         elif (selected_graph == "Best Cost by Round"):
-            self.graph_label = CTkLabel(self.containerFrame, text="Best Cost by Round")
-            self.graph_label.grid(row=0, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")
+            #self.graph_label = CTkLabel(self.containerFrame, text="Best Cost by Round")
+            #self.graph_label.grid(row=0, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")
             pass
         elif (selected_graph == "Iteration Table"):
-            self.graph_label = CTkLabel(self.containerFrame, text="Iteration Table")
-            self.graph_label.grid(row=0, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")
+            #self.graph_label = CTkLabel(self.containerFrame, text="Iteration Table")
+            #self.graph_label.grid(row=0, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")
             pass
         elif (selected_graph == "Calibrated Parameters"):
-            self.graph_label = CTkLabel(self.containerFrame, text="Calibrated Parameters")
-            self.graph_label.grid(row=0, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")
+            #self.graph_label = CTkLabel(self.containerFrame, text="Calibrated Parameters")
+            #self.graph_label.grid(row=0, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")
+            pass
         elif (selected_graph == "Custom CSV"):
             
             info = self.option_manager.get_project_data()

{mg-pso-gui-0.1.77 → mg-pso-gui-0.1.79}/mgpsogui/util/PSORunner.py

@@ -87,7 +87,8 @@ def run_process(stdout_queue, stderr_queue, results_queue, cosu_queue, data, fol
                 'async_call': True if calibration_map['async_call'] == "True" else False,
                 'http_conn_timeout': int(calibration_map['conn_timeout']),
                 'http_read_timeout': int(calibration_map['read_timeout']),
-                'particles_fail': int(calibration_map['particles_fail'])
+                'particles_fail': int(calibration_map['particles_fail']),
+                'step_trace': "./trace.json"
                 },
             result_queue = cosu_queue
         )

{mg-pso-gui-0.1.77 → mg-pso-gui-0.1.79}/mgpsogui/util/recosu/pso/pso.py

@@ -336,4 +336,7 @@ def global_best(steps: Dict, rounds: Tuple, args: Dict, n_particles: int, iters:
         with open(step_file, "w") as fo:
             json.dump(step_trace, fo)
 
+    result_queue.put("Step Trace")
+    result_queue.put(step_trace)
+
     return optimizer, step_trace

{mg-pso-gui-0.1.77 → mg-pso-gui-0.1.79}/setup.py

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