mg-pso-gui 0.2.33__tar.gz → 0.2.34__tar.gz

{mg_pso_gui-0.2.33 → mg_pso_gui-0.2.34}/PKG-INFO

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

{mg_pso_gui-0.2.33 → mg_pso_gui-0.2.34}/mg_pso_gui.egg-info/PKG-INFO

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

{mg_pso_gui-0.2.33 → mg_pso_gui-0.2.34}/mgpsogui/gui/HomePage.py

@@ -217,6 +217,13 @@ class App(customtkinter.CTk):
 		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(3000, lambda: self.save_button.configure(text="Save"))
@@ -267,6 +274,14 @@ class App(customtkinter.CTk):
 		try:
 		
 			self.option_manager.load_project(filename)
+			self.option_manager.set_path(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.refresh_step_view(0)
 			
@@ -337,15 +352,15 @@ class App(customtkinter.CTk):
 	def run(self):
 		
 		data = self.option_manager.get_all_data()
-		data["sensitivity_analysis_path"] = self.sensitivity_file.get()
+		mode = self.option_manager.get_mode()
 
-		self.running_config = metrics
+		self.running_config = data
 		
-		if self.testing:
-			steps = metrics['steps']
-			for step in steps:
-				for param in step['param']:
-					param['default_value'] = param['optimal_value']
+		#if self.testing:
+		#	steps = metrics['steps']
+		#	for step in steps:
+		#		for param in step['param']:
+		#			param['default_value'] = param['optimal_value']
 		self.testing = False
 
 		self.progress_data = None
@@ -364,21 +379,11 @@ class App(customtkinter.CTk):
 		
 		self.textbox.insert("0.0", "Starting job...\n\n")
 		self.textbox.insert("0.0", "Job Parameters:\n")
-		self.textbox.insert("0.0", json.dumps(metrics, indent=4) + "\n\n")
+		self.textbox.insert("0.0", json.dumps(data, indent=4) + "\n\n")
 		try:
-			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 (os.path.exists(os.path.join(folder, 'output.txt'))):
-				os.remove(os.path.join(folder, 'output.txt'))
-				
-			if (os.path.exists(os.path.join(folder, 'error.txt'))):
-				os.remove(os.path.join(folder, 'error.txt'))
+			folder = self.option_manager.get_project_folder()
 			
-			self.train_process = Process(target=PSORunner.run_process, args=(stdout_queue, stderr_queue, results_queue, metrics, folder))
+			self.train_process = Process(target=PSORunner.run_process, args=(stdout_queue, stderr_queue, results_queue, data, folder, mode))
 			self.train_process.daemon = True
 			self.train_process.start()
 			self.after(1000, self.watch_loop)

{mg_pso_gui-0.2.33 → mg_pso_gui-0.2.34}/setup.py

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