mg-pso-gui 0.1.214__tar.gz → 0.1.216__tar.gz

{mg_pso_gui-0.1.214 → mg_pso_gui-0.1.216}/PKG-INFO

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

{mg_pso_gui-0.1.214 → mg_pso_gui-0.1.216}/mg_pso_gui.egg-info/PKG-INFO

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

{mg_pso_gui-0.1.214 → mg_pso_gui-0.1.216}/mgpsogui/gui/OptionManager.py

@@ -121,7 +121,13 @@ class OptionManager():
                 obj["param"].append(param_obj)
             
             for objfunc in step["objfunc"]:
-                objfunc_obj = {"name": sv(), "of": sv(), "weight": sv(), "data": (sv(), sv())}
+                objfunc_obj = {"name": sv(), 
+                                "of": sv(), 
+                                "weight": sv(), 
+                                "custom_function": sv(),
+                                "custom_function_goal": sv(),
+                                "custom_function_value": sv(),
+                                "data": (sv(), sv())}
                 objfunc_obj["name"].set(objfunc["name"])
                 objfunc_obj["of"].set(objfunc["of"])
                 
@@ -130,6 +136,13 @@ class OptionManager():
                 else:
                     objfunc_obj["weight"].set(1)
                     
+                if ("custom_function" in objfunc):
+                    objfunc_obj["custom_function"].set(objfunc["custom_function"])
+                if ("custom_function_goal" in objfunc):
+                    objfunc_obj["custom_function_goal"].set(objfunc["custom_function_goal"])
+                if ("custom_function_value" in objfunc):
+                    objfunc_obj["custom_function_value"].set(objfunc["custom_function_value"])
+
                 objfunc_obj["data"][0].set(objfunc["data"][0])
                 objfunc_obj["data"][1].set(objfunc["data"][1]) 
                 obj["objfunc"].append(objfunc_obj)
@@ -137,12 +150,22 @@ class OptionManager():
             self.steps.append(obj)
     
     def add_function(self, step_index):
-        obj = {"name": sv(), "of": sv(), "weight": sv(), "data": (sv(), sv())}
+        obj = {"name": sv(), 
+                "of": sv(), 
+                "weight": sv(), 
+                "custom_function": sv(),
+                "custom_function_goal": sv(),
+                "custom_function_value": sv(),
+                "data": (sv(), sv())}
         obj["name"].set("ns")
         obj["of"].set("ns")
         obj["weight"].set(1)
         obj["data"][0].set("")
         obj["data"][1].set("")
+        obj["custom_function"].set("") 
+        obj["custom_function_goal"].set("")
+        obj["custom_function_value"].set("") 
+        
         self.steps[step_index]["objfunc"].append(obj)
         
     def remove_function(self, step_index, index):
@@ -151,12 +174,21 @@ class OptionManager():
     def dupe_function(self, step_index, index):
         my_func = self.steps[step_index]["objfunc"][index]
         
-        new_object = {"name": sv(), "of": sv(), "weight": sv(), "data": (sv(), sv())}
+        new_object = {"name": sv(), 
+                        "of": sv(), 
+                        "weight": sv(), 
+                        "custom_function": sv(),
+                        "custom_function_goal": sv(),
+                        "custom_function_value": sv(),
+                        "data": (sv(), sv())}
         new_object["name"].set(my_func["name"].get())
         new_object["of"].set(my_func["of"].get())
         new_object["weight"].set(my_func["weight"].get())
         new_object["data"][0].set(my_func["data"][0].get())
         new_object["data"][1].set(my_func["data"][1].get())
+        new_object["custom_function"].set(my_func["custom_function"].get())
+        new_object["custom_function_goal"].set(my_func["custom_function_goal"].get())
+        new_object["custom_function_value"].set(my_func["custom_function_value"].get())
         
         self.steps[step_index]["objfunc"].append(new_object)
     

{mg_pso_gui-0.1.214 → mg_pso_gui-0.1.216}/mgpsogui/gui/SetupTab/FunctionsList.py

@@ -65,11 +65,22 @@ class FunctionsList(CTkFrame):
                        "pbias",
                        "pmcc",
                        "rmse",
-                       "trmse"]
+                       "trmse",
+                       "custom"]
             CTkEntry(self.containerFrame, textvariable=func["name"]).grid(row=row, column=0, padx=(5, 5), pady=(5, 5), sticky="ew")
             CTkOptionMenu(self.containerFrame, values=columns, variable=func["of"]).grid(row=row, column=1, padx=(5, 5), pady=(5, 5), sticky="ew")
             CTkEntry(self.containerFrame, textvariable=func["weight"]).grid(row=row, column=2, padx=(5, 5), pady=(5, 5), sticky="ew")
             
+            row += 1
+
+            CTkLabel(self.containerFrame, text="Custom Function:").grid(row=row, column=0, columnspan=2, padx=(5, 5), pady=(5, 5), sticky="nsew")
+            CTkLabel(self.containerFrame, text="Target:").grid(row=row, column=2, padx=(5, 5), pady=(5, 5), sticky="nsew")
+
+            row += 1
+
+            CTkEntry(self.containerFrame, textvariable=func["custom_function"]).grid(row=row, column=0, columnspan=2, padx=(5, 5), pady=(5, 5), sticky="ew")
+            CTkOptionMenu(self.containerFrame, values=["Positive Best", "Zero Best"], variable=func["custom_function_goal"]).grid(row=row, column=2, padx=(5, 5), pady=(5, 5), sticky="ew")
+
             row += 1
             
             CTkLabel(self.containerFrame, text="Data:").grid(row=row, column=0, padx=(5, 5), pady=(5, 5), sticky="nsew")

{mg_pso_gui-0.1.214 → mg_pso_gui-0.1.216}/setup.py

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