mg-pso-gui 0.1.227__py3-none-any.whl → 0.1.229__py3-none-any.whl

{mg_pso_gui-0.1.227.dist-info → mg_pso_gui-0.1.229.dist-info}/METADATA

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

{mg_pso_gui-0.1.227.dist-info → mg_pso_gui-0.1.229.dist-info}/RECORD

@@ -12,7 +12,7 @@ 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=exZZqqmF2lMiJ6kHu_Wpnt3GCjeMSXkn7jdXQwLRGB4,5182
+mgpsogui/gui/SetupTab/CustomFunctionMetrics.py,sha256=QeMj8GA7TLDVfMmpFUgEl1YA39qEOECNlfJX5a03uig,5786
 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
@@ -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.227.dist-info/METADATA,sha256=9zt_Xp-XajUxuc61idvNnysXwFSOdqZXnnt_supwfOI,9456
-mg_pso_gui-0.1.227.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-mg_pso_gui-0.1.227.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.1.227.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.1.227.dist-info/RECORD,,
+mg_pso_gui-0.1.229.dist-info/METADATA,sha256=Wx2I6xwm0NQoNMfkV6d6mDPiggoC17scM-oLJGXY5YI,9456
+mg_pso_gui-0.1.229.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+mg_pso_gui-0.1.229.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.1.229.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.1.229.dist-info/RECORD,,

mgpsogui/gui/SetupTab/CustomFunctionMetrics.py

@@ -66,6 +66,19 @@ class CustomFunctionsMetricsView(CTkScrollableFrame):
                         "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):
@@ -133,7 +146,7 @@ class CustomFunctionsMetricsView(CTkScrollableFrame):
             if positiveBest:
                 equation += f"({name} * {weight}) + "
             else:
-                equation += f"({weight} * (1 - {name})) + "
+                equation += f"((1 - {name}) * {weight}) + "
 
         equation = equation[:-3]  # Remove the last " + "