mg-pso-gui 0.2.98__tar.gz → 0.2.100__tar.gz

{mg_pso_gui-0.2.98 → mg_pso_gui-0.2.100}/PKG-INFO

@@ -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 → mg_pso_gui-0.2.100}/mg_pso_gui.egg-info/PKG-INFO

@@ -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 → mg_pso_gui-0.2.100}/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"]

{mg_pso_gui-0.2.98 → mg_pso_gui-0.2.100}/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()]

{mg_pso_gui-0.2.98 → mg_pso_gui-0.2.100}/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")

{mg_pso_gui-0.2.98 → mg_pso_gui-0.2.100}/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)
 

{mg_pso_gui-0.2.98 → mg_pso_gui-0.2.100}/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

{mg_pso_gui-0.2.98 → mg_pso_gui-0.2.100}/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 = []

{mg_pso_gui-0.2.98 → mg_pso_gui-0.2.100}/setup.py

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