mg-pso-gui 0.1.132__tar.gz → 0.1.133__tar.gz

{mg-pso-gui-0.1.132 → mg-pso-gui-0.1.133}/PKG-INFO

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

{mg-pso-gui-0.1.132 → mg-pso-gui-0.1.133}/mg_pso_gui.egg-info/PKG-INFO

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

{mg-pso-gui-0.1.132 → mg-pso-gui-0.1.133}/mgpsogui/util/GraphGenerator.py

@@ -48,20 +48,14 @@ def generate_graphs(HomePage):
         print("Traceback:")
         traceback.print_exc()
 
-def best_cost_stacked(config, dataframe, option_manager):
+def best_cost_stacked(config, data, option_manager):
     fig = go.Figure()
         
     total_steps = len(config)
     
     # Get unique values from the round_step column of the dataframe
-    for iteration in dataframe['round_step'].unique():
-        # Get best_cost and completed rounds rows for this iteration
-        df = dataframe[dataframe['round_step'] == iteration]
-        
-        step_index = ((iteration) % total_steps)
-        round_index = ((iteration) // total_steps)
-        
-        fig.add_trace(go.Scatter(x=df['completed_rounds'], y=df['best_cost'], name='Round ' + str(round_index + 1) +  ' Group ' + str(step_index + 1)))
+    for round_step in data.keys():
+        fig.add_trace(go.Scatter(x=data[round_step]["percent"], y=data[round_step]["best_cost"], name=round_step))
 
     fig.update_layout(
         title="",
@@ -148,22 +142,28 @@ def table(config, dataframe, option_manager):
     
     return fig
 
-def best_cost_by_round(config, dataframe, option_manager):
+def best_cost_by_round(config, data, option_manager):
     fig = go.Figure()
         
     total_steps = len(config)
     
     # Get unique values from the round_step column of the dataframe
-    for iteration in dataframe['round_step'].unique():
+    for round_step in data.keys():
+    #for iteration in dataframe['round_step'].unique():
         # Get best_cost and completed rounds rows for this iteration
-        df = dataframe[dataframe['round_step'] == iteration]
+
+        round_index = int(round_step.split(" -")[0].replace("Round: ", "")) - 1
+
+        #df = dataframe[dataframe['round_step'] == iteration]
         
-        step_index = ((iteration) % total_steps)
-        round_index = ((iteration) // total_steps)
+        #step_index = ((iteration) % total_steps)
+        #round_index = ((iteration) // total_steps)
+
+        fig.add_trace(go.Scatter(x=np.array(data['percent']) + (100 * round_index), y=data['best_cost'], name=round_step))
         
-        fig.add_trace(go.Scatter(x=df['completed_rounds'] + (df['total_rounds'] * round_index), y=df['best_cost'], name='Group ' + str(step_index + 1)))
+        #fig.add_trace(go.Scatter(x=df['completed_rounds'] + (df['total_rounds'] * round_index), y=df['best_cost'], name='Group ' + str(step_index + 1)))
         
-        xx = np.max(df['completed_rounds']) + (np.max(df['total_rounds']) * round_index)
+        xx = np.max(np.array(data['percent']) + (100 * round_index))
         fig.add_shape(
             type='line',
             x0=xx,

{mg-pso-gui-0.1.132 → mg-pso-gui-0.1.133}/setup.py

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