mg-pso-gui 0.1.66__tar.gz → 0.1.67__tar.gz

{mg-pso-gui-0.1.66 → mg-pso-gui-0.1.67}/PKG-INFO

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

{mg-pso-gui-0.1.66 → mg-pso-gui-0.1.67}/mg_pso_gui.egg-info/PKG-INFO

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

{mg-pso-gui-0.1.66 → mg-pso-gui-0.1.67}/mgpsogui/gui/VisualizeTab/SideBar.py

@@ -85,15 +85,12 @@ class SideBar(CTkScrollableFrame):
             
             selected_file = self.home_page.selected_csv.get()
             if (selected_file in path_map and selected_file != self.home_page.open_file):
-                self.home_page.csv_data = pd.read_csv(path_map[selected_file], skiprows=3)
-                if (self.home_page.csv_data.columns[0] != "@H"):
-                    self.home_page.csv_data = pd.read_csv(path_map[selected_file], skiprows=9)
-                
+                self.home_page.csv_data = self.load_csv(path_map[selected_file])
                 self.home_page.open_file = selected_file
                 
             if (self.home_page.csv_data is not None):
                 # Get all column names of CSV
-                columns = self.home_page.csv_data.columns
+                columns = self.home_page.csv_data["data"].columns
                 
                 x_axis_label = CTkLabel(self.containerFrame, text="X Axis:")
                 x_axis_label.grid(row=2, column=0, padx=(20, 20), pady=(40, 5), sticky="w")
@@ -157,22 +154,18 @@ class SideBar(CTkScrollableFrame):
             
             selected_file = self.home_page.selected_csv.get()
             if (selected_file in path_map and selected_file != self.home_page.open_file):
-                self.home_page.csv_data = pd.read_csv(path_map[selected_file], skiprows=3)
-                if (self.home_page.csv_data.columns[0] != "@H"):
-                    self.home_page.csv_data = pd.read_csv(path_map[selected_file], skiprows=9)
+                self.home_page.csv_data = self.load_csv(path_map[selected_file])
                 self.home_page.open_file = selected_file
                 
             selected_file2 = self.home_page.selected_csv2.get()
             if (selected_file2 in path_map and selected_file2 != self.home_page.open_file2):
-                self.home_page.csv_data2 = pd.read_csv(path_map[selected_file2], skiprows=3)
-                if (self.home_page.csv_data2.columns[0] != "@H"):
-                    self.home_page.csv_data2 = pd.read_csv(path_map[selected_file2], skiprows=9)
+                self.home_page.csv_data2 = self.load_csv(path_map[selected_file])
                 self.home_page.open_file2 = selected_file2
                 
             if (self.home_page.csv_data is not None and self.home_page.csv_data2 is not None):
                 # Get all column names of CSV
-                columns = self.home_page.csv_data.columns
-                columns2 = self.home_page.csv_data2.columns
+                columns = self.home_page.csv_data["data"].columns
+                columns2 = self.home_page.csv_data2["data"].columns
                 
                 x_axis_label = CTkLabel(self.containerFrame, text="X Axis:")
                 x_axis_label.grid(row=3, column=0, padx=(20, 20), pady=(40, 5), sticky="w")
@@ -199,4 +192,60 @@ class SideBar(CTkScrollableFrame):
                 self.home_page.csv_y2_selector.grid(row=8, column=0, padx=(20, 20), pady=(5, 5), sticky="ew")
                 
                 if (self.home_page.csv_y2_selector.get() not in columns2):
-                    self.home_page.csv_y2_selector.set(columns2[2])
+                    self.home_page.csv_y2_selector.set(columns2[2])
+                    
+                    
+
+    def load_csv(file_path):
+        file_metadata = {}
+        data_metadata = {}
+        mode = "file_metadata"
+        columns = []
+        data_lines = []
+        
+        with open(file_path, "r") as file:
+            lines = file.readlines()
+            
+            for line in lines:
+                if (line.startswith("@H,")):
+                    mode = "data_metadata"
+                    columns = line.strip().rstrip(",").split(",")[1:]
+                    continue
+                elif (line.startswith("@T,")):
+                    mode = "file_metadata"
+                    continue
+                elif (line.startswith(",") and mode == "data_metadata"):
+                    mode = "file_data"
+                    
+                if (mode == "file_metadata"):
+                    try:
+                        key, value = line.strip().rstrip(",").split(",")
+                        file_metadata[key] = value
+                    except:
+                        pass
+                    
+                elif (mode == "data_metadata"):
+                    try:
+                        values = line.strip().rstrip(",").split(",")
+                        key = values[0]
+                        values = values[1:]
+                        if len(values) == len(columns):
+                            data_metadata[key] = {}
+                            for i in range(len(columns)):
+                                data_metadata[key][columns[i]] = values[i]
+                    except:
+                        pass
+                    
+                elif (mode == "file_data"):
+                    try:
+                        values = line.strip().rstrip(",").split(",")[1:]
+                        if len(values) == len(columns):
+                            data_lines.append(values)
+                    except:
+                        pass
+                        
+        return {
+            "file_attributes": file_metadata,
+            "data_attributes": data_metadata,
+            "data": pd.DataFrame(data_lines, columns=columns)
+        }

