mg-pso-gui 0.1.131__py3-none-any.whl → 0.1.133__py3-none-any.whl

{mg_pso_gui-0.1.131.dist-info → mg_pso_gui-0.1.133.dist-info}/METADATA

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

{mg_pso_gui-0.1.131.dist-info → mg_pso_gui-0.1.133.dist-info}/RECORD

@@ -1,7 +1,7 @@
 mgpsogui/__init__.py,sha256=q7AfBjeJABnFtbsZnsObpUwaXKPDVYtz46G6MKXLF74,42
 mgpsogui/mgpsogui.py,sha256=NIZmyNcbwC8EgSwf1ubdMUSJscrIEgoD4jLYziqHQ-k,148
 mgpsogui/start.yaml,sha256=ZjCVLb-MLqAxrGRm9kA7_SDpa-45EuKIELNQ2QqCAiU,4713
-mgpsogui/gui/HomePage.py,sha256=IRL_lA5J0QCX2LZvxcIt8A4ck9yYZym0mA9NPb9E-iE,23317
+mgpsogui/gui/HomePage.py,sha256=ZX-RfsT0TaklnRmfKnqdhuPsYM-QpVv6ZrtkJh47_zg,23352
 mgpsogui/gui/OptionManager.py,sha256=36_MlFd6nLt6xd6HHE2sHtL8oW7VBOZbCvJ8er-wWJ4,12544
 mgpsogui/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/PlatformTab/PlatformTab.py,sha256=KyIoHlMKD9nfQqHeGJwRDA4RCoe4UykjB2l6xMTKK_M,10486
@@ -32,7 +32,7 @@ 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=HhUsFUFhCv3wTYV8CTqU0wo56Ph9c1DocPj25AVIAdI,15076
+mgpsogui/util/GraphGenerator.py,sha256=yaVb_oxo5vR-UhrydiHPkRFdiklVNcgtnndE1BJ54hw,14987
 mgpsogui/util/PSORunner.py,sha256=YmzsZbbTH8axrwJYq7ypCiOeMW4w4dnoLquv1mSGKSU,5729
 mgpsogui/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/util/debug.py,sha256=Swzny9_1S-CCONWGssj9iDoSpbwu5Vr4f95g_9L8bec,19759
@@ -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.131.dist-info/METADATA,sha256=Cuco2yRQJdqdblA2CKpxzfA7-ofp27uS6w-qwnsO0gQ,9460
-mg_pso_gui-0.1.131.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-mg_pso_gui-0.1.131.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.1.131.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.1.131.dist-info/RECORD,,
+mg_pso_gui-0.1.133.dist-info/METADATA,sha256=xt7m13uQiOZu9o5KFV_iWdAjE0JhgVWTY3ny9ZfcwTM,9460
+mg_pso_gui-0.1.133.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+mg_pso_gui-0.1.133.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.1.133.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.1.133.dist-info/RECORD,,

mgpsogui/gui/HomePage.py

@@ -544,6 +544,7 @@ class App(customtkinter.CTk):
 
 			data = hp.parse_pso_error(os.path.join(folder, 'error.txt'), len(self.option_manager.get_steps()))
 			self.progress_data = data["data"]
+			self.footer_progress_bar.stop()
 			self.footer_progress_bar.configure(mode="determinate")
 			self.footer_progress_bar.set(data["percent"]/100)
 			#self.progress_message_left.configure(text="Percent Complete: " + str(round(data["percent"])) + "%")

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,