mg-pso-gui 0.1.57__tar.gz → 0.1.58__tar.gz

{mg-pso-gui-0.1.57 → mg-pso-gui-0.1.58}/PKG-INFO

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

{mg-pso-gui-0.1.57 → mg-pso-gui-0.1.58}/mg_pso_gui.egg-info/PKG-INFO

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

{mg-pso-gui-0.1.57 → mg-pso-gui-0.1.58}/mg_pso_gui.egg-info/SOURCES.txt

@@ -20,6 +20,7 @@ mgpsogui/gui/SetupTab/BoundsList.py
 mgpsogui/gui/SetupTab/CalibrationParametersView.py
 mgpsogui/gui/SetupTab/FunctionsList.py
 mgpsogui/gui/SetupTab/ListParametersView.py
+mgpsogui/gui/SetupTab/OptimalParameterView.py
 mgpsogui/gui/SetupTab/SetupTab.py
 mgpsogui/gui/SetupTab/StaticParameterView.py
 mgpsogui/gui/SetupTab/StepView.py

{mg-pso-gui-0.1.57 → mg-pso-gui-0.1.58}/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()
                         }

mg-pso-gui-0.1.58/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

{mg-pso-gui-0.1.57 → mg-pso-gui-0.1.58}/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)

{mg-pso-gui-0.1.57 → mg-pso-gui-0.1.58}/setup.py

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