mg-pso-gui 0.2.124__py3-none-any.whl → 0.2.125__py3-none-any.whl

{mg_pso_gui-0.2.124.dist-info → mg_pso_gui-0.2.125.dist-info}/METADATA

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

{mg_pso_gui-0.2.124.dist-info → mg_pso_gui-0.2.125.dist-info}/RECORD

@@ -1,7 +1,7 @@
 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=Lz0P7TgRwzvocxxNWr84d-LvMzdTs_VvwrNkxP28kuI,25155
+mgpsogui/gui/HomePage.py,sha256=N_0FGZ8R6fiMBHiNWYNMM8h3QvudteaJ_Fq5GDxoPug,26053
 mgpsogui/gui/OptionManager.py,sha256=t0aXOeBo48qQ-P8OykpP2v_3KJoaJtUPSkYtacjloCc,22844
 mgpsogui/gui/OptionManager_backup.py,sha256=TCWfPnHL2foN5id47jsi267lamRG6yGU6y_M29eOOJk,18530
 mgpsogui/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -58,7 +58,7 @@ mgpsogui/util/CTkToolTip/ctk_tooltip.py,sha256=SZMovpQIGvdpDRbqCKl9SHs92DrFCO2MO
 mgpsogui/util/recosu/__init__.py,sha256=pPR0lB6clIi6q73H1W8eT5u0dd3bIemwa9-XFmOaVVk,279
 mgpsogui/util/recosu/pso/__init__.py,sha256=PQ548aEKVOk6MMzxxDg7yMO_1hHfoEoYLLkGLeij73Y,247
 mgpsogui/util/recosu/pso/csip_access.py,sha256=_oA71d6CSwhKSa3pgywIW7mXRJtgJTNu1X2DiBkQkuA,4152
-mgpsogui/util/recosu/pso/pso.py,sha256=kO0E-OEaSCAaRJX0W72NRh3zvOXA61Qv6AZLZxnAhGk,23185
+mgpsogui/util/recosu/pso/pso.py,sha256=qUwpp6gjhCTXA6twKGAda84HIeQebKGB6MJ4K9GfcdM,23181
 mgpsogui/util/recosu/sampling/__init__.py,sha256=dWs1MPx0o2UFmOmUfFaomQWBTIZAwALsVJzZQNZePZU,252
 mgpsogui/util/recosu/sampling/sample_trace_writer.py,sha256=M9w-POLlZgjL5a7J7yxr73OG6mCsS2aUuP9d3HKfkbA,1966
 mgpsogui/util/recosu/sampling/sampler_task.py,sha256=uZobpR83u6xEaUzIknvW9FbB84c2AL7T-5T8O8QIhzY,2776
@@ -73,8 +73,8 @@ mgpsogui/util/recosu/utils/trace_writer.py,sha256=V9BJlOjCbNYGoXGEk3CF5wjifBxvar
 mgpsogui/util/recosu/utils/utils.py,sha256=6MIoJb0nhIa4tNv7qhBfZi-AtL3L95CgJf6eAf12NQs,4140
 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.124.dist-info/METADATA,sha256=xhxbNuuONZLy4BO01-WLcMdSEx5JRYmu8adzJhyy8Hk,9542
-mg_pso_gui-0.2.124.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-mg_pso_gui-0.2.124.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.2.124.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.2.124.dist-info/RECORD,,
+mg_pso_gui-0.2.125.dist-info/METADATA,sha256=1cfBNFu2xvNbvbzQQKz2JtmCFVC5Z49qKHPxNW0oWB4,9542
+mg_pso_gui-0.2.125.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+mg_pso_gui-0.2.125.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.2.125.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.2.125.dist-info/RECORD,,

mgpsogui/gui/HomePage.py

@@ -113,6 +113,8 @@ class App(customtkinter.CTk):
 		self.calibration_data = None
 		self.testing = False
 
+		self.running_loop_ticks = 1
+
 		# Configure window
 		version = "v0.2.120"
 		self.title("COSU Manager (" + version + ")")
@@ -241,7 +243,8 @@ class App(customtkinter.CTk):
 		GraphGenerator.generate_graphs(self)
 			
 	def save_project(self):
-		filename = asksaveasfilename(filetypes=[("JSON", "*.json")], initialfile="config", defaultextension="json", title="Save Project")
+		name = self.option_manager.get_project_data()['name']
+		filename = asksaveasfilename(filetypes=[("JSON", "*.json")], initialfile=name, defaultextension="json", title="Save Project")
 		
 		try:
 			self.option_manager.set_path(filename)
@@ -260,6 +263,29 @@ class App(customtkinter.CTk):
 			self.save_button.configure(text="Error!")
 			print(e)
 			self.after(3000, lambda: self.save_button.configure(text="Save"))
+
+	def auto_save_project(self):
+		data = self.option_manager.get_project_data()
+
+		if (data['path'] != "/tmp"):
+			filename = os.path.join(data['path'], data['name'] + ".json")
+			
+			try:
+				self.option_manager.set_path(filename)
+				self.option_manager.save_project(filename)
+
+				folder = self.option_manager.get_project_folder()
+				if not os.path.exists(folder):
+					os.makedirs(folder)
+
+				if not os.path.exists(os.path.join(folder, "results")):
+					os.makedirs(os.path.join(folder, "results"))
+					
+				self.save_button.configure(text="Saved!")
+				self.after(1000, lambda: self.save_button.configure(text="Save"))
+			except Exception as e:
+				self.save_button.configure(text="Error!")
+				print(e)
 	
 	def refresh_step_view(self, value):
 		mode = self.option_manager.get_mode()
@@ -528,8 +554,11 @@ class App(customtkinter.CTk):
 			active_tab = self.tabview.get()
 			if (active_tab == "Results"):
 				GraphGenerator.generate_graphs(self)
+			if (self.running_loop_ticks % 10 == 0):
+				self.auto_save_project()
 		finally:
 			self.after(1000, self.running_loop)
+			self.running_loop_ticks += 1
 
 	def watch_loop(self):
 		print("Watch loop running...")

mgpsogui/util/recosu/pso/pso.py

@@ -95,7 +95,7 @@ def eval_cost(x, iteration, step_param, step_objfunc, calib_params, req_queue, f
 
     for key in cost2:
         # print(key, ' - ', cost2[key])
-        cost2[key][iteration - 1][1] = cost[key] # BUG LIST INDEX OUT OF RANGE?
+        cost2[key][iteration][1] = cost[key] # BUG LIST INDEX OUT OF RANGE?
         # print(key, ' - ', cost2[key])
 
     print(flush=True)