mg-pso-gui 0.1.226__tar.gz → 0.1.227__tar.gz

{mg_pso_gui-0.1.226 → mg_pso_gui-0.1.227}/PKG-INFO

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

{mg_pso_gui-0.1.226 → mg_pso_gui-0.1.227}/mg_pso_gui.egg-info/PKG-INFO

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

{mg_pso_gui-0.1.226 → mg_pso_gui-0.1.227}/mgpsogui/gui/OptionManager.py

@@ -130,6 +130,7 @@ class OptionManager():
                                 "data": (sv(), sv())}
                 objfunc_obj["name"].set(objfunc["name"])
                 objfunc_obj["of"].set(objfunc["of"])
+                objfunc_obj["custom_function_goal"].set("Positive Best")
                 
                 if ("weight" in objfunc): 
                     objfunc_obj["weight"].set(objfunc["weight"])

{mg_pso_gui-0.1.226 → mg_pso_gui-0.1.227}/mgpsogui/gui/SetupTab/CustomFunctionMetrics.py

@@ -46,6 +46,26 @@ class CustomFunctionsMetricsView(CTkScrollableFrame):
                         "rmse",
                         "trmse"]
         
+        self.positive_best = {"absdiff": True,
+                        "absdifflog": True,
+                        "ave": True,
+                        "bias": True,
+                        "fhf": True,
+                        "ioa": True,
+                        "ioa2": True,
+                        "kge": True,
+                        "kge09": True,
+                        "mns": True,
+                        "mse": True,
+                        "ns": False,
+                        "ns2log": True,
+                        "nslog1p": True,
+                        "nslog2": True,
+                        "pbias": True,
+                        "pmcc": True,
+                        "rmse": True,
+                        "trmse": True}
+
         self.render()
 
     def clear(self):
@@ -102,4 +122,19 @@ class CustomFunctionsMetricsView(CTkScrollableFrame):
         row += 1
         
     def push_to_option_manager(self):
-        pass
+        equation = ""
+
+        for key_value in self.key_values:
+            name = key_value["name"].get()
+            weight = key_value["value"].get()
+
+            positiveBest = self.positive_best[name]
+
+            if positiveBest:
+                equation += f"({name} * {weight}) + "
+            else:
+                equation += f"({weight} * (1 - {name})) + "
+
+        equation = equation[:-3]  # Remove the last " + "
+
+        self.option_manager.get_steps()[self.step_index]["objfunc"][self.functions_index]["custom_function"].set(equation)

{mg_pso_gui-0.1.226 → mg_pso_gui-0.1.227}/mgpsogui/gui/SetupTab/FunctionsList.py

@@ -91,7 +91,7 @@ class FunctionsList(CTkFrame):
                 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=["+ Best", "0 Best"], variable=func["custom_function_goal"]).grid(row=row, column=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")
 
                 def button_click_event(function_index):
                     dialog = CFEW(title="Edit Custom Function", step_index=self.step_index, function_index=function_index, option_manager=self.option_manager)

{mg_pso_gui-0.1.226 → mg_pso_gui-0.1.227}/setup.py

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