mg-pso-gui 0.1.116__tar.gz → 0.1.119__tar.gz

{mg-pso-gui-0.1.116 → mg-pso-gui-0.1.119}/PKG-INFO

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

{mg-pso-gui-0.1.116 → mg-pso-gui-0.1.119}/mg_pso_gui.egg-info/PKG-INFO

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

{mg-pso-gui-0.1.116 → mg-pso-gui-0.1.119}/mgpsogui/gui/HomePage.py

@@ -1,4 +1,4 @@
-#!/usr/local/bin/python3.9
+#!/usr/local/bin/python3.10
 
 import os 
 import time
@@ -69,7 +69,7 @@ class App(customtkinter.CTk):
 		self.selected_csv.set("No files found...")
 		self.open_file = "None"
 		self.csv_data = None
-  
+
 		self.selected_csv2 = tk.StringVar()
 		self.selected_csv2.set("No files found...")
 		self.open_file2 = "None"
@@ -98,7 +98,7 @@ class App(customtkinter.CTk):
 		self.progress_data = None
 		self.calibration_data = None
 		self.testing = False
-  
+
 		# configure window
 		self.title("CSIP PSO")
 		self.geometry(f"{1920}x{1080}")
@@ -128,19 +128,23 @@ class App(customtkinter.CTk):
 		refresh_image = customtkinter.CTkImage(Image.open(os.path.join("./images", "refresh.png")), size=(20, 20))
 		self.refresh_button = customtkinter.CTkButton(self.sidebar_frame, text=None, width=30, image=refresh_image, command=self.load)
 		ctt(self.refresh_button, delay=0.1, alpha=0.95, message="Connect to Service")
-		self.refresh_button.grid(row=0, column=5, padx=(5, 80), pady=header_padding_y)
+		self.refresh_button.grid(row=0, column=5, padx=header_padding_x, pady=header_padding_y)
+
+		self.algorithm_optionmenu = customtkinter.CTkOptionMenu(self.sidebar_frame, variable=self.option_manager.get_arguments()['mode'], values=["Optimization: MG-PSO", "Sampling: Halton", "Sampling: Random"], width=50, command=self.refresh_step_view)
+		self.algorithm_optionmenu.grid(row=0, column=6, padx=(5, 80), pady=header_padding_y)
+		self.algorithm_optionmenu.set("Optimization: MG-PSO")
 		
 		self.scaling_label = customtkinter.CTkLabel(self.sidebar_frame, text="Scale:", anchor="w")
-		self.scaling_label.grid(row=0, column=6, padx=header_padding_x, pady=header_padding_y)
+		self.scaling_label.grid(row=0, column=7, padx=header_padding_x, pady=header_padding_y)
 		self.scaling_optionemenu = customtkinter.CTkOptionMenu(self.sidebar_frame, values=["50%", "75%", "100%", "125%", "150%", "175%", "200%"], width=60,
-															   command=self.change_scaling_event)
-		self.scaling_optionemenu.grid(row=0, column=7, padx=header_padding_x, pady=header_padding_y)
+																command=self.change_scaling_event)
+		self.scaling_optionemenu.grid(row=0, column=8, padx=header_padding_x, pady=header_padding_y)
 		self.scaling_optionemenu.set("100%")
 		
 		expand_image = customtkinter.CTkImage(Image.open(os.path.join("./images", "expand.png")), size=(20, 20))
 		self.new_window = customtkinter.CTkButton(self.sidebar_frame, text=None, width=30, image=expand_image, command=self.open_new_window)
 		ctt(self.new_window, delay=0.1, alpha=0.95, message="Open New Window")
-		self.new_window.grid(row=0, column=8, padx=(5, 20), pady=header_padding_y)
+		self.new_window.grid(row=0, column=9, padx=(5, 20), pady=header_padding_y)
 		
 		self.tabview = customtkinter.CTkTabview(self, bg_color="transparent", fg_color="transparent")
 		self.tabview.grid(row=1, column=0, padx=(0, 0), pady=(10, 10), sticky="nsew")
@@ -148,15 +152,11 @@ class App(customtkinter.CTk):
 		tab2 = "Setup"
 		tab3 = "Logs"
 		tab4 = "Results"
-		#tab5 = "Results"
 		
 		self.tabview.add(tab1)
 		self.tabview.add(tab2)
 		self.tabview.add(tab4)
 		self.tabview.add(tab3)
-		#self.tabview.add(tab5)
-		
-		#self.tabview.configure(state="disabled")
 		
 		pt.create_tab(self, self.tabview.tab(tab1))
 		st.create_tab(self, self.tabview.tab(tab2))
