mg-pso-gui 0.2.98__py3-none-any.whl → 0.2.100__py3-none-any.whl

{mg_pso_gui-0.2.98.dist-info → mg_pso_gui-0.2.100.dist-info}/METADATA

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

{mg_pso_gui-0.2.98.dist-info → mg_pso_gui-0.2.100.dist-info}/RECORD

@@ -2,22 +2,22 @@ mgpsogui/__init__.py,sha256=q7AfBjeJABnFtbsZnsObpUwaXKPDVYtz46G6MKXLF74,42
 mgpsogui/mgpsogui.py,sha256=NIZmyNcbwC8EgSwf1ubdMUSJscrIEgoD4jLYziqHQ-k,148
 mgpsogui/start.yaml,sha256=ZjCVLb-MLqAxrGRm9kA7_SDpa-45EuKIELNQ2QqCAiU,4713
 mgpsogui/gui/HomePage.py,sha256=qnrbwfWKuSX6z2BEuRwLMfCe88WC55dFbBbvEe5PtFI,23626
-mgpsogui/gui/OptionManager.py,sha256=d-di4I9m9h0cPaKjnooTLf-QOqgIxYXbJma97EvP36I,21723
+mgpsogui/gui/OptionManager.py,sha256=DxbhmMuOJWuTf3HwgexqyypokD0DYrrsRyKs_GE_VVE,22465
 mgpsogui/gui/OptionManager_backup.py,sha256=TCWfPnHL2foN5id47jsi267lamRG6yGU6y_M29eOOJk,18530
 mgpsogui/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/General/NoticeWindow.py,sha256=HcTtaYKK4b7HognnoAHXiIHZWAXI80QfR8HM2dTLTV8,1866
-mgpsogui/gui/General/ParameterView.py,sha256=to57aODZOQXC52Pjcw_dYCRcf50WKj73SkLdb3i7wps,9493
+mgpsogui/gui/General/ParameterView.py,sha256=vLTmBEliBnHcwDUYCrnOWQvR887OyujVT8Lm-Y08qCQ,10071
 mgpsogui/gui/General/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/PlatformTab/PlatformTab.py,sha256=8J2Aa3Zrh1q9x07zZ0Ap9PgwHjeSKOYyj6wlxx40udw,10985
 mgpsogui/gui/PlatformTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/RunTab/OptimalParameterView.py,sha256=nliUEWA840cPBQt7wjiZ-L7uBOp_ozzJhyBkL08fJzI,1752
-mgpsogui/gui/RunTab/RunTab.py,sha256=47_r8K-e7f8zs93_2iPYnNBzHDHZejtedk7iSElkubU,5608
+mgpsogui/gui/RunTab/RunTab.py,sha256=_JWzDx5LT_uISw0Vnv-W2ypIeuKgoWqBnvFnvrLhNQA,5917
 mgpsogui/gui/RunTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/SetupTab/BoundsEditorWindow.py,sha256=U64oaiDIOaimjbqKMz5rQNq2o1SrQtrRHDdTYQ9ux1s,2870
-mgpsogui/gui/SetupTab/BoundsList.py,sha256=UyXKujyZ3zOhgaLpICzLx-pm5RYsQOkwagZ75z9w9Hc,15204
+mgpsogui/gui/SetupTab/BoundsList.py,sha256=bc1g2LLdmxkVk_Gnr-koxsxw8342IWFzpaDXu27pJD4,15231
 mgpsogui/gui/SetupTab/CustomFunctionEditorWindow.py,sha256=yx0dHSNa7fGy99Q6qFcI6j9r8p0DlV3iOBgyPMGd8pM,2884
 mgpsogui/gui/SetupTab/CustomFunctionMetrics.py,sha256=vOJpElbTgz043m6JYwe9xz_2MBHg985S6KdbJkJERW4,5923
