mg-pso-gui 0.2.122__py3-none-any.whl → 0.2.124__py3-none-any.whl

{mg_pso_gui-0.2.122.dist-info → mg_pso_gui-0.2.124.dist-info}/METADATA

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

{mg_pso_gui-0.2.122.dist-info → mg_pso_gui-0.2.124.dist-info}/RECORD

@@ -14,10 +14,10 @@ mgpsogui/gui/RunTab/OptimalParameterView.py,sha256=nliUEWA840cPBQt7wjiZ-L7uBOp_o
 mgpsogui/gui/RunTab/RunTab.py,sha256=_JWzDx5LT_uISw0Vnv-W2ypIeuKgoWqBnvFnvrLhNQA,5917
 mgpsogui/gui/RunTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/SetupTab/BoundsEditorWindow.py,sha256=7Vic6AkBI2FStMlYyPH0-dNJJyqEckYJpwxknAqtp84,3403
-mgpsogui/gui/SetupTab/BoundsList.py,sha256=UHXVpofV1201udOsz_jCva-XktFVLBvlkeeR-eOQhUY,15515
+mgpsogui/gui/SetupTab/BoundsList.py,sha256=7Xx8If4J19sfJSinI_95rCp2o4vuh_clwfAIcRA-3gM,15827
 mgpsogui/gui/SetupTab/CustomFunctionEditorWindow.py,sha256=lZ9a20YucwhCDiUN3eGA6WXQK7laToB7FP4Zev4Zxnc,3417
 mgpsogui/gui/SetupTab/CustomFunctionMetrics.py,sha256=vOJpElbTgz043m6JYwe9xz_2MBHg985S6KdbJkJERW4,5923
-mgpsogui/gui/SetupTab/FunctionsList.py,sha256=6oFS8qKF3OCtxNi5aY5Rj_ovM9nv4-vh-oT_CbhVTj4,7043
+mgpsogui/gui/SetupTab/FunctionsList.py,sha256=wmYmppyB5y8QADe3X_FQ5mAYVDC0HAPQgqtkegNwmLA,7007
 mgpsogui/gui/SetupTab/ListEditor.py,sha256=nin7Pl8z7d_yfKoAxM-yVS34uhj-LnprJ2mNRSB7Z0A,3197
 mgpsogui/gui/SetupTab/ListParametersView.py,sha256=mkGaC5cXhEOy5oD0MbTyK9z7VGZp019oK2Y8Ay-n05Q,7460
 mgpsogui/gui/SetupTab/OverrideParameterMetrics.py,sha256=rBfaSitYDOajbHvyi2TfoXAHYlz1cCt028UVpIJ_Dc0,3369
@@ -58,7 +58,7 @@ mgpsogui/util/CTkToolTip/ctk_tooltip.py,sha256=SZMovpQIGvdpDRbqCKl9SHs92DrFCO2MO
 mgpsogui/util/recosu/__init__.py,sha256=pPR0lB6clIi6q73H1W8eT5u0dd3bIemwa9-XFmOaVVk,279
 mgpsogui/util/recosu/pso/__init__.py,sha256=PQ548aEKVOk6MMzxxDg7yMO_1hHfoEoYLLkGLeij73Y,247
 mgpsogui/util/recosu/pso/csip_access.py,sha256=_oA71d6CSwhKSa3pgywIW7mXRJtgJTNu1X2DiBkQkuA,4152
-mgpsogui/util/recosu/pso/pso.py,sha256=phW1kRsEp8h7bcgeqku-kWwnZsguDX53-F8HM7q40iE,23150
+mgpsogui/util/recosu/pso/pso.py,sha256=kO0E-OEaSCAaRJX0W72NRh3zvOXA61Qv6AZLZxnAhGk,23185
 mgpsogui/util/recosu/sampling/__init__.py,sha256=dWs1MPx0o2UFmOmUfFaomQWBTIZAwALsVJzZQNZePZU,252
 mgpsogui/util/recosu/sampling/sample_trace_writer.py,sha256=M9w-POLlZgjL5a7J7yxr73OG6mCsS2aUuP9d3HKfkbA,1966
 mgpsogui/util/recosu/sampling/sampler_task.py,sha256=uZobpR83u6xEaUzIknvW9FbB84c2AL7T-5T8O8QIhzY,2776
