mg-pso-gui 0.1.226__py3-none-any.whl → 0.1.228__py3-none-any.whl

{mg_pso_gui-0.1.226.dist-info → mg_pso_gui-0.1.228.dist-info}/METADATA

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

{mg_pso_gui-0.1.226.dist-info → mg_pso_gui-0.1.228.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=L2Vj2B6BzdXvoi6CkLWgxvtrzRMPJlF2sfbB8VpCVyc,22925
-mgpsogui/gui/OptionManager.py,sha256=S7BiDHtCIS8QU0RBqCcsKpzTT9gEjiokizLMSGuD3vw,16353
+mgpsogui/gui/OptionManager.py,sha256=zg1-0mwNLLM_iDAfp5PKlaO6lq2SfdQmZK6qHNfd7Eg,16426
 mgpsogui/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/PlatformTab/PlatformTab.py,sha256=q8x_tvVgSoyGINuQbivXRThF3gaSSfg8X_dsLSPv4F0,10492
 mgpsogui/gui/PlatformTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -12,8 +12,8 @@ mgpsogui/gui/SetupTab/BoundsEditorWindow.py,sha256=U64oaiDIOaimjbqKMz5rQNq2o1SrQ
 mgpsogui/gui/SetupTab/BoundsList.py,sha256=L77UEaUJNiUE-ZsYIl44tWRb1zBfxaEQ-bAG1V5_IH0,12268
 mgpsogui/gui/SetupTab/CalibrationParametersView.py,sha256=ppVBHG3nphku9-P6Z8az-HTpgk8vHxnj-A5m80BZTgA,2784
 mgpsogui/gui/SetupTab/CustomFunctionEditorWindow.py,sha256=yx0dHSNa7fGy99Q6qFcI6j9r8p0DlV3iOBgyPMGd8pM,2884
-mgpsogui/gui/SetupTab/CustomFunctionMetrics.py,sha256=JW7lL-PLp-yTJYYLEuYilgraJcKrWvViD6PaWhWpCmU,3902
-mgpsogui/gui/SetupTab/FunctionsList.py,sha256=1nAW1ICl2b9D8AAxKZ9G0dVuRTSm8RhfPUTQ4rKF2Vw,6365
+mgpsogui/gui/SetupTab/CustomFunctionMetrics.py,sha256=HHRWdHFuhcFBQ2Gu07j2lFoc7p_T6DOiT_TyKrxmI4M,5777
+mgpsogui/gui/SetupTab/FunctionsList.py,sha256=cMBv87GeRACiJ1DPxFrPvZJOZ3fK6FUVAeUaQCR9dn0,6375
 mgpsogui/gui/SetupTab/ListEditor.py,sha256=vlP0KDPu8J1_6KXuUTlE7OClgfF0Qk6cISsFm_SglUw,3232
 mgpsogui/gui/SetupTab/ListParametersView.py,sha256=wYcDcaooYkw-y7XW6dJUwhTWxLuUUOK5tGUFVHBf3ck,7352
 mgpsogui/gui/SetupTab/OptimalParameterView.py,sha256=VKn-4BlVyqspFIOkbWsM0q9pYVsmqnSND0xP2hDKb60,1785
@@ -62,8 +62,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.226.dist-info/METADATA,sha256=YSQRTzCEvIU3q3KXB0m5jlqkzXrpFgWtWBk9sqesk0M,9456
-mg_pso_gui-0.1.226.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-mg_pso_gui-0.1.226.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.1.226.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.1.226.dist-info/RECORD,,
+mg_pso_gui-0.1.228.dist-info/METADATA,sha256=d030g0MGOA1AP047fsepNzKebIADU6d0tfD1XjYz0Zo,9456
+mg_pso_gui-0.1.228.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+mg_pso_gui-0.1.228.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.1.228.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.1.228.dist-info/RECORD,,

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"])

mgpsogui/gui/SetupTab/CustomFunctionMetrics.py

@@ -46,6 +46,38 @@ 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}
+
+        equation = self.option_manager.get_steps()[self.step_index]["objfunc"][self.functions_index]["custom_function"].get()
+        # Example equation (0 * (1 - ns)) + (bias * 0) + (pbias * 0) + (absdiff * 0)
+        if equation != "":
+            equation = equation.replace("1 - ", "")
+            equation = equation.replace("(", "")
+            equation = equation.replace(")", "")
+            equation = equation.replace(" ", "")
+            pairs = equation.split("+")
+            for pair in pairs:
+                key, value = pair.split("*")
+                self.add_key(key, value)
+
         self.render()
 
     def clear(self):
@@ -102,4 +134,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)

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)