@@ -173,10 +173,6 @@ class App(customtkinter.CTk):
 		self.footer_progress_bar = customtkinter.CTkProgressBar(self.footer_frame)
 		self.footer_progress_bar.grid(row=0, column=4, padx=(50, 100), pady=header_padding_y, sticky="ew")
 		self.footer_progress_bar.set(0)
-		
-		self.algorithm_optionmenu = customtkinter.CTkOptionMenu(self.footer_frame, variable=self.option_manager.get_arguments()['mode'], values=["PSO", "Halton"], width=50, command=self.refresh_step_view)
-		self.algorithm_optionmenu.grid(row=0, column=6, padx=header_padding_x, pady=header_padding_y)
-		self.algorithm_optionmenu.set("PSO")
 
 		play_image = customtkinter.CTkImage(Image.open(os.path.join("./images", "play.png")), size=(20, 20))
 		self.run_button = customtkinter.CTkButton(self.footer_frame, text=None, width=30, image=play_image, command=self.run)
@@ -203,55 +199,10 @@ class App(customtkinter.CTk):
 	def update_graph(self, value):
 		self.vis_sidebar.refresh()
 		GraphGenerator.generate_graphs(self)
-
-	'''def _resize_image(self, event):
-		self.graph_label.update_idletasks()
-		new_width = self.graph_label.winfo_width()
-		new_height = self.graph_label.winfo_height()
-		
-		alt_width = new_height * 1.77778
-		alt_height = new_width / 1.77778
-		
-		if (new_width < new_height):
-			new_height = alt_height
-		else:
-			new_width = alt_width
-		
-		self.image_width = new_width
-		self.image_height = new_height
-		
-		self.graph_image = customtkinter.CTkImage(self.graph_image_obj, size=(new_width, new_height))
-		self.graph_label.configure(image=self.graph_image)
-		self.graph_label.update_idletasks()
-			
-   
-	def update_graph(self, value):
-		selected_graph = self.graph_selector_value.get()
-		info = self.option_manager.get_project_data()
-		folder = os.path.join(info['path'], info['name'])
-		
-		if not os.path.exists(folder):
-			os.makedirs(folder)
-		
-		if (selected_graph == "Best Cost Stacked"):
-			self.selected_graph_name = "best_cost_stacked"
-		elif (selected_graph == "Best Cost by Round"):
-			self.selected_graph_name = "best_cost_by_round"
-		elif (selected_graph == "Iteration Table"):
-			self.selected_graph_name = "table"
-		elif (selected_graph == "Calibrated Parameters"):
-			self.selected_graph_name = "calibrated_params_by_round"
-
-		image_path = os.path.join(folder, self.selected_graph_name + ".png")
-		if not os.path.exists(image_path):
-			image_path = os.path.join("./images", "up.png")
-		self.graph_image_obj = Image.open(image_path)
-		self.graph_image = customtkinter.CTkImage(self.graph_image_obj, size=(self.image_width * self.image_scale, self.image_height * self.image_scale))
-		self.graph_label.configure(image=self.graph_image)'''
 			
 	def save_project(self):
 		metrics = self.option_manager.get_metrics()
-  
+
 		# Add the calibration_progress dataframe to the json
 		if (self.progress_data is not None):
 			metrics["calibration_progress"] = self.progress_data.to_json()
@@ -279,7 +230,7 @@ class App(customtkinter.CTk):
 		self.steps_frame.render()
 		self.optimal_param_frame.clear()
 		self.optimal_param_frame.render()
- 
+
 	def open_new_window(self):
 		# Shell out and run ./main.py
 		subprocess.Popen(["python3", "../mgpsogui.py"])
@@ -389,7 +340,7 @@ class App(customtkinter.CTk):
 	def run_test(self):
 		self.testing = True
 		self.run()	
-  
+
 	def run(self):
 		metrics = self.option_manager.get_metrics()
 		self.running_config = metrics
@@ -400,7 +351,7 @@ class App(customtkinter.CTk):
 				for param in step['param']:
 					param['default_value'] = param['optimal_value']
 		self.testing = False
-  
+
 		self.progress_data = None
 		self.calibration_data = None
 
@@ -525,10 +476,10 @@ class App(customtkinter.CTk):
 				trace = results_queue.get_nowait()
 				
 				print("TRACE " + str(trace), flush=True)
-    
+	
 				final_results = hp.extract_final_round_values(trace)
 				print("Final results: " + str(final_results), flush=True)
-    
+	
 				all_steps = self.option_manager.get_steps()
 				data = final_results["data"]
 				index = 0
