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

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

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

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

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

{mg_pso_gui-0.1.233 → mg_pso_gui-0.1.236}/mgpsogui/gui/HomePage.py

@@ -74,6 +74,15 @@ class App(customtkinter.CTk):
 		self.open_file = "None"
 		self.csv_data = None
 
+		self.sensitivity_file = tk.StringVar()
+		self.sensitivity_file.set("No files found...")
+
+		self.sampling_method = tk.StringVar()
+		self.sampling_method.set("Halton")
+
+		self.sampling_output = tk.StringVar()
+		self.sampling_output.set("Replace")
+
 		self.selected_csv2 = tk.StringVar()
 		self.selected_csv2.set("No files found...")
 		self.open_file2 = "None"
@@ -240,7 +249,7 @@ class App(customtkinter.CTk):
 		mode = self.option_manager.get_arguments()['mode'].get()
 		self.service_url.configure(textvariable=self.option_manager.get_arguments()['urls'][mode])
 
-		if mode == "Optimization: MG-PSO":
+		if mode == "Optimization":
 			self.test_button.configure(state="normal")
 			self.test_button.configure(fg_color=get_color("CTkButton"))
 			self.download_button.configure(state="normal")
@@ -378,6 +387,8 @@ class App(customtkinter.CTk):
 					param['default_value'] = param['optimal_value']
 		self.testing = False
 
+		metrics["sensitivity_analysis_path"] = self.sensitivity_file.get()
+
 		self.progress_data = None
 		self.calibration_data = None
 
@@ -569,7 +580,7 @@ class App(customtkinter.CTk):
 				
 		# Parse data into interface
 		mode = self.option_manager.get_arguments()['mode'].get()
-		if mode == "Optimization: MG-PSO":
+		if mode == "Optimization":
 			if (os.path.exists(os.path.join(folder, 'error.txt'))):
 				data = hp.parse_pso_error(os.path.join(folder, 'error.txt'), len(self.option_manager.get_steps()))
 				print(data)

{mg_pso_gui-0.1.233 → mg_pso_gui-0.1.236}/mgpsogui/gui/OptionManager.py

@@ -22,7 +22,7 @@ class OptionManager():
         self.steps = []
         self.service_parameters = {}
 
-        self.service_modes = ["Sampling: Halton", "Sampling: Random", "Sensitivity Analysis", "Optimization: MG-PSO"]
+        self.service_modes = ["Sampling", "Sensitivity Analysis", "Optimization"]
         for mode in self.service_modes:
             self.arguments["urls"][mode] = sv()
 
@@ -32,7 +32,7 @@ class OptionManager():
         self.arguments['url'].set("")
         for mode in self.service_modes:
             self.arguments["urls"][mode].set("")
-        self.arguments['mode'].set("Optimization: MG-PSO")
+        self.arguments['mode'].set("Optimization")
         self.arguments['files'] = {}
         self.arguments['calibration_parameters'].clear()
         self.arguments['figure_parameters'].clear()

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

@@ -24,6 +24,7 @@ class StepView(CTkScrollableFrame):
         self.option_manager = option_manager
         self.analysisFrame = None
         self.containerFrame = None
+        self.home_page = home_page
 
         self.render()
 
@@ -90,18 +91,39 @@ class StepView(CTkScrollableFrame):
 
             if len(files) == 0:
                 files = ["      No CSV files found! Run sampling first!       "]
+            elif self.home_page.sensitivity_file.get() not in files:
+                self.home_page.sensitivity_file.set(files[0])
 
             header_padding_x = (5, 5)
             header_padding_y = (10, 10)
 
-            self.file_selector_frame = CTkFrame(self.containerFrame, corner_radius=0)
+            self.file_selector_frame = CTkFrame(self.containerFrame)
             self.file_selector_frame.grid(row=0, column=0, sticky="nsew", columnspan=2)
             self.logo_label = CTkLabel(self.file_selector_frame, text="Select File:")
-            self.logo_label.grid(row=0, column=0, padx=(20, 10), pady=header_padding_y)
+            self.logo_label.grid(row=0, column=0, padx=(10, 10), pady=header_padding_y)
             
-            self.file_selector = CTkOptionMenu(self.file_selector_frame, values=files, width=50)
-            self.file_selector.grid(row=0, column=1, padx=(5, 80), pady=header_padding_y)
-            self.file_selector.set(files[0])
+            self.file_selector = CTkOptionMenu(self.file_selector_frame, values=files, width=50, variable=self.home_page.sensitivity_file)
+            self.file_selector.grid(row=0, column=1, padx=(10, 10), pady=header_padding_y)
+
+            row += 1
+
+        if (self.mode == "Sampling"):
+            header_padding_x = (5, 5)
+            header_padding_y = (10, 10)
+
+            self.file_selector_frame = CTkFrame(self.containerFrame)
+            self.file_selector_frame.grid(row=0, column=0, sticky="nsew", columnspan=2)
+            self.logo_label = CTkLabel(self.file_selector_frame, text="Sampling Method:")
+            self.logo_label.grid(row=0, column=0, padx=(10, 10), pady=header_padding_y)
+            
+            self.sampling_method = CTkOptionMenu(self.file_selector_frame, values=["Halton", "Random"], width=50, variable=self.home_page.sampling_method)
+            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.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)
 
             row += 1
 
