mg-pso-gui 0.2.11__tar.gz → 0.2.13__tar.gz

{mg_pso_gui-0.2.11 → mg_pso_gui-0.2.13}/PKG-INFO

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

{mg_pso_gui-0.2.11 → mg_pso_gui-0.2.13}/mg_pso_gui.egg-info/PKG-INFO

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

{mg_pso_gui-0.2.11 → mg_pso_gui-0.2.13}/mgpsogui/gui/OptionManager.py

@@ -139,7 +139,6 @@ class OptionManager():
                         "name": sv(), 
                         "min_bound": sv(),
                         "max_bound": sv(),
-                        "bounds": (sv(), sv()), 
                         "default_value": sv(), 
                         "optimal_value": sv(), 
                         "type": sv(),
@@ -194,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")
@@ -211,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)
@@ -222,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)
@@ -244,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())

{mg_pso_gui-0.2.11 → mg_pso_gui-0.2.13}/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, 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())

{mg_pso_gui-0.2.11 → mg_pso_gui-0.2.13}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import codecs
 import os
 
-VERSION = '0.2.11'
+VERSION = '0.2.13'
 DESCRIPTION = 'GUI for MG-PSO'
 LONG_DESCRIPTION = open('../README.md').read()