@@ -560,6 +511,7 @@ class App(customtkinter.CTk):
 				print(new_characters, end="")
 				
 			try:
+				# REPLACE THIS WITH READING THE STEP TRACE JSON for PSO
 				with open(os.path.join(folder, "output.txt"), "r") as f:
 					text = f.read()
 

{mg-pso-gui-0.1.116 → mg-pso-gui-0.1.119}/mgpsogui/gui/OptionManager.py

@@ -20,7 +20,7 @@ class OptionManager():
     def clear(self):
         self.arguments['param'].clear()
         self.arguments['url'].set("")
-        self.arguments['mode'].set("PSO")
+        self.arguments['mode'].set("Optimization: MG-PSO")
         self.arguments['files'] = {}
         self.arguments['calibration_parameters'].clear()
         self.steps = []

{mg-pso-gui-0.1.116 → mg-pso-gui-0.1.119}/mgpsogui/gui/SetupTab/OptimalParameterView.py

@@ -28,16 +28,11 @@ class OptimalParameterView(CTkScrollableFrame):
         self.containerFrame.grid_columnconfigure((0, 1), weight=1)
         
         self.mode = self.option_manager.get_arguments()['mode'].get()
-        
-        #CTkLabel(self.containerFrame, text="Name:").grid(row=row, column=0, columnspan=1, padx=5, pady=5, sticky="")
-        #CTkLabel(self.containerFrame, text="Value:").grid(row=row, column=1, columnspan=1, padx=5, pady=5, sticky="")
-        #row += 1
-        
         self.steps = self.option_manager.get_steps()
 
         for step in self.steps:
             
-            if self.mode != "Halton":
+            if self.mode != "Sampling: Halton":
                 name = step['name'].get()
                 CTkLabel(self.containerFrame, text=name).grid(row=row, column=0, columnspan=1, padx=5, pady=5, sticky="")
                 row += 1
@@ -50,5 +45,5 @@ class OptimalParameterView(CTkScrollableFrame):
                 bb.configure(textvariable=param['optimal_value'])
                 row += 1
                 
-            if self.mode == "Halton":
+            if self.mode == "Sampling: Halton":
                 break

{mg-pso-gui-0.1.116 → mg-pso-gui-0.1.119}/mgpsogui/gui/SetupTab/StepView.py

@@ -86,7 +86,7 @@ class StepView(CTkScrollableFrame):
             
             #CTkLabel(self.containerFrame, text="Step:").grid(row=row, column=0, padx=10, pady=5, sticky="nsew")
             
-            if (self.mode == "PSO"):
+            if (self.mode == "Optimization: MG-PSO"):
                 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)
@@ -102,7 +102,7 @@ class StepView(CTkScrollableFrame):
 
                 row += 1
 
-            if step['open'] or self.mode == "Halton":
+            if step['open'] or self.mode == "Sampling: Halton":
                 bounds = BoundsList.BoundsList(
                     self.containerFrame, option_manager=self.option_manager, step_index=index)
                 bounds.grid(row=row, column=0, padx=(10, 10),
@@ -120,11 +120,11 @@ class StepView(CTkScrollableFrame):
             row += 1
             index += 1
             
-            if (self.mode != "PSO"):
+            if (self.mode != "Optimization: MG-PSO"):
                 break
 
         # Create an "Add step button that is centered
         
-        if (self.mode == "PSO" or len(self.steps) == 0):
+        if (self.mode == "Optimization: MG-PSO" 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.116 → mg-pso-gui-0.1.119}/mgpsogui/util/PSORunner.py

@@ -73,7 +73,7 @@ def run_process(stdout_queue, stderr_queue, results_queue, data, folder):
             'http_conn_timeout': int(calibration_map['conn_timeout']),
             'http_read_timeout': int(calibration_map['read_timeout']),
             'particles_fail': int(calibration_map['particles_fail']),
-            'step_trace': os.path.join(folder, 'step_trace.json')
+            'step_trace': os.path.join(folder, 'pso_step_trace.json')
         }
 
         print("\n")

{mg-pso-gui-0.1.116 → mg-pso-gui-0.1.119}/mgpsogui/util/debug.py

@@ -136,7 +136,7 @@ args = {
         {"name": "project", "value": "SFIR3"},
     ],
     "url": "http://csip.engr.colostate.edu:8087/csip-oms/m/ages/0.3.0",
-    "mode": "PSO",
+    "mode": "Optimization: MG-PSO",
     "files": {},
 }
 

{mg-pso-gui-0.1.116 → mg-pso-gui-0.1.119}/setup.py

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