-mgpsogui/gui/SetupTab/FunctionsList.py,sha256=LoHu5FESu6e_QRucNVm8tuSXLl1aLoGYd9r7WOKFTaY,7059
+mgpsogui/gui/SetupTab/FunctionsList.py,sha256=6oFS8qKF3OCtxNi5aY5Rj_ovM9nv4-vh-oT_CbhVTj4,7043
 mgpsogui/gui/SetupTab/ListEditor.py,sha256=nin7Pl8z7d_yfKoAxM-yVS34uhj-LnprJ2mNRSB7Z0A,3197
 mgpsogui/gui/SetupTab/ListParametersView.py,sha256=mkGaC5cXhEOy5oD0MbTyK9z7VGZp019oK2Y8Ay-n05Q,7460
 mgpsogui/gui/SetupTab/OverrideParameterMetrics.py,sha256=rBfaSitYDOajbHvyi2TfoXAHYlz1cCt028UVpIJ_Dc0,3369
@@ -48,7 +48,7 @@ mgpsogui/gui/images/trash.png,sha256=j8cf0kWbJd-4Jp20lUVV1o1NSeQ4v1Ej4gfcIA3DVRQ
 mgpsogui/gui/images/up.png,sha256=AQvFWCUqSQNaQ1E6LKZ9zNfSvW6t4mgy8uswdg9T2Hg,2457
 mgpsogui/gui/messages/welcome.txt,sha256=KzN_Zk3vaZeXx-G2KJmd5I7Q1_Shw62E9Fx8U4rQuUQ,5674
 mgpsogui/util/GraphGenerator.py,sha256=LHHDCvBuJQ0RYQm0azi5tC-etrZ1KLQh-tkahVurPSI,31990
-mgpsogui/util/PSORunner.py,sha256=MjK0xlKT88Pf5vk5U--xMnWJzqZGBAOR8n6AQMaYElc,15622
+mgpsogui/util/PSORunner.py,sha256=mTveURj8HGCwB5VHzvN9ELUhKtVzuynuQc8zJm4IFNs,15764
 mgpsogui/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/util/debug.py,sha256=Swzny9_1S-CCONWGssj9iDoSpbwu5Vr4f95g_9L8bec,19759
 mgpsogui/util/helpers.py,sha256=Ht2rge_4pGO7halz6KoLsL2eukB0k2tlkx68lBBmBA8,2669
@@ -73,8 +73,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.2.98.dist-info/METADATA,sha256=ekBafcNKgLuq4c_qlN4Mwmx_V17NXcQOzXXS0teTJ0M,9455
-mg_pso_gui-0.2.98.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-mg_pso_gui-0.2.98.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.2.98.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.2.98.dist-info/RECORD,,
+mg_pso_gui-0.2.100.dist-info/METADATA,sha256=gO9mSWuiVGxGJXQA-FQ5J4TTtNm6w1OyP8uBmSWLPi8,9456
+mg_pso_gui-0.2.100.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+mg_pso_gui-0.2.100.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.2.100.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.2.100.dist-info/RECORD,,

mgpsogui/gui/General/ParameterView.py

@@ -81,21 +81,32 @@ class ParameterView(CTkScrollableFrame):
                     hour = sv()
                     minute = sv()
                     second = sv()
-                    date_time = om_text_var.get().split(" ")
-                    vv = date_time[0].split("-")
-                    ss = date_time[1].split(":")
-                    year.set(vv[0])
-                    month.set(vv[1])
-                    day.set(vv[2])
-                    hour.set(ss[0])
-                    minute.set(ss[1])
-                    second.set(ss[2])
+
+                    year.set("2021")
+                    month.set("01")
+                    day.set("01")
+                    hour.set("00")
+                    minute.set("00")
+                    second.set("00")
+
+                    try:
+                        date_time = om_text_var.get().split(" ")
+                        vv = date_time[0].split("-")
+                        ss = date_time[1].split(":")
+                        year.set(vv[0])
+                        month.set(vv[1])
+                        day.set(vv[2])
+                        hour.set(ss[0])
+                        minute.set(ss[1])
+                        second.set(ss[2])
+                    except Exception as e:
+                        pass
                     year_options = [str(i) for i in range(1999, 2030)]
                     month_options = ["01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12"]
                     day_options = ["01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31"]
                     hour_options = [str(i) for i in range(0, 24)]
