mg-pso-gui 0.2.12__py3-none-any.whl → 0.2.14__py3-none-any.whl

{mg_pso_gui-0.2.12.dist-info → mg_pso_gui-0.2.14.dist-info}/METADATA

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

{mg_pso_gui-0.2.12.dist-info → mg_pso_gui-0.2.14.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=B0uwmD49aiqRZ-hyzv5ZhceG3ymWzFS2CoGsiOuMeX0,21593
-mgpsogui/gui/OptionManager.py,sha256=8Wl2bBxsVYPIk2SmF9zXb-oNY3X2HtdWOStIV9gRfAU,20023
+mgpsogui/gui/OptionManager.py,sha256=6OXfCIa4xi-WY33zNOcN9lcdcIQJcDJjdKPbVynKgUI,20239
 mgpsogui/gui/OptionManager_backup.py,sha256=TCWfPnHL2foN5id47jsi267lamRG6yGU6y_M29eOOJk,18530
 mgpsogui/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/General/ParameterView.py,sha256=G0UW84dsL9O3uOth6SviC1hSoar4vDeq_kyefEuD284,5082
@@ -15,7 +15,7 @@ mgpsogui/gui/SetupTab/BoundsEditorWindow.py,sha256=U64oaiDIOaimjbqKMz5rQNq2o1SrQ
 mgpsogui/gui/SetupTab/BoundsList.py,sha256=A-twr731uKflWTq4AmQcapSsR54a9Y7Zvo1fMFfx8jE,12347
 mgpsogui/gui/SetupTab/CustomFunctionEditorWindow.py,sha256=yx0dHSNa7fGy99Q6qFcI6j9r8p0DlV3iOBgyPMGd8pM,2884
 mgpsogui/gui/SetupTab/CustomFunctionMetrics.py,sha256=vOJpElbTgz043m6JYwe9xz_2MBHg985S6KdbJkJERW4,5923
-mgpsogui/gui/SetupTab/FunctionsList.py,sha256=9fnviF24JtIAeDWp5mL_rd0vicfeNPi9dTlVVPf9j1U,6421
+mgpsogui/gui/SetupTab/FunctionsList.py,sha256=ntbIUs8q2Tm3KfBLleT7uL0gynwYuVycwvXv8vude3c,6611
 mgpsogui/gui/SetupTab/ListEditor.py,sha256=nin7Pl8z7d_yfKoAxM-yVS34uhj-LnprJ2mNRSB7Z0A,3197
 mgpsogui/gui/SetupTab/ListParametersView.py,sha256=mkGaC5cXhEOy5oD0MbTyK9z7VGZp019oK2Y8Ay-n05Q,7460
 mgpsogui/gui/SetupTab/OptimalParameterView.py,sha256=nliUEWA840cPBQt7wjiZ-L7uBOp_ozzJhyBkL08fJzI,1752
@@ -68,8 +68,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.2.12.dist-info/METADATA,sha256=krMm6WOmQv30AMKQ007XwW4_GOeb1prnIe5nSb3Hmig,9455
-mg_pso_gui-0.2.12.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-mg_pso_gui-0.2.12.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.2.12.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.2.12.dist-info/RECORD,,
+mg_pso_gui-0.2.14.dist-info/METADATA,sha256=9Mwuok0tEyp-Kvd5KDekEkOnX4A8ZcWiq9AOabtUklA,9455
+mg_pso_gui-0.2.14.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+mg_pso_gui-0.2.14.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.2.14.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.2.14.dist-info/RECORD,,

mgpsogui/gui/OptionManager.py

@@ -193,7 +193,8 @@ class OptionManager():
                                     "custom_function": sv(),
                                     "custom_function_goal": sv(),
                                     "custom_function_value": sv(),
-                                    "data": (sv(), sv())}
+                                    "data_observed": sv(),
+                                    "data_simulated": sv()}
                     objective_function_object["name"].set(objective_function["name"])
                     objective_function_object["objective_function"].set(objective_function["objective_function"])
                     objective_function_object["custom_function_goal"].set("Positive Best")
