mg-pso-gui 0.1.197__py3-none-any.whl → 0.1.199__py3-none-any.whl

{mg_pso_gui-0.1.197.dist-info → mg_pso_gui-0.1.199.dist-info}/METADATA

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

{mg_pso_gui-0.1.197.dist-info → mg_pso_gui-0.1.199.dist-info}/RECORD

@@ -11,13 +11,13 @@ mgpsogui/gui/RunTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 mgpsogui/gui/SetupTab/BoundsEditorWindow.py,sha256=_6_xEl46PY9MmNvpmoMNdNDbVav6ODwWSDROboy57Cs,2866
 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/FunctionsList.py,sha256=tUqW43VWpxFpdo9UHaPvFQ0CtCo9mFI3mri52ikntrE,4092
-mgpsogui/gui/SetupTab/ListEditor.py,sha256=goWZah2I42PIGY6SGmdQtpXYvwFXvpAEL3wH1Qzm2Y0,3212
+mgpsogui/gui/SetupTab/FunctionsList.py,sha256=Ty0S2Hs7XrtZCQNo7nSKNVYoMkRQN9-x0CEWogwgcO4,4709
+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
 mgpsogui/gui/SetupTab/SetupTab.py,sha256=_cehQwQhDbX92da_AwqYQ2mQo7sFDGkN1IsYQmctK5o,2776
 mgpsogui/gui/SetupTab/StaticParameterView.py,sha256=iEG-UpBBlAJabZo3MG768oLqOROjUPc23tKOSd47IUc,2739
-mgpsogui/gui/SetupTab/StepView.py,sha256=mUtxtXoEnh86oILaTaobjW3lpkgNio1MZZuM2RLOsqU,9034
+mgpsogui/gui/SetupTab/StepView.py,sha256=2raGHrnQjpouotifNPjsGFbHLiVsSi-3km8ExSb8R6g,9054
 mgpsogui/gui/SetupTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/VisualizeTab/MatrixEditor.py,sha256=JPQmfljdddIwHtTKpFqUdk7hRzVdX-IKl4neOk3DsjM,3132
 mgpsogui/gui/VisualizeTab/SideBar.py,sha256=MtZfDScNFN0fQ8DyPm6bZGJSrFRgT14fZeUq-qc61O8,21936
@@ -60,8 +60,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.197.dist-info/METADATA,sha256=84BDRoZVq_tmr30RspNfmJyQfDhR2g1um4q7CS5LbnM,9456
-mg_pso_gui-0.1.197.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
-mg_pso_gui-0.1.197.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.1.197.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.1.197.dist-info/RECORD,,
+mg_pso_gui-0.1.199.dist-info/METADATA,sha256=WouqUs8rM1RryCPJxj-5JregE692sDnQES1TyGB216M,9456
+mg_pso_gui-0.1.199.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
+mg_pso_gui-0.1.199.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.1.199.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.1.199.dist-info/RECORD,,

mgpsogui/gui/SetupTab/FunctionsList.py

@@ -47,8 +47,27 @@ class FunctionsList(CTkFrame):
             
             row += 1
             
+            columns = ["absdiff",
+                       "absdifflog",
+                       "ave",
+                       "bias",
+                       "fhf",
+                       "ioa",
+                       "ioa2",
+                       "kge",
+                       "kge09",
+                       "mns",
+                       "mse",
+                       "ns",
+                       "ns2log",
+                       "nslog1p",
+                       "nslog2",
+                       "pbias",
+                       "pmcc",
+                       "rmse",
+                       "trmse"]
             CTkEntry(self.containerFrame, textvariable=func["name"]).grid(row=row, column=0, padx=(5, 5), pady=(5, 5), sticky="ew")
-            CTkEntry(self.containerFrame, textvariable=func["of"]).grid(row=row, column=1, 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

mgpsogui/gui/SetupTab/ListEditor.py

@@ -45,8 +45,8 @@ class ListEditor(CTkFrame):
         row = 0
         index = 0
         
-        self.containerFrame = CTkFrame(self)
-        self.containerFrame.grid(row=0, column=0, padx=(10, 10), pady=(10, 10), sticky="new")
+        self.containerFrame = CTkFrame(self, fg_color="transparent")
+        self.containerFrame.grid(row=0, column=0, padx=(5, 5), pady=(5, 5), sticky="new")
         self.containerFrame.grid_columnconfigure((0, 1), weight=1)
         
         CTkLabel(self.containerFrame, text=self.title).grid(row=row, column=0, columnspan=2, padx=5, pady=5, sticky="ew")

mgpsogui/gui/SetupTab/StepView.py

@@ -132,6 +132,7 @@ class StepView(CTkScrollableFrame):
             CTkButton(self.containerFrame, text="Add Group", command=self.create_new_step).grid(
                 row=row, columnspan=2, column=0, padx=(10, 10), pady=(10, 10), sticky="ew")
             
+        """
         if (self.mode == "Sampling: Halton" or self.mode == "Sampling: Random" or self.mode == "Sensitivity Analysis"):
             self.analysisFrame = CTkFrame(self)
             self.analysisFrame.grid(row=2, column=0, columnspan=2, padx=(10, 10), pady=(10, 10), sticky="nsew")
@@ -161,7 +162,7 @@ class StepView(CTkScrollableFrame):
             self.positive_editor.grid_rowconfigure(0, weight=1)
 
             self.negative_editor = ListEditor.ListEditor(self.analysisFrame, option_manager=self.option_manager, 
-                                                       title = "Negative Best Metrics",
+                                                       title = "Zero Best Metrics",
                                                        columns=columns,
                                                        parameter_name="sensitivity_negativeBestMetrics",
                                                        parameter_remove_func=self.option_manager.remove_sensitivity_negativeBestMetrics,
@@ -169,3 +170,4 @@ class StepView(CTkScrollableFrame):
             self.negative_editor.grid(row=0, column=2, padx=(10, 10), pady=(10, 0), sticky="nsew")
             self.negative_editor.grid_columnconfigure(0, weight=1)
             self.negative_editor.grid_rowconfigure(0, weight=1)
+        """