mg-pso-gui 0.2.124__tar.gz → 0.2.125__tar.gz

{mg_pso_gui-0.2.124 → mg_pso_gui-0.2.125}/PKG-INFO

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

@@ -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 → mg_pso_gui-0.2.125}/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...")

{mg_pso_gui-0.2.124 → mg_pso_gui-0.2.125}/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)

{mg_pso_gui-0.2.124 → mg_pso_gui-0.2.125}/setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-VERSION = '0.2.124'
+VERSION = '0.2.125'
 DESCRIPTION = 'GUI for MG-PSO'
 LONG_DESCRIPTION = open('../README.md').read()