mg-pso-gui 0.1.54__py3-none-any.whl → 0.1.57__py3-none-any.whl

{mg_pso_gui-0.1.54.dist-info → mg_pso_gui-0.1.57.dist-info}/METADATA

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

{mg_pso_gui-0.1.54.dist-info → mg_pso_gui-0.1.57.dist-info}/RECORD

@@ -31,7 +31,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=tnpscm2pEE-ZK7fkfTNT-msKZ7AMzZ6ee7ZUVcmVeJI,14379
+mgpsogui/util/GraphGenerator.py,sha256=024tgb7Yk1Hy64lUbYX0jz437ghrHmCiivKGteXcwKg,15012
 mgpsogui/util/PSORunner.py,sha256=wfkrZLysgSS_5BrdFEm8U-0S7DHYpxmHPau_Ec5W8ak,4510
 mgpsogui/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/util/CTkToolTip/__init__.py,sha256=G1jxV55hGtGgwyC1sR-uUUdasDdh0XZgcI-aILgGYA0,225
@@ -45,8 +45,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.54.dist-info/METADATA,sha256=Ug1j1UdaEy0rWzjvanoTtpRIsW1JPOE_lsOve3sv8QU,9458
-mg_pso_gui-0.1.54.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-mg_pso_gui-0.1.54.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.1.54.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.1.54.dist-info/RECORD,,
+mg_pso_gui-0.1.57.dist-info/METADATA,sha256=Gpz6vlzpYBV0yVkgof4VzFNBl4MnHAxJwT8LXhfLMYM,9458
+mg_pso_gui-0.1.57.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+mg_pso_gui-0.1.57.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.1.57.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.1.57.dist-info/RECORD,,

mgpsogui/util/GraphGenerator.py

@@ -289,18 +289,23 @@ def custom_csv(homepage, option_manager):
     val = homepage.csv_y1_selector.get()
     val2 = homepage.csv_y2_selector.get()
     
+    data_start_index = 2
+    
     xx = None
     if x == "time":
-        xx = pd.to_datetime(data["time"], format='%Y-%m-%d', errors='coerce').iloc[2:]
+        xx = pd.to_datetime(data["time"], format='%Y-%m-%d', errors='coerce').iloc[data_start_index:]
+    elif x == "date":
+        data_start_index = 5
+        xx = pd.to_datetime(data["date"], format='%d-%m-%Y', errors='coerce').iloc[data_start_index:]
     else:
-        xx = pd.to_numeric(data[x], errors="coerce").iloc[2:]
+        xx = pd.to_numeric(data[x], errors="coerce").iloc[data_start_index:]
         
-    yy = pd.to_numeric(data[val], errors="coerce").iloc[2:]
+    yy = pd.to_numeric(data[val], errors="coerce").iloc[data_start_index:]
     
     #yy_unit = "N/A"
     yy_unit = data[val].iloc[1]
     
-    yy2 = pd.to_numeric(data[val2], errors="coerce").iloc[2:]
+    yy2 = pd.to_numeric(data[val2], errors="coerce").iloc[data_start_index:]
     
     #yy2_unit = "N/A"
     yy2_unit = data[val2].iloc[1]
@@ -358,26 +363,33 @@ def compare_csv(homepage, option_manager):
     val = homepage.csv_y1_selector.get()
     val2 = homepage.csv_y2_selector.get()
     
+    data_start_index = 2
+    data_start_index2 = 2
+    
     xx = None
     if x == "time":
-        xx = pd.to_datetime(data["time"], format='%Y-%m-%d', errors='coerce').iloc[2:]
+        xx = pd.to_datetime(data["time"], format='%Y-%m-%d', errors='coerce').iloc[data_start_index:]
+    elif x == "date":
+        data_start_index = 5
+        xx = pd.to_datetime(data["date"], format='%d-%m-%Y', errors='coerce').iloc[data_start_index:]
     else:
-        xx = pd.to_numeric(data[x], errors="coerce").iloc[2:]
+        xx = pd.to_numeric(data[x], errors="coerce").iloc[data_start_index:]
         
-    yy = pd.to_numeric(data[val], errors="coerce").iloc[2:]
+    yy = pd.to_numeric(data[val], errors="coerce").iloc[data_start_index:]
     
     xx2 = None
     if x == "time":
-        xx2 = pd.to_datetime(data2["time"], format='%Y-%m-%d', errors='coerce').iloc[2:]
+        xx2 = pd.to_datetime(data2["time"], format='%Y-%m-%d', errors='coerce').iloc[data_start_index2:]
+    elif x == "date":
+        data_start_index2 = 5
+        xx2 = pd.to_datetime(data2["date"], format='%d-%m-%Y', errors='coerce').iloc[data_start_index2:]
     else:
-        xx2 = pd.to_numeric(data2[x], errors="coerce").iloc[2:]
-        
-    yy = pd.to_numeric(data[val], errors="coerce").iloc[2:]
+        xx2 = pd.to_numeric(data2[x], errors="coerce").iloc[data_start_index2:]
     
     #yy_unit = "N/A"
     yy_unit = data[val].iloc[1]
     
-    yy2 = pd.to_numeric(data2[val2], errors="coerce").iloc[2:]
+    yy2 = pd.to_numeric(data2[val2], errors="coerce").iloc[data_start_index2:]
     
     #yy2_unit = "N/A"
     yy2_unit = data2[val2].iloc[1]