mg-pso-gui 0.1.240__tar.gz → 0.1.242__tar.gz

{mg_pso_gui-0.1.240 → mg_pso_gui-0.1.242}/PKG-INFO

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

{mg_pso_gui-0.1.240 → mg_pso_gui-0.1.242}/mg_pso_gui.egg-info/PKG-INFO

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

{mg_pso_gui-0.1.240 → mg_pso_gui-0.1.242}/mgpsogui/gui/OptionManager.py

@@ -94,78 +94,81 @@ class OptionManager():
                     "open": False}
             obj["name"].set("Group " + str(len(self.steps) + 1))
             
-            for param in step["param"]:
-                param_obj = {
-                    "name": sv(), 
-                    "bounds": (sv(), sv()), 
-                    "default_value": sv(), 
-                    "optimal_value": sv(), 
-                    "type": sv(),
-                    "calibration_strategy": sv()
-                }
-                param_obj["name"].set(param["name"])
-                if "bounds" in param:
-                    param_obj["bounds"][0].set(param["bounds"][0])
-                    param_obj["bounds"][1].set(param["bounds"][1]) 
-                else: 
-                    param_obj["bounds"][0].set(0)
-                    param_obj["bounds"][1].set(1)
-                    
-                if "type" in param:
-                    param_obj["type"].set(param["type"])
-                else:
-                    param_obj["type"].set("float")
-                    
-                if "default_value" in param:
-                    param_obj["default_value"].set(param["default_value"])
-                else:
-                    param_obj["default_value"].set(1)
-                    
-                if "optimal_value" in param:
-                    param_obj["optimal_value"].set(param["optimal_value"])
-                else:
-                    param_obj["optimal_value"].set(0)
-                    
-                if "calibration_strategy" in param:
-                    param_obj["calibration_strategy"].set(param["calibration_strategy"])
-                else:
-                    param_obj["calibration_strategy"].set("none")
-                    
-                obj["param"].append(param_obj)
+            if "param" in step:
+                for param in step["param"]:
+                    param_obj = {
+                        "name": sv(), 
+                        "bounds": (sv(), sv()), 
+                        "default_value": sv(), 
+                        "optimal_value": sv(), 
+                        "type": sv(),
+                        "calibration_strategy": sv()
+                    }
+                    param_obj["name"].set(param["name"])
+                    if "bounds" in param:
+                        param_obj["bounds"][0].set(param["bounds"][0])
+                        param_obj["bounds"][1].set(param["bounds"][1]) 
+                    else: 
+                        param_obj["bounds"][0].set(0)
+                        param_obj["bounds"][1].set(1)
+                        
+                    if "type" in param:
+                        param_obj["type"].set(param["type"])
+                    else:
+                        param_obj["type"].set("float")
+                        
+                    if "default_value" in param:
+                        param_obj["default_value"].set(param["default_value"])
+                    else:
+                        param_obj["default_value"].set(1)
+                        
+                    if "optimal_value" in param:
+                        param_obj["optimal_value"].set(param["optimal_value"])
+                    else:
+                        param_obj["optimal_value"].set(0)
+                        
+                    if "calibration_strategy" in param:
+                        param_obj["calibration_strategy"].set(param["calibration_strategy"])
+                    else:
+                        param_obj["calibration_strategy"].set("none")
+                        
+                    obj["param"].append(param_obj)
             
-            for override in step["overrideparam"]:
-                override_obj = {"name": sv(), "value": sv()}
-                override_obj['name'].set(override['name'])
-                override_obj['value'].set(override['value'])
-                obj['overrideparam'].append(override_obj)
+            if "overrideparam" in step:
+                for override in step["overrideparam"]:
+                    override_obj = {"name": sv(), "value": sv()}
+                    override_obj['name'].set(override['name'])
+                    override_obj['value'].set(override['value'])
+                    obj['overrideparam'].append(override_obj)
 
-            for objfunc in step["objfunc"]:
-                objfunc_obj = {"name": sv(), 
-                                "of": sv(), 
-                                "weight": sv(), 
-                                "custom_function": sv(),
-                                "custom_function_goal": sv(),
-                                "custom_function_value": sv(),
-                                "data": (sv(), sv())}
-                objfunc_obj["name"].set(objfunc["name"])
-                objfunc_obj["of"].set(objfunc["of"])
-                objfunc_obj["custom_function_goal"].set("Positive Best")
-                
-                if ("weight" in objfunc): 
-                    objfunc_obj["weight"].set(objfunc["weight"])
-                else:
-                    objfunc_obj["weight"].set(1)
+            if "objfunc" in step:
+                for objfunc in step["objfunc"]:
+                    objfunc_obj = {"name": sv(), 
+                                    "of": sv(), 
+                                    "weight": sv(), 
+                                    "custom_function": sv(),
+                                    "custom_function_goal": sv(),
+                                    "custom_function_value": sv(),
+                                    "data": (sv(), sv())}
+                    objfunc_obj["name"].set(objfunc["name"])
+                    objfunc_obj["of"].set(objfunc["of"])
+                    objfunc_obj["custom_function_goal"].set("Positive Best")
                     
-                if ("custom_function" in objfunc):
-                    objfunc_obj["custom_function"].set(objfunc["custom_function"])
-                if ("custom_function_goal" in objfunc):
-                    objfunc_obj["custom_function_goal"].set(objfunc["custom_function_goal"])
-                if ("custom_function_value" in objfunc):
-                    objfunc_obj["custom_function_value"].set(objfunc["custom_function_value"])
+                    if ("weight" in objfunc): 
+                        objfunc_obj["weight"].set(objfunc["weight"])
+                    else:
+                        objfunc_obj["weight"].set(1)
+                        
+                    if ("custom_function" in objfunc):
+                        objfunc_obj["custom_function"].set(objfunc["custom_function"])
+                    if ("custom_function_goal" in objfunc):
+                        objfunc_obj["custom_function_goal"].set(objfunc["custom_function_goal"])
+                    if ("custom_function_value" in objfunc):
+                        objfunc_obj["custom_function_value"].set(objfunc["custom_function_value"])
 
-                objfunc_obj["data"][0].set(objfunc["data"][0])
-                objfunc_obj["data"][1].set(objfunc["data"][1]) 
-                obj["objfunc"].append(objfunc_obj)
+                    objfunc_obj["data"][0].set(objfunc["data"][0])
+                    objfunc_obj["data"][1].set(objfunc["data"][1]) 
+                    obj["objfunc"].append(objfunc_obj)
             
             self.steps.append(obj)
     

{mg_pso_gui-0.1.240 → mg_pso_gui-0.1.242}/mgpsogui/gui/SetupTab/OverrideParameterWindow.py

@@ -14,7 +14,6 @@ class OverrideParameterWindow(CTkInputDialog):
 
     def __init__(self, *args,
                  step_index: 0,
-                 function_index: 0,
                  option_manager: None,
                  **kwargs):
         super().__init__(*args, **kwargs)
@@ -22,7 +21,6 @@ class OverrideParameterWindow(CTkInputDialog):
         self.geometry("400x800")
         
         self.step_index = step_index
-        self.function_index = function_index  
         self.option_manager = option_manager
         self.bounds = None
 

{mg_pso_gui-0.1.240 → mg_pso_gui-0.1.242}/setup.py

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