mg-pso-gui 0.1.55__py3-none-any.whl → 0.1.58__py3-none-any.whl

{mg_pso_gui-0.1.55.dist-info → mg_pso_gui-0.1.58.dist-info}/METADATA

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

{mg_pso_gui-0.1.55.dist-info → mg_pso_gui-0.1.58.dist-info}/RECORD

@@ -2,7 +2,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=JF4bSw84lfUgjGT3jLY2WcJHix4NccL6vIgEqNENxkY,23403
-mgpsogui/gui/OptionManager.py,sha256=bFN2jWJbx1Din3waOFLmbWGt0BXD_KthGJ8Mgue_FEE,11712
+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
 mgpsogui/gui/PlatformTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -13,7 +13,8 @@ mgpsogui/gui/SetupTab/BoundsList.py,sha256=L77UEaUJNiUE-ZsYIl44tWRb1zBfxaEQ-bAG1
 mgpsogui/gui/SetupTab/CalibrationParametersView.py,sha256=ppVBHG3nphku9-P6Z8az-HTpgk8vHxnj-A5m80BZTgA,2784
 mgpsogui/gui/SetupTab/FunctionsList.py,sha256=tUqW43VWpxFpdo9UHaPvFQ0CtCo9mFI3mri52ikntrE,4092
 mgpsogui/gui/SetupTab/ListParametersView.py,sha256=wYcDcaooYkw-y7XW6dJUwhTWxLuUUOK5tGUFVHBf3ck,7352
-mgpsogui/gui/SetupTab/SetupTab.py,sha256=Doy_6xLq1BjhLTFHRQm7CAbpQzUnNJW4KkBcdfrxWoE,1881
+mgpsogui/gui/SetupTab/OptimalParameterView.py,sha256=_sRBN4eI64o0qPzkFBts-8q4q8-HI0a9kkweH6nvyb4,1818
+mgpsogui/gui/SetupTab/SetupTab.py,sha256=dNCakUtnFefA9nsRJciN6D_2i5llqSEofHHu0iSsbjM,2432
 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
@@ -31,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=4_l3D8xESegVmKc8O9mS4GIj4KjxJkh0oauBst7CXAg,14708
+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 +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.55.dist-info/METADATA,sha256=rowjRbwyjHeFeePd_7fJHJYBGEviJatWkswPl624JpA,9458
-mg_pso_gui-0.1.55.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-mg_pso_gui-0.1.55.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.1.55.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.1.55.dist-info/RECORD,,
+mg_pso_gui-0.1.58.dist-info/METADATA,sha256=7cH-WEHXtEYyIofcY5XOKwFvg9MFjmfF3GXdz_lcXmw,9458
+mg_pso_gui-0.1.58.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+mg_pso_gui-0.1.58.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.1.58.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.1.58.dist-info/RECORD,,

mgpsogui/gui/OptionManager.py

@@ -65,6 +65,7 @@ class OptionManager():
                     "name": sv(), 
                     "bounds": (sv(), sv()), 
                     "default_value": sv(), 
+                    "optimal_value": sv(), 
                     "type": sv(),
                     "calibration_strategy": sv()
                 }
@@ -75,18 +76,27 @@ class OptionManager():
                 else: 
                     param_obj["bounds"][0].set(0)
                     param_obj["bounds"][1].set(1)
+                    
                 if "type" in param:
                     param_obj["type"].set(param["type"])
                 else:
                     param_obj["type"].set("float")
+                    
                 if "default_value" in param:
                     param_obj["default_value"].set(param["default_value"])
                 else:
                     param_obj["default_value"].set(1)
+                    
+                if "optimal_value" in param:
+                    param_obj["optimal_value"].set(param["optimal_value"])
+                else:
+                    param_obj["optimal_value"].set(0)
+                    
                 if "calibration_strategy" in param:
                     param_obj["calibration_strategy"].set(param["calibration_strategy"])
                 else:
                     param_obj["calibration_strategy"].set("none")
+                    
                 obj["param"].append(param_obj)
             
             for objfunc in step["objfunc"]:
@@ -135,17 +145,20 @@ class OptionManager():
                   max=1,
                   type="float",
                   default_value=1,
+                  optimal_value=0,
                   calibration_strategy="none"):
         obj = {
             "name": sv(), 
             "bounds": (sv(), sv()), 
             "default_value": sv(), 
+            "optimal_value": sv(),
             "type": sv(),
             "calibration_strategy": sv()
         }
         obj["name"].set(name)
         obj["type"].set(type)
         obj["default_value"].set(default_value)
+        obj["optimal_value"].set(optimal_value)
         obj["calibration_strategy"].set(calibration_strategy)
         obj["bounds"][0].set(min)
         obj["bounds"][1].set(max)
@@ -257,6 +270,7 @@ class OptionManager():
                             'bounds': (float(param['bounds'][0].get()), 
                                        float(param['bounds'][1].get())),
                             'default_value': float(param['default_value'].get()),
+                            'optimal_value': float(param['optimal_value'].get()),
                             'type': 'float',
                             'calibration_strategy': param['calibration_strategy'].get()
                         }
@@ -268,6 +282,7 @@ class OptionManager():
                             'bounds': (float(param['bounds'][0].get()), 
                                        float(param['bounds'][1].get())),
                             'default_value': param['default_value'].get(),
+                            'optimal_value': param['optimal_value'].get(),
                             'type': 'list',
                             'calibration_strategy': param['calibration_strategy'].get()
                         }

