mg-pso-gui 0.1.206__py3-none-any.whl → 0.1.208__py3-none-any.whl

{mg_pso_gui-0.1.206.dist-info → mg_pso_gui-0.1.208.dist-info}/METADATA

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

{mg_pso_gui-0.1.206.dist-info → mg_pso_gui-0.1.208.dist-info}/RECORD

@@ -34,7 +34,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=Orr_OPne3GsE3StDtEbg87fK1Mu46k6iOBuHozXTjPg,24358
+mgpsogui/util/GraphGenerator.py,sha256=31JxeBlcwazCmchQomi8sTFP0AS2AhHurEN2QGSMZ6w,25798
 mgpsogui/util/PSORunner.py,sha256=ELpRgEpUiLV4hW-A-y4yzfkFN1BXgH7LZ0qlwWBRz3s,11012
 mgpsogui/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/util/debug.py,sha256=Swzny9_1S-CCONWGssj9iDoSpbwu5Vr4f95g_9L8bec,19759
@@ -60,8 +60,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.206.dist-info/METADATA,sha256=4Jxvwcq9y9U9ZjGGjdyMu1L0-iawM4i65WkwGPG_9Cg,9456
-mg_pso_gui-0.1.206.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
-mg_pso_gui-0.1.206.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.1.206.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.1.206.dist-info/RECORD,,
+mg_pso_gui-0.1.208.dist-info/METADATA,sha256=FE-5cXZia8Hh1SqZVXzzkctyeZUD5ymmiZ9_b-Jw7mU,9456
+mg_pso_gui-0.1.208.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
+mg_pso_gui-0.1.208.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.1.208.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.1.208.dist-info/RECORD,,

mgpsogui/util/GraphGenerator.py

@@ -7,6 +7,7 @@ import os
 from PIL import Image, ImageTk
 import customtkinter
 import traceback