-                    minute_options = [str(i) for i in range(0, 60)]
-                    second_options = [str(i) for i in range(0, 60)]
+                    minute_options = [f"{i:02}" for i in range(0, 60)]
+                    second_options = [f"{i:02}" for i in range(0, 60)]
 
                     update_date = lambda om_text_var=om_text_var, year=year, month=month, day=day: om_text_var.set(f"{year.get()}-{month.get()}-{day.get()} {hour.get()}:{minute.get()}:{second.get()}")
 
@@ -120,10 +131,17 @@ class ParameterView(CTkScrollableFrame):
                     year = sv()
                     month = sv()
                     day = sv()
-                    vv = om_text_var.get().split("-")
-                    year.set(vv[0])
-                    month.set(vv[1])
-                    day.set(vv[2])
+                    year.set("2021")
+                    month.set("01")
+                    day.set("01")
+
+                    try:
+                        vv = om_text_var.get().split("-")
+                        year.set(vv[0])
+                        month.set(vv[1])
+                        day.set(vv[2])
+                    except Exception as e:
+                        pass
                     year_options = [str(i) for i in range(1999, 2030)]
                     month_options = ["01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12"]
                     day_options = ["01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31"]

mgpsogui/gui/OptionManager.py

@@ -370,6 +370,26 @@ class OptionManager():
 
     def copy_list(self, source_mode):
         self._data[self._mode_sv.get()] = self._data[source_mode]
+
+    def combine_steps(self):
+        mode = self._mode_sv.get()
+
+        obj = {"parameter_objects": [], 
+            "override_parameter": [],
+            "objective_functions": [], 
+            "name": sv(), 
+            "open": True}
+        obj["name"].set("Combined Group")
+
+        for step in self._data[mode]["steps"]:
+            for param in step["parameter_objects"]:
+                obj["parameter_objects"].append(param)
+            for objective_function in step["objective_functions"]:
+                obj["objective_functions"].append(objective_function)
+            for override in step["override_parameter"]:
+                obj["override_parameter"].append(override)
+            
+        self._data[mode]["steps"] = [obj]
             
     def get_data(self):
         return self._data[self._mode_sv.get()]

mgpsogui/gui/RunTab/RunTab.py

@@ -75,6 +75,10 @@ def create_tab(self, tab):
         self.option_manager.copy_list("Optimization")
         self.refresh_step_view(0)
 
+    def combine_steps():
+        self.option_manager.combine_steps()
+        self.refresh_step_view(0)
+
     def open_project_folder():
         # Open the file in the default program
         folder = self.option_manager.get_project_folder()
@@ -101,15 +105,18 @@ def create_tab(self, tab):
     self.optimization_copy = customtkinter.CTkButton(self.project_editor, text="From Optimization", command=copy_optim)
     self.optimization_copy.grid(row=4, column=0, padx=(20, 20), pady=(5, 10), sticky="ew")
 
-    customtkinter.CTkLabel(self.project_editor, text="Project Management:").grid(row=5, column=0, padx=(20, 20), pady=(5, 10), sticky="ew")
+    self.combine_steps = customtkinter.CTkButton(self.project_editor, text="Combine Groups", command=combine_steps)
+    self.combine_steps.grid(row=5, column=0, padx=(20, 20), pady=(5, 10), sticky="ew")
+
+    customtkinter.CTkLabel(self.project_editor, text="Project Management:").grid(row=6, column=0, padx=(20, 20), pady=(5, 10), sticky="ew")
 
     self.open_folder = customtkinter.CTkButton(self.project_editor, text="Open Project Folder", command=open_project_folder)
-    self.open_folder.grid(row=6, column=0, padx=(20, 20), pady=(5, 10), sticky="ew")
+    self.open_folder.grid(row=7, column=0, padx=(20, 20), pady=(5, 10), sticky="ew")
 
