mg-pso-gui 0.1.65__py3-none-any.whl → 0.1.67__py3-none-any.whl

{mg_pso_gui-0.1.65.dist-info → mg_pso_gui-0.1.67.dist-info}/METADATA

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

{mg_pso_gui-0.1.65.dist-info → mg_pso_gui-0.1.67.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=Kpi8YVggYAzl3iULTBTaJzVoT3Pl2z2S6JDu_TvwLTI,23480
+mgpsogui/gui/HomePage.py,sha256=WSy8qai-7cj4yTnCURE3eGSIK-jhk97byGBHo9MFWaI,23619
 mgpsogui/gui/OptionManager.py,sha256=u-mXq4ouGJ-oBa71u5GffHwSXHg3Xs32P8RtSgcTmUE,12332
 mgpsogui/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/PlatformTab/PlatformTab.py,sha256=KyIoHlMKD9nfQqHeGJwRDA4RCoe4UykjB2l6xMTKK_M,10486
@@ -18,7 +18,7 @@ mgpsogui/gui/SetupTab/SetupTab.py,sha256=bqb_kgDaTi0oEOjPNBCbdyHaGvCvMRG6LAZ5DXq
 mgpsogui/gui/SetupTab/StaticParameterView.py,sha256=iEG-UpBBlAJabZo3MG768oLqOROjUPc23tKOSd47IUc,2739
 mgpsogui/gui/SetupTab/StepView.py,sha256=oG5Q-3xpTRP1f_PbNvohKctrbpD63zLAJzHD00bN44k,5531
 mgpsogui/gui/SetupTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mgpsogui/gui/VisualizeTab/SideBar.py,sha256=8UU0Y-dCRdcK6wwj7J6XiLJtOvx1hXXN7HWWUVDgMmU,11276
+mgpsogui/gui/VisualizeTab/SideBar.py,sha256=ZOhF6B59cOmXwwSd45Ouj_DA5Z5zhngHcto9bx8VCzw,12876
 mgpsogui/gui/VisualizeTab/VisualizeTab.py,sha256=y3ZjLR78yXjHTcHMpB637ipBKxb1CCEM3qzG8OUJvpQ,3477
 mgpsogui/gui/VisualizeTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/images/IGOW 4 Logo.png,sha256=JixNXz5gOEj898VF-_PHthAlGU-6W-y9ucb4EVNPtjs,433752
@@ -32,8 +32,8 @@ 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=024tgb7Yk1Hy64lUbYX0jz437ghrHmCiivKGteXcwKg,15012
-mgpsogui/util/PSORunner.py,sha256=wfkrZLysgSS_5BrdFEm8U-0S7DHYpxmHPau_Ec5W8ak,4510
+mgpsogui/util/GraphGenerator.py,sha256=tLokgL-23QelZyf8tHPvX-Rj48E_sBp_7xCh1uEkQ_Y,14614
+mgpsogui/util/PSORunner.py,sha256=4T-L4t0I6ogMeT5v7YUaURS-g_WaN0VS2sQLpgMLMs0,4502
 mgpsogui/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/util/CTkToolTip/__init__.py,sha256=G1jxV55hGtGgwyC1sR-uUUdasDdh0XZgcI-aILgGYA0,225
 mgpsogui/util/CTkToolTip/ctk_tooltip.py,sha256=SZMovpQIGvdpDRbqCKl9SHs92DrFCO2MOYL2ifolvOE,6329
@@ -46,8 +46,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.65.dist-info/METADATA,sha256=AQ0FTGD_82fPhV-WsOS0y1vFFSIKKrsDCCBfFo1UYOo,9458
-mg_pso_gui-0.1.65.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-mg_pso_gui-0.1.65.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.1.65.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.1.65.dist-info/RECORD,,
+mg_pso_gui-0.1.67.dist-info/METADATA,sha256=ezUOJ4QMb9K7W3R_xE9WfJVWhPA8HklJP3wgmlHelBI,9458
+mg_pso_gui-0.1.67.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+mg_pso_gui-0.1.67.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.1.67.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.1.67.dist-info/RECORD,,

mgpsogui/gui/HomePage.py

@@ -514,6 +514,14 @@ class App(customtkinter.CTk):
 				print("COSU " + cosu_line, flush=True)
 			except Empty:
 				break
+
+		while True:
+			try:
+				trace = results_queue.get_nowait()
+				
+				print("TRACE " + str(trace), flush=True)
+			except Empty:
+				break
 		
 		if (os.path.exists(os.path.join(folder, 'output.txt'))):
 			with open(os.path.join(folder, 'output.txt'), 'r') as f:

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)
+        }

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'))

mgpsogui/util/PSORunner.py

@@ -98,8 +98,9 @@ def run_process(stdout_queue, stderr_queue, results_queue, cosu_queue, data, fol
     
     sys.stdout = old_stdout
     sys.stderr = old_stderr
-    results_queue.put((optimizer, trace))
+    results_queue.put(trace)
 
+"""
 def get_results():
     request: Client = Client()
     for name, value in parameters.items():
@@ -138,5 +139,4 @@ def get_results():
         print(result)
     else:
         print(result)
-
-
+"""