mgpsogui/gui/SetupTab/OptimalParameterView.py

@@ -0,0 +1,49 @@
+from customtkinter import CTkScrollableFrame
+from customtkinter import CTkFrame
+from customtkinter import CTkLabel
+from customtkinter import CTkButton
+from customtkinter import CTkEntry
+import tkinter as tk
+
+global option_manager
+
+class OptimalParameterView(CTkScrollableFrame):
+    def __init__(self, *args,
+                 option_manager: None,
+                 **kwargs):
+        super().__init__(*args, **kwargs)
+        
+        self.option_manager = option_manager
+        
+        self.render()
+
+    def clear(self):
+        self.containerFrame.destroy()
+        
+    def render(self):
+        row = 0
+        index = 0
+        
+        self.containerFrame = CTkFrame(self)
+        self.containerFrame.grid(row=0, column=0, padx=(5, 5), pady=(5, 5), sticky="nsew")
+        self.containerFrame.grid_columnconfigure((0, 1), weight=1)
+        
+        CTkLabel(self.containerFrame, text="Name:").grid(row=row, column=0, columnspan=1, padx=5, pady=5, sticky="")
+        CTkLabel(self.containerFrame, text="Value:").grid(row=row, column=1, columnspan=1, padx=5, pady=5, sticky="")
+        row += 1
+        
+        self.steps = self.option_manager.get_steps()
+
+        for step in self.steps:
+            name = step['name'].get()
+            CTkLabel(self.containerFrame, text=name).grid(row=row, column=0, columnspan=1, padx=5, pady=5, sticky="")
+            row += 1
+            
+            for param in step['param']:
+                CTkEntry(self.containerFrame, textvariable=param['name']).grid(row=row, column=0, padx=(5, 5), pady=(5, 5), sticky="ew")
+            
+                bb = CTkEntry(self.containerFrame)
+                bb.grid(row=row, column=1, padx=(5, 5), pady=(5, 5), sticky="ew")
+                bb.configure(textvariable=param['optimal_value'])
+            row += 1
+            index += 1

mgpsogui/gui/SetupTab/SetupTab.py

@@ -3,6 +3,7 @@
 from . import StepView as sv
 from . import StaticParameterView as spv
 from . import CalibrationParametersView as cpv
+from . import OptimalParameterView as opv
 
 import customtkinter
 
@@ -15,10 +16,12 @@ def create_tab(self, tab):
     self.paramtabview = customtkinter.CTkTabview(tab, bg_color="transparent", fg_color="transparent")
     self.paramtabview.grid(row=0, column=1, padx=(0, 0), pady=(10, 10), sticky="nsew")
     
-    tab1 = "Static Parameters"
-    tab2 = "Calibration Parameters"
+    tab1 = "Static"
+    tab2 = "Calibration"
+    tab3 = "Optimal"
     self.paramtabview.add(tab1)
     self.paramtabview.add(tab2)
+    self.paramtabview.add(tab3)
     
     self.paramtabview.tab(tab1).grid_columnconfigure(0, weight=1)
     self.paramtabview.tab(tab1).grid_rowconfigure(0, weight=1)
@@ -26,12 +29,20 @@ def create_tab(self, tab):
     self.paramtabview.tab(tab2).grid_columnconfigure(0, weight=1)
     self.paramtabview.tab(tab2).grid_rowconfigure(0, weight=1)
     
+    self.paramtabview.tab(tab3).grid_columnconfigure(0, weight=1)
+    self.paramtabview.tab(tab3).grid_rowconfigure(0, weight=1)
+    
     self.static_param_frame = spv.StaticParameterView(self.paramtabview.tab(tab1), option_manager=self.option_manager)
     self.static_param_frame.grid(row=0, column=0, padx=(10, 10), pady=(10, 0), sticky="nsew")
     self.static_param_frame.grid_columnconfigure(0, weight=1)
     self.static_param_frame.grid_rowconfigure(0, weight=1)
     
-    self.calib_param_frame = cpv.CalibrationParametersView(self.paramtabview.tab(tab2), option_manager=self.option_manager)
+    self.optimal_param_frame = cpv.CalibrationParametersView(self.paramtabview.tab(tab2), option_manager=self.option_manager)
+    self.optimal_param_frame.grid(row=0, column=0, padx=(10, 10), pady=(10, 0), sticky="nsew")
+    self.optimal_param_frame.grid_columnconfigure(0, weight=1)
+    self.optimal_param_frame.grid_rowconfigure(0, weight=1)
+    
+    self.calib_param_frame = opv.OptimalParameterView(self.paramtabview.tab(tab3), option_manager=self.option_manager)
     self.calib_param_frame.grid(row=0, column=0, padx=(10, 10), pady=(10, 0), sticky="nsew")
     self.calib_param_frame.grid_columnconfigure(0, weight=1)
     self.calib_param_frame.grid_rowconfigure(0, weight=1)

mgpsogui/util/GraphGenerator.py

@@ -289,20 +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":
-        xx = pd.to_datetime(data["date"], format='%d-%m-%Y', errors='coerce').iloc[2:]
+        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]
@@ -360,30 +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":
-        xx = pd.to_datetime(data["date"], format='%d-%m-%Y', errors='coerce').iloc[2:]
+        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":
-        xx2 = pd.to_datetime(data2["date"], format='%d-%m-%Y', errors='coerce').iloc[2:]
+        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]