{mg-pso-gui-0.1.66 → mg-pso-gui-0.1.67}/mgpsogui/util/GraphGenerator.py

@@ -283,32 +283,27 @@ def calibrated_params_by_round(config, list_of_objs, option_manager):
 def custom_csv(homepage, option_manager):
     fig = go.Figure()
 
-    data = homepage.csv_data
+    data = homepage.csv_data["data"]
 
     x = homepage.csv_x_selector.get()
     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[data_start_index:]
+        xx = pd.to_datetime(data["time"], format='%Y-%m-%d', errors='coerce')
     elif x == "date":
-        data_start_index = 5
-        xx = pd.to_datetime(data["date"], format='%d-%m-%Y', errors='coerce').iloc[data_start_index:]
+        xx = pd.to_datetime(data["date"], format='%d-%m-%Y', errors='coerce')
     else:
-        xx = pd.to_numeric(data[x], errors="coerce").iloc[data_start_index:]
+        xx = pd.to_numeric(data[x], errors="coerce")
         
-    yy = pd.to_numeric(data[val], errors="coerce").iloc[data_start_index:]
+    yy = pd.to_numeric(data[val], errors="coerce")
     
-    #yy_unit = "N/A"
-    yy_unit = data[val].iloc[1]
+    yy_unit = homepage.csv_data["data_attributes"]["Unit"][val]
     
-    yy2 = pd.to_numeric(data[val2], errors="coerce").iloc[data_start_index:]
+    yy2 = pd.to_numeric(data[val2], errors="coerce")
     
-    #yy2_unit = "N/A"
-    yy2_unit = data[val2].iloc[1]
+    yy2_unit = homepage.csv_data2["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'))
@@ -356,43 +351,36 @@ def custom_csv(homepage, option_manager):
 def compare_csv(homepage, option_manager):
     fig = go.Figure()
 
-    data = homepage.csv_data
-    data2 = homepage.csv_data2
+    data = homepage.csv_data["data"]
+    data2 = homepage.csv_data2["data"]
 
     x = homepage.csv_x_selector.get()
     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[data_start_index:]
+        xx = pd.to_datetime(data["time"], format='%Y-%m-%d', errors='coerce')
     elif x == "date":
-        data_start_index = 5
-        xx = pd.to_datetime(data["date"], format='%d-%m-%Y', errors='coerce').iloc[data_start_index:]
+        xx = pd.to_datetime(data["date"], format='%d-%m-%Y', errors='coerce')
     else:
-        xx = pd.to_numeric(data[x], errors="coerce").iloc[data_start_index:]
+        xx = pd.to_numeric(data[x], errors="coerce")
         
-    yy = pd.to_numeric(data[val], errors="coerce").iloc[data_start_index:]
+    yy = pd.to_numeric(data[val], errors="coerce")
     
     xx2 = None
     if x == "time":
-        xx2 = pd.to_datetime(data2["time"], format='%Y-%m-%d', errors='coerce').iloc[data_start_index2:]
+        xx2 = pd.to_datetime(data2["time"], format='%Y-%m-%d', errors='coerce')
     elif x == "date":
         data_start_index2 = 5
-        xx2 = pd.to_datetime(data2["date"], format='%d-%m-%Y', errors='coerce').iloc[data_start_index2:]
+        xx2 = pd.to_datetime(data2["date"], format='%d-%m-%Y', errors='coerce')
     else:
-        xx2 = pd.to_numeric(data2[x], errors="coerce").iloc[data_start_index2:]
-    
-    #yy_unit = "N/A"
-    yy_unit = data[val].iloc[1]
+        xx2 = pd.to_numeric(data2[x], errors="coerce")
     
-    yy2 = pd.to_numeric(data2[val2], errors="coerce").iloc[data_start_index2:]
+    yy_unit = homepage.csv_data["data_attributes"]["Unit"][val]
     
-    #yy2_unit = "N/A"
-    yy2_unit = data2[val2].iloc[1]
+    yy2 = pd.to_numeric(data2[val2], errors="coerce")
+    yy2_unit = homepage.csv_data2["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'))

{mg-pso-gui-0.1.66 → mg-pso-gui-0.1.67}/setup.py

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