mg-pso-gui 0.2.61__tar.gz → 0.2.62__tar.gz

{mg_pso_gui-0.2.61 → mg_pso_gui-0.2.62}/PKG-INFO

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

{mg_pso_gui-0.2.61 → mg_pso_gui-0.2.62}/mg_pso_gui.egg-info/PKG-INFO

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

{mg_pso_gui-0.2.61 → mg_pso_gui-0.2.62}/mgpsogui/gui/SetupTab/BoundsList.py

@@ -62,6 +62,8 @@ class BoundsList(CTkFrame):
         index = 0
         
         self.tooltip_list = []
+
+        mode = self.option_manager.get_mode()
         
         self.containerFrame = CTkFrame(self, fg_color="transparent")
         self.containerFrame.grid(row=0, column=0, padx=(5, 5), pady=(5, 5), sticky="nsew")
@@ -71,9 +73,13 @@ class BoundsList(CTkFrame):
         
         CTkLabel(self.containerFrame, text="Type:").grid(row=row, column=0, padx=(5, 5), pady=(5, 5), sticky="nsew")
         CTkLabel(self.containerFrame, text="Name:").grid(row=row, column=1, padx=(5, 5), pady=(5, 5), sticky="nsew")
-        CTkLabel(self.containerFrame, text="Bounds:").grid(row=row, column=2, columnspan=2, padx=(5, 5), pady=(5, 5), sticky="nsew")
-        CTkLabel(self.containerFrame, text="Default:").grid(row=row, column=4, padx=(5, 5), pady=(5, 5), sticky="nsew")
-        CTkLabel(self.containerFrame, text="Strategy:").grid(row=row, column=5, padx=(5, 5), pady=(5, 5), sticky="nsew")
+
+        if mode != "Sensitivity Analysis":
+            CTkLabel(self.containerFrame, text="Bounds:").grid(row=row, column=2, columnspan=2, padx=(5, 5), pady=(5, 5), sticky="nsew")
+
+            if mode == "Optimization":
+                CTkLabel(self.containerFrame, text="Default:").grid(row=row, column=4, padx=(5, 5), pady=(5, 5), sticky="nsew")
+                CTkLabel(self.containerFrame, text="Strategy:").grid(row=row, column=5, padx=(5, 5), pady=(5, 5), sticky="nsew")
         row += 1
         
         bounds = self.option_manager.get_steps()[self.step_index]["parameter_objects"]
@@ -112,6 +118,12 @@ class BoundsList(CTkFrame):
                 bb.grid(row=row, column=2, padx=(5, 5), pady=(5, 5), sticky="new")
                 ctt(bb, delay=0.1, alpha=0.95, message="Delete this bound...")
             else:
+                
+                if mode == "Sensitivity Analysis":
+                    row += 1
+                    index += 1
+                    continue
+
                 bounds_min = CTkEntry(self.containerFrame)
                 vcmd = (self.register(self.validate_number), '%P', cc, bounds_min)
                 bounds_min.grid(row=row, column=2, padx=(5, 5), pady=(5, 5), sticky="new")
@@ -125,6 +137,11 @@ class BoundsList(CTkFrame):
                 self.validate_number(bounds_max.get(), cc, bounds_max)
                 tt2 = ctt(bounds_max, delay=0.1, alpha=0.95, message="...")
                 
+                if mode == "Sampling: Random" or mode == "Sampling: Halton":
+                    row += 1
+                    index += 1
+                    continue
+
                 default_value = CTkEntry(self.containerFrame)
                 default_value.grid(row=row, column=4, padx=(5, 5), pady=(5, 5), sticky="new")
                 default_value.configure(textvariable=bound["default_value"])

{mg_pso_gui-0.2.61 → mg_pso_gui-0.2.62}/setup.py

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