-    customtkinter.CTkLabel(self.project_editor, text="Project Name:").grid(row=7, column=0, padx=(20, 20), pady=(10, 5), sticky="ew")
+    customtkinter.CTkLabel(self.project_editor, text="Project Name:").grid(row=8, column=0, padx=(20, 20), pady=(10, 5), sticky="ew")
     self.project_name_label = customtkinter.CTkLabel(self.project_editor, text=self.option_manager.get_project_data()["name"])
-    self.project_name_label.grid(row=8, column=0, padx=(20, 20), pady=(5, 10), sticky="ew")
+    self.project_name_label.grid(row=9, column=0, padx=(20, 20), pady=(5, 10), sticky="ew")
 
-    customtkinter.CTkLabel(self.project_editor, text="Project Path:").grid(row=9, column=0, padx=(20, 20), pady=(10, 5), sticky="ew")
+    customtkinter.CTkLabel(self.project_editor, text="Project Path:").grid(row=10, column=0, padx=(20, 20), pady=(10, 5), sticky="ew")
     self.project_path_label = customtkinter.CTkLabel(self.project_editor, text=self.option_manager.get_project_data()["path"])
-    self.project_path_label.grid(row=10, column=0, padx=(20, 20), pady=(5, 10), sticky="ew")
+    self.project_path_label.grid(row=11, column=0, padx=(20, 20), pady=(5, 10), sticky="ew")

mgpsogui/gui/SetupTab/BoundsList.py

@@ -153,7 +153,7 @@ class BoundsList(CTkFrame):
                 self.validate_number(bounds_max.get(), cc, bounds_max)
                 tt2 = ctt(bounds_max, delay=0.1, alpha=0.95, message="...")
                 
-                if (bound_type == "list"):
+                if (bound_type == "list" and mode == "Optimization"):
                     def button_click_event(bound_index):
                         BEW(title="Edit List Bound", step_index=self.step_index, bound_index=bound_index, option_manager=self.option_manager)
 

mgpsogui/gui/SetupTab/FunctionsList.py

@@ -54,7 +54,7 @@ class FunctionsList(CTkFrame):
             
             CTkLabel(self.containerFrame, text="Name:").grid(row=row, column=0, padx=(5, 5), pady=(5, 5), sticky="nsew")
             CTkLabel(self.containerFrame, text="Objective:").grid(row=row, column=1, padx=(5, 5), pady=(5, 5), sticky="nsew")
-            if mode != "Sensitivity Analysis":
+            if mode == "Optimization":
                 CTkLabel(self.containerFrame, text="Weight:").grid(row=row, column=2, padx=(5, 5), pady=(5, 5), sticky="nsew")
             
             row += 1
@@ -82,7 +82,7 @@ class FunctionsList(CTkFrame):
             
             CTkEntry(self.containerFrame, textvariable=func["name"]).grid(row=row, column=0, padx=(5, 5), pady=(5, 5), sticky="ew")
             CTkOptionMenu(self.containerFrame, values=columns, variable=func["objective_function"], command=self.refresh).grid(row=row, column=1, padx=(5, 5), pady=(5, 5), sticky="ew")
-            if mode != "Sensitivity Analysis":
+            if mode == "Optimization":
                 CTkEntry(self.containerFrame, textvariable=func["weight"]).grid(row=row, column=2, padx=(5, 5), pady=(5, 5), sticky="ew")
             
             row += 1

mgpsogui/util/PSORunner.py

@@ -242,6 +242,8 @@ def run_sampling(data, mode, folder, results_queue):
     process_list(data, parameter_map, args, options, oh_strategy, config, metainfo, "service_parameters")
 
     output_steps = process_steps(data)
+    if len(output_steps) > 1:
+        output_steps = [output_steps[0]]
 
     trace_file = os.path.join(folder, 'results', mode + '_trace.csv')
     file_output_mode = data["sampling_output_mode"]
@@ -385,6 +387,8 @@ def run_sensitivity_analysis(data, folder, results_queue):
     trace_path = os.path.join(folder, 'results', 'trace.csv')
 
     output_steps = process_steps(data)
+    if len(output_steps) > 1:
+        output_steps = [output_steps[0]]
 
     # Get list of parameters from steps
     parameters = []