+import math
 
 theme_background_color = {
     "Dark": 'rgba(42, 42, 42, 0)',
@@ -22,14 +23,14 @@ theme_background_color_html = {
 
 theme_plot_color = {
     "Dark": 'rgb(62, 62, 62)',
-    "Light": 'rgb(242, 242, 242)',
-    "Publication": 'rgb(242, 242, 242)'
+    "Light": 'rgba(245,245,255,255)',
+    "Publication": 'rgba(245,245,255,255)'
 }
 
 theme_grid_color = {
     "Dark": 'rgb(72, 72, 72)',
-    "Light": 'rgb(242, 242, 242)',
-    "Publication": 'rgb(242, 242, 242)'
+    "Light": 'rgb(255, 255, 255)',
+    "Publication": 'rgb(255, 255, 255)'
 }
 
 theme_line_color = {
@@ -44,6 +45,20 @@ theme_font_color = {
     "Publication": 'black'
 }
 
+theme_plot_color_pallet = [
+    "rgba(151, 209, 233, 255)", 
+    "rgba(0, 120, 179, 255)", 
+    "rgba(179, 223, 146, 255)", 
+    "rgba(49, 169, 90, 255)", 
+    "rgba(227, 136, 220, 255)", 
+    "rgba(127, 0, 255, 255)", 
+    "rgba(255, 128, 0, 255)",
+    "rgba(255, 99, 71, 255)",   
+    "rgba(102, 205, 170, 255)",
+    "rgba(255, 215, 0, 255)",
+    "rgba(70, 130, 180, 255)"
+]
+
 def generate_graphs(HomePage):
 
     try:
@@ -101,8 +116,10 @@ def best_cost_stacked(homepage, config, data, option_manager):
     total_steps = len(config)
     
     # Get unique values from the round_step column of the dataframe
+    pp = 0
     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.add_trace(go.Scatter(x=data[round_step]["percent"], y=data[round_step]["best_cost"], name=round_step, marker_color=theme_plot_color_pallet[pp]))
+        pp += 1
 
     fig.update_layout(
         title="",
@@ -198,6 +215,7 @@ def best_cost_by_round(homepage, config, data, option_manager):
         
     total_steps = len(config)
     
+    pp = 0
     # Get unique values from the round_step column of the dataframe
     for round_step in data.keys():
     #for iteration in dataframe['round_step'].unique():
@@ -210,8 +228,9 @@ def best_cost_by_round(homepage, config, data, option_manager):
         #step_index = ((iteration) % total_steps)
         #round_index = ((iteration) // total_steps)
 
-        fig.add_trace(go.Scatter(x=np.array(data[round_step]['percent']) + (100 * round_index), y=data[round_step]['best_cost'], name=round_step))
-        
+        fig.add_trace(go.Scatter(x=np.array(data[round_step]['percent']) + (100 * round_index), y=data[round_step]['best_cost'], name=round_step, marker_color=theme_plot_color_pallet[pp]))
+        pp += 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)))
         
         
@@ -298,12 +317,14 @@ def calibrated_params_by_round(homepage, config, list_of_objs, option_manager):
             round += 1
     
     # Get unique values from the round_step column of the dataframe
+    pp = 0
     for key in datalines.keys():
         # Get best_cost and completed rounds rows for this iteration
         if key == 'step' or key == 'round':
             continue
         
-        fig.add_trace(go.Scatter(x=datalines['round'], y=datalines[key], name=key))
+        fig.add_trace(go.Scatter(x=datalines['round'], y=datalines[key], name=key, marker_color=theme_plot_color_pallet[pp]))
+        pp += 1
 
     fig.update_layout(
         title="",
@@ -369,8 +390,8 @@ def custom_csv(homepage, option_manager):
     if "Unit" in homepage.csv_data["data_attributes"]:
         yy2_unit = homepage.csv_data["data_attributes"]["Unit"][val2]
 
-    fig.add_trace(go.Scatter(x=xx, y=yy, name=val))
-    fig.add_trace(go.Scatter(x=xx, y=yy2, name=val2, yaxis='y2'))
+    fig.add_trace(go.Scatter(x=xx, y=yy, name=val, marker_color=theme_plot_color_pallet[1]))
+    fig.add_trace(go.Scatter(x=xx, y=yy2, name=val2, yaxis='y2', marker_color=theme_plot_color_pallet[3]))
 
     fig.update_layout(
         title="",
@@ -452,8 +473,8 @@ def compare_csv(homepage, option_manager):
     if "Unit" in homepage.csv_data["data_attributes"]:
         yy2_unit = homepage.csv_data["data_attributes"]["Unit"][val2]
 
-    fig.add_trace(go.Scatter(x=xx, y=yy, name=val))
-    fig.add_trace(go.Scatter(x=xx2, y=yy2, name=val2, yaxis='y2'))
+    fig.add_trace(go.Scatter(x=xx, y=yy, name=val, marker_color=theme_plot_color_pallet[1]))
+    fig.add_trace(go.Scatter(x=xx2, y=yy2, name=val2, yaxis='y2', marker_color=theme_plot_color_pallet[3]))
 
     fig.update_layout(
         title="",
@@ -525,20 +546,20 @@ def sampling_csv(homepage, option_manager):
     yy2_unit = ""
 
     if (style == "Scatter"):
-        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'))
+        fig.add_trace(go.Scatter(x=xx, y=yy, name=val, mode='markers', marker_color=theme_plot_color_pallet[1]))
+        fig.add_trace(go.Scatter(x=xx, y=yy2, name=val2, yaxis='y2', mode='markers', marker_color=theme_plot_color_pallet[3]))
     elif (style == "Bars"):
-        fig.add_trace(go.Bar(x=xx, y=yy, name=val))
-        fig.add_trace(go.Bar(x=xx, y=yy2, name=val2, yaxis='y2'))
+        fig.add_trace(go.Bar(x=xx, y=yy, name=val, marker_color=theme_plot_color_pallet[1]))
+        fig.add_trace(go.Bar(x=xx, y=yy2, name=val2, yaxis='y2', marker_color=theme_plot_color_pallet[3]))
     elif (style == "Lines"):
-        fig.add_trace(go.Scatter(x=xx, y=yy, name=val))
-        fig.add_trace(go.Scatter(x=xx, y=yy2, name=val2, yaxis='y2'))
+        fig.add_trace(go.Scatter(x=xx, y=yy, name=val, marker_color=theme_plot_color_pallet[1]))
+        fig.add_trace(go.Scatter(x=xx, y=yy2, name=val2, yaxis='y2', marker_color=theme_plot_color_pallet[3]))
     elif (style == "Area"):
-        fig.add_trace(go.Scatter(x=xx, y=yy, name=val, fill='tozeroy'))
-        fig.add_trace(go.Scatter(x=xx, y=yy2, name=val2, yaxis='y2', fill='tozeroy'))
+        fig.add_trace(go.Scatter(x=xx, y=yy, name=val, fill='tozeroy', marker_color=theme_plot_color_pallet[1]))
+        fig.add_trace(go.Scatter(x=xx, y=yy2, name=val2, yaxis='y2', fill='tozeroy', marker_color=theme_plot_color_pallet[3]))
     elif (style == "Box"):
-        fig.add_trace(go.Box(x=xx, y=yy, name=val))
-        fig.add_trace(go.Box(x=xx, y=yy2, name=val2, yaxis='y2'))
+        fig.add_trace(go.Box(x=xx, y=yy, name=val, marker_color=theme_plot_color_pallet[1]))
+        fig.add_trace(go.Box(x=xx, y=yy2, name=val2, yaxis='y2', marker_color=theme_plot_color_pallet[3]))
 
     fig.update_layout(
         title="",
@@ -612,11 +633,14 @@ def matrix_editor(homepage, option_manager):
         figures_per_row = 3
     elif (total_figures == 7 or total_figures == 8):
         figures_per_row = 4
-    elif (total_figures == 9 or total_figures == 10):
-        figures_per_row = 5
+    elif (total_figures == 9):
+        figures_per_row = 3
+    else:
+        figures_per_row = 4
 
-    fig_combined = make_subplots(rows=(total_figures // figures_per_row), cols=figures_per_row, shared_xaxes=False, shared_yaxes=False)
+    fig_combined = make_subplots(rows=(math.ceil(total_figures / figures_per_row)), cols=figures_per_row, shared_xaxes=False, shared_yaxes=False)
 
+    pp = 0
     for parameter in figure_parameters:
         name = parameter['name'].get()
 
@@ -638,15 +662,17 @@ def matrix_editor(homepage, option_manager):
         yy_unit = ""
 
         if (style == "Scatter"):
-            fig.add_trace(go.Scatter(x=yy, y=xx, name=val, mode='markers'))
+            fig.add_trace(go.Scatter(x=yy, y=xx, name=val, mode='markers', marker_color=theme_plot_color_pallet[pp]))
         elif (style == "Bars"):
-            fig.add_trace(go.Bar(x=yy, y=xx, name=val))
+            fig.add_trace(go.Bar(x=yy, y=xx, name=val, marker_color=theme_plot_color_pallet[pp]))
         elif (style == "Lines"):
-            fig.add_trace(go.Scatter(x=yy, y=xx, name=val))
+            fig.add_trace(go.Scatter(x=yy, y=xx, name=val, marker_color=theme_plot_color_pallet[pp]))
         elif (style == "Area"):
-            fig.add_trace(go.Scatter(x=yy, y=xx, name=val, fill='tozeroy'))
+            fig.add_trace(go.Scatter(x=yy, y=xx, name=val, fill='tozeroy', marker_color=theme_plot_color_pallet[pp]))
         elif (style == "Box"):
-            fig.add_trace(go.Box(x=yy, y=xx, name=val))
+            fig.add_trace(go.Box(x=yy, y=xx, name=val, marker_color=theme_plot_color_pallet[pp]))
+        
+        pp += 1
 
         fig.update_layout(
             title="",