mg-pso-gui 0.1.236__tar.gz → 0.1.238__tar.gz

{mg_pso_gui-0.1.236 → mg_pso_gui-0.1.238}/PKG-INFO

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

{mg_pso_gui-0.1.236 → mg_pso_gui-0.1.238}/mg_pso_gui.egg-info/PKG-INFO

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

{mg_pso_gui-0.1.236 → mg_pso_gui-0.1.238}/mgpsogui/gui/SetupTab/OptimalParameterView.py

@@ -32,7 +32,7 @@ class OptimalParameterView(CTkScrollableFrame):
 
         for step in self.steps:
             
-            if self.mode != "Sampling: Halton":
+            if self.mode != "Sampling":
                 name = step['name'].get()
                 CTkLabel(self.containerFrame, text=name).grid(row=row, column=0, columnspan=1, padx=5, pady=5, sticky="")
                 row += 1
@@ -45,5 +45,5 @@ class OptimalParameterView(CTkScrollableFrame):
                 bb.configure(textvariable=param['optimal_value'])
                 row += 1
                 
-            if self.mode == "Sampling: Halton" or self.mode == "Sampling: Random":
+            if self.mode != "Optimization":
                 break

{mg_pso_gui-0.1.236 → mg_pso_gui-0.1.238}/mgpsogui/gui/SetupTab/StepView.py

@@ -120,10 +120,10 @@ class StepView(CTkScrollableFrame):
             self.sampling_method.grid(row=0, column=1, padx=(10, 10), pady=header_padding_y)
 
             self.logo_label2 = CTkLabel(self.file_selector_frame, text="Output:")
-            self.logo_label2.grid(row=0, column=0, padx=(20, 10), pady=header_padding_y)
+            self.logo_label2.grid(row=0, column=2, padx=(20, 10), pady=header_padding_y)
 
             self.output_method = CTkOptionMenu(self.file_selector_frame, values=["Replace", "Append"], width=50, variable=self.home_page.sampling_output)
-            self.output_method.grid(row=0, column=1, padx=(10, 10), pady=header_padding_y)
+            self.output_method.grid(row=0, column=3, padx=(10, 10), pady=header_padding_y)
 
             row += 1
 
@@ -157,7 +157,7 @@ class StepView(CTkScrollableFrame):
 
                 row += 1
 
-            if step['open'] or (self.mode == "Sampling"or self.mode == "Sensitivity Analysis"):
+            if step['open'] or (self.mode == "Sampling" or self.mode == "Sensitivity Analysis"):
                 bounds = BoundsList.BoundsList(
                     self.containerFrame, option_manager=self.option_manager, step_index=index)
                 bounds.grid(row=row, column=0, padx=(10, 10),
@@ -183,42 +183,3 @@ class StepView(CTkScrollableFrame):
             CTkButton(self.containerFrame, text="Add Group", command=self.create_new_step).grid(
                 row=row, columnspan=2, column=0, padx=(10, 10), pady=(10, 10), sticky="ew")
             
-        """
-        if (self.mode == "Sampling: Halton" or self.mode == "Sampling: Random" or self.mode == "Sensitivity Analysis"):
-            self.analysisFrame = CTkFrame(self)
-            self.analysisFrame.grid(row=2, column=0, columnspan=2, padx=(10, 10), pady=(10, 10), sticky="nsew")
-            self.analysisFrame.grid_columnconfigure((0, 1, 2), weight=1)
-
-            columns = ["n1", "n2", "n3", "n4", "n5", "n6", "n7", "n8", "n9", "n10"]
-
-            self.params_editor = ListEditor.ListEditor(self.analysisFrame, option_manager=self.option_manager, 
-                                                       title="Parameters",
-                                                       columns=columns,
-                                                       parameter_name="sensitivity_parameters",
-                                                       parameter_remove_func=self.option_manager.remove_sensitivity_parameter,
-                                                       parameter_add_func=self.option_manager.add_sensitivity_param)
-            self.params_editor.grid(row=0, column=0, padx=(10, 10), pady=(10, 0), sticky="nsew")
-            self.params_editor.grid_columnconfigure(0, weight=1)
-            self.params_editor.grid_rowconfigure(0, weight=1)
-
-
-            self.positive_editor = ListEditor.ListEditor(self.analysisFrame, option_manager=self.option_manager, 
-                                                       title="Positive Best Metrics",
-                                                       columns=columns,
-                                                       parameter_name="sensitivity_positiveBestMetrics",
-                                                       parameter_remove_func=self.option_manager.remove_sensitivity_positiveBestMetrics,
-                                                       parameter_add_func=self.option_manager.add_sensitivity_positiveBestMetrics)
-            self.positive_editor.grid(row=0, column=1, padx=(10, 10), pady=(10, 0), sticky="nsew")
-            self.positive_editor.grid_columnconfigure(0, weight=1)
-            self.positive_editor.grid_rowconfigure(0, weight=1)
-
-            self.negative_editor = ListEditor.ListEditor(self.analysisFrame, option_manager=self.option_manager, 
-                                                       title = "Zero Best Metrics",
-                                                       columns=columns,
-                                                       parameter_name="sensitivity_negativeBestMetrics",
-                                                       parameter_remove_func=self.option_manager.remove_sensitivity_negativeBestMetrics,
-                                                       parameter_add_func=self.option_manager.add_sensitivity_negativeBestMetrics)
-            self.negative_editor.grid(row=0, column=2, padx=(10, 10), pady=(10, 0), sticky="nsew")
-            self.negative_editor.grid_columnconfigure(0, weight=1)
-            self.negative_editor.grid_rowconfigure(0, weight=1)
-        """

{mg_pso_gui-0.1.236 → mg_pso_gui-0.1.238}/setup.py

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