mg-pso-gui 0.1.236__py3-none-any.whl → 0.1.238__py3-none-any.whl

{mg_pso_gui-0.1.236.dist-info → mg_pso_gui-0.1.238.dist-info}/METADATA

@@ -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.dist-info → mg_pso_gui-0.1.238.dist-info}/RECORD

@@ -16,10 +16,10 @@ mgpsogui/gui/SetupTab/CustomFunctionMetrics.py,sha256=hAVZSJMgHEQYrFsgUUnil17pWM
 mgpsogui/gui/SetupTab/FunctionsList.py,sha256=cMBv87GeRACiJ1DPxFrPvZJOZ3fK6FUVAeUaQCR9dn0,6375
 mgpsogui/gui/SetupTab/ListEditor.py,sha256=vlP0KDPu8J1_6KXuUTlE7OClgfF0Qk6cISsFm_SglUw,3232
 mgpsogui/gui/SetupTab/ListParametersView.py,sha256=wYcDcaooYkw-y7XW6dJUwhTWxLuUUOK5tGUFVHBf3ck,7352
-mgpsogui/gui/SetupTab/OptimalParameterView.py,sha256=VKn-4BlVyqspFIOkbWsM0q9pYVsmqnSND0xP2hDKb60,1785
+mgpsogui/gui/SetupTab/OptimalParameterView.py,sha256=H92S6ioJI2iTjFBspEzyDxluagCEgfFSW5AkqQFO-l8,1738
 mgpsogui/gui/SetupTab/SetupTab.py,sha256=NmCPb9tGVJmUy1HG3G26y5RibtVZNeN9XFyomVnageQ,2792
 mgpsogui/gui/SetupTab/StaticParameterView.py,sha256=iEG-UpBBlAJabZo3MG768oLqOROjUPc23tKOSd47IUc,2739
-mgpsogui/gui/SetupTab/StepView.py,sha256=fMGoZQrXLFVI3kIyXQdtjVILYn_mMDUHyr0qr-Yl4Vk,11593
+mgpsogui/gui/SetupTab/StepView.py,sha256=UQNLRxCEQQPvdW5UIT703TnmEfnjgchGIBFnCg4K3Zs,8557
 mgpsogui/gui/SetupTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/VisualizeTab/MatrixEditor.py,sha256=JPQmfljdddIwHtTKpFqUdk7hRzVdX-IKl4neOk3DsjM,3132
 mgpsogui/gui/VisualizeTab/SideBar.py,sha256=MtZfDScNFN0fQ8DyPm6bZGJSrFRgT14fZeUq-qc61O8,21936
@@ -62,8 +62,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.1.236.dist-info/METADATA,sha256=ccRtxnxslVSqg7xiqzr7-xSmZ95Tzl1160LDGKTEggg,9456
-mg_pso_gui-0.1.236.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-mg_pso_gui-0.1.236.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.1.236.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.1.236.dist-info/RECORD,,
+mg_pso_gui-0.1.238.dist-info/METADATA,sha256=DDFVWtKZM0BjIudidqlVoQ8bUryUEt-jfj_tt14YbpI,9456
+mg_pso_gui-0.1.238.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+mg_pso_gui-0.1.238.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.1.238.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.1.238.dist-info/RECORD,,

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

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)
-        """