@@ -73,8 +73,8 @@ mgpsogui/util/recosu/utils/trace_writer.py,sha256=V9BJlOjCbNYGoXGEk3CF5wjifBxvar
 mgpsogui/util/recosu/utils/utils.py,sha256=6MIoJb0nhIa4tNv7qhBfZi-AtL3L95CgJf6eAf12NQs,4140
 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.2.122.dist-info/METADATA,sha256=WUY3YFL6zE3UtSJcK-KNT7BOkNAb7fiNxCsa3Jl-mSI,9542
-mg_pso_gui-0.2.122.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-mg_pso_gui-0.2.122.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.2.122.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.2.122.dist-info/RECORD,,
+mg_pso_gui-0.2.124.dist-info/METADATA,sha256=xhxbNuuONZLy4BO01-WLcMdSEx5JRYmu8adzJhyy8Hk,9542
+mg_pso_gui-0.2.124.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+mg_pso_gui-0.2.124.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.2.124.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.2.124.dist-info/RECORD,,

mgpsogui/gui/SetupTab/BoundsList.py

@@ -116,7 +116,11 @@ class BoundsList(CTkFrame):
             tt2 = None
             tt3 = None
                         
-            tt = CTkOptionMenu(self.containerFrame, dynamic_resizing=False, values=['float', 'list', 'custom'], variable=bound["type"], command=self.refresh)
+            options_list = ['custom', 'float', 'list']
+            if self.optParams == [] or self.optParams is None:
+                options_list = ['custom', 'list']
+            
+            tt = CTkOptionMenu(self.containerFrame, dynamic_resizing=False, values=options_list, variable=bound["type"], command=self.refresh)
             #command = lambda _, index=index, option=tt: (self.update_type(index, option)) 
             #tt.configure(command=command)
             #tt.set(bound["type"].get())
@@ -125,6 +129,10 @@ class BoundsList(CTkFrame):
             cc = None
             
             bound_type = bound["type"].get()
+
+            if self.optParams == [] and bound_type == "float":
+                bound["type"].set("custom")
+                bound_type = "custom"
             
             if bound_type == "float":
                 cc = CTkOptionMenu(self.containerFrame, dynamic_resizing=False, values=self.optParams, variable=bound["name"])

mgpsogui/gui/SetupTab/FunctionsList.py

@@ -59,7 +59,7 @@ class FunctionsList(CTkFrame):
             
             row += 1
             
-            columns = ["absdiff (not supported)",
+            columns = ["absdiff",
                        "absdifflog  (not supported)",
                        "ave  (not supported)",
                        "bias  (not supported)",
@@ -67,13 +67,14 @@ class FunctionsList(CTkFrame):
                        "ioa  (not supported)",
                        "ioa2  (not supported)",
                        "kge",
-                       "kge09  (not supported)",
-                       "mns  (not supported)",
+                       "kge09",
+                       "mns",
                        "mse  (not supported)",
+                       "rmse",
                        "ns",
                        "ns2log  (not supported)",
                        "nslog1p",
-                       "nslog2  (not supported)",
+                       "nslog2",
                        "pbias",
                        "pmcc  (not supported)",
                        "rmse",

mgpsogui/util/recosu/pso/pso.py

@@ -95,7 +95,7 @@ def eval_cost(x, iteration, step_param, step_objfunc, calib_params, req_queue, f
 
     for key in cost2:
         # print(key, ' - ', cost2[key])
-        cost2[key][iteration][1] = cost[key]
+        cost2[key][iteration - 1][1] = cost[key] # BUG LIST INDEX OUT OF RANGE?
         # print(key, ' - ', cost2[key])
 
     print(flush=True)