@@ -210,8 +211,8 @@ class OptionManager():
                     if ("custom_function_value" in objective_function):
                         objective_function_object["custom_function_value"].set(objective_function["custom_function_value"])
 
-                    objective_function_object["data"][0].set(objective_function["data"][0])
-                    objective_function_object["data"][1].set(objective_function["data"][1]) 
+                    objective_function_object["data_observed"].set(objective_function["data_observed"])
+                    objective_function_object["data_simulated"].set(objective_function["data_simulated"]) 
                     obj["objective_functions"].append(objective_function_object)
             
             self._data[self._mode_sv.get()]["steps"].append(obj)
@@ -221,12 +222,13 @@ class OptionManager():
                 "objective_function": sv(), 
                 "weight": sv(), 
                 "custom_function": sv(),
-                "data": (sv(), sv())}
+                "data_observed": sv(),
+                "data_simulated": sv()}
         obj["name"].set("ns")
         obj["objective_function"].set("ns")
         obj["weight"].set(1)
-        obj["data"][0].set("")
-        obj["data"][1].set("")
+        obj["data_observed"].set("")
+        obj["data_simulated"].set("")
         obj["custom_function"].set("") 
         
         self._data[self._mode_sv.get()]["steps"][step_index]["objective_functions"].append(obj)
@@ -243,12 +245,13 @@ class OptionManager():
                         "custom_function": sv(),
                         "custom_function_goal": sv(),
                         "custom_function_value": sv(),
-                        "data": (sv(), sv())}
+                        "data_observed": sv(),
+                        "data_simulated": sv()}
         new_object["name"].set(my_func["name"].get())
         new_object["objective_function"].set(my_func["objective_function"].get())
         new_object["weight"].set(my_func["weight"].get())
-        new_object["data"][0].set(my_func["data"][0].get())
-        new_object["data"][1].set(my_func["data"][1].get())
+        new_object["data_observed"].set(my_func["data_observed"].get())
+        new_object["data_simulated"].set(my_func["data_simulated"].get())
         new_object["custom_function"].set(my_func["custom_function"].get())
         new_object["custom_function_goal"].set(my_func["custom_function_goal"].get())
         new_object["custom_function_value"].set(my_func["custom_function_value"].get())

mgpsogui/gui/SetupTab/FunctionsList.py

@@ -105,13 +105,15 @@ class FunctionsList(CTkFrame):
 
                 row += 1
             
-            CTkLabel(self.containerFrame, text="Data:").grid(row=row, column=0, padx=(5, 5), pady=(5, 5), sticky="nsew")
+            CTkLabel(self.containerFrame, text="Observed and Simulated Data:").grid(row=row, column=0, columnspan=3, padx=(5, 5), pady=(5, 5), sticky="nsew")
             
             row += 1
-            for obj in func["data"]:
-                CTkEntry(self.containerFrame, textvariable=obj).grid(row=row, column=0, columnspan=3, padx=(5, 5), pady=(5, 5), sticky="nsew")
-                row += 1
             
+            CTkEntry(self.containerFrame, textvariable=func["data_observed"]).grid(row=row, column=0, columnspan=3, padx=(5, 5), pady=(5, 5), sticky="nsew")
+            row += 1
+            CTkEntry(self.containerFrame, textvariable=func["data_simulated"]).grid(row=row, column=0, columnspan=3, padx=(5, 5), pady=(5, 5), sticky="nsew")
+            row += 1
+
             if self.edit_mode:
                 remove_func = lambda index=index: (self.clear(), self.option_manager.remove_function(self.step_index, index), self.render())
                 dupe_func = lambda index=index: (self.clear(), self.option_manager.dupe_function(self.step_index, index), self.render())