@@ -120,7 +142,7 @@ class StepView(CTkScrollableFrame):
             down_func = lambda index=index: (self.clear(), self.option_manager.move_step_down(index), self.render())
             remove_func = lambda index=index: (self.clear(), self.option_manager.remove_step(index), self.render())
             
-            if (self.mode == "Optimization: MG-PSO"):
+            if (self.mode == "Optimization"):
                 button_container = CTkFrame(self.containerFrame, width=200)
                 button_container.grid(row=row, column=1, sticky="nse", padx=(10, 10), pady=(10, 10))
                 button_container.grid_rowconfigure(0, weight=1)
@@ -135,7 +157,7 @@ class StepView(CTkScrollableFrame):
 
                 row += 1
 
-            if step['open'] or (self.mode == "Sampling: Halton" or self.mode == "Sampling: Random" 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),
@@ -153,11 +175,11 @@ class StepView(CTkScrollableFrame):
             row += 1
             index += 1
             
-            if (self.mode != "Optimization: MG-PSO"):
+            if (self.mode != "Optimization"):
                 break
 
         # Create an "Add step button that is centered
-        if (self.mode == "Optimization: MG-PSO" or len(self.steps) == 0):
+        if (self.mode == "Optimization" or len(self.steps) == 0):
             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")
             

{mg_pso_gui-0.1.233 → mg_pso_gui-0.1.236}/mgpsogui/util/PSORunner.py

@@ -76,7 +76,7 @@ def run_process(stdout_queue, stderr_queue, results_queue, data, folder):
 
         config = {}
 
-        if my_mode == "Sampling: Halton" or my_mode == "Sampling: Random":
+        if my_mode == "Sampling":
             config = {
                 'service_timeout': int(calibration_map['service_timeout']),
                 'http_retry': int(calibration_map['http_retry']),
@@ -86,7 +86,7 @@ def run_process(stdout_queue, stderr_queue, results_queue, data, folder):
                 'read_timeout': int(calibration_map['read_timeout']),
                 'step_trace': os.path.join(folder, 'pso_step_trace.json')
             }
-        elif my_mode == "Optimization: MG-PSO":
+        elif my_mode == "Optimization":
             config = {
                 'service_timeout': int(calibration_map['service_timeout']),
                 'http_retry': int(calibration_map['http_retry']),
@@ -139,11 +139,11 @@ def run_process(stdout_queue, stderr_queue, results_queue, data, folder):
             print(trace, flush=True)
             print("\n", flush=True)
 
-        elif my_mode == "Sensitivity: Halton":
+        elif my_mode == "Sensitivity Analysis":
             
-            print("Running Halton Sensitivity Analysis", flush=True)
+            print("Running Sensitivity Analysis", flush=True)
 
-            shutil.copyfile(os.path.join(folder, 'results', 'halton_trace.csv'), os.path.join(folder, 'results', 'trace.csv'))
+            shutil.copyfile(data["sensitivity_analysis_path"], os.path.join(folder, 'results', 'trace.csv'))
             trace_path = os.path.join(folder, 'results', 'trace.csv')
 
             # Get list of parameters from steps
@@ -185,53 +185,6 @@ def run_process(stdout_queue, stderr_queue, results_queue, data, folder):
 
             sensitivity_analysis(args['url'], request_path, trace_path, output_directory)
 
-            print("Finished Sensitivity Analysis", flush=True)
-        elif my_mode == "Sensitivity: Random":
-            
-            print("Running Random Sensitivity Analysis", flush=True)
-
-            shutil.copyfile(os.path.join(folder, 'results', 'random_trace.csv'), os.path.join(folder, 'results', 'trace.csv'))
-            trace_path = os.path.join(folder, 'results', 'trace.csv')
-            
-            # Get list of parameters from steps
-            parameters = []
-            for param in steps[0]['param']:
-                parameters.append(param['name'])
-
-            request_json = {
-                "metainfo": {
-                    "service_url": None,
-                    "description": "",
-                    "name": "",
-                    "mode": "async"
-                },
-                "parameter": [
-                    {
-                    "name": "parameters",
-                    "value": parameters
-                    },
-                    {
-                    "name": "positiveBestMetrics",
-                    "value": ["ns","kge","mns","kge09","nslog2"]
-                    },
-                    {
-                    "name": "zeroBestMetrics",
-                    "value": ["pbias","rmse"]
-                    }
-                ]
-            }
-            
-            with open(os.path.join(folder, 'results', 'request.json'), 'w') as json_file:
-                json.dump(request_json, json_file, indent=4)
-
-            request_path = os.path.join(folder, 'results', 'request.json')
-
-            output_directory = os.path.join(folder, 'results')
-
-            print("Starting ", args['url'], request_path, trace_path, output_directory, flush=True)
-
-            sensitivity_analysis(args['url'], request_path, trace_path, output_directory)
-
             print("Finished Sensitivity Analysis", flush=True)
         else:
             print("Running MG-PSO Optimization...\n", flush=True)

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

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