mg-pso-gui 0.2.32__py3-none-any.whl → 0.2.34__py3-none-any.whl

{mg_pso_gui-0.2.32.dist-info → mg_pso_gui-0.2.34.dist-info}/METADATA

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

{mg_pso_gui-0.2.32.dist-info → mg_pso_gui-0.2.34.dist-info}/RECORD

@@ -1,8 +1,8 @@
 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=8T_-yEc2fOd1v_V9oe6iO80iiRzLOw78DdfbyLPZ1F8,21421
-mgpsogui/gui/OptionManager.py,sha256=K9xLBt-gIOS6psj3zqv_vW4soF3EeRH_kYH4xiDmUWw,21787
+mgpsogui/gui/HomePage.py,sha256=3PVTCfsve6NPscNiSfePNsmVaFx4FTHqV_uTf6SsYqw,21549
+mgpsogui/gui/OptionManager.py,sha256=HLVib_lHdMijykF78bJ9_PEl-oROuC8lxd1oBS7524U,21898
 mgpsogui/gui/OptionManager_backup.py,sha256=TCWfPnHL2foN5id47jsi267lamRG6yGU6y_M29eOOJk,18530
 mgpsogui/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/General/ParameterView.py,sha256=ylnzYk9qTN31w_6LW4Iq3536CjfWswEqbE95M_SF8P4,5657
@@ -69,8 +69,8 @@ mgpsogui/util/recosu/utils/trace_writer.py,sha256=V9BJlOjCbNYGoXGEk3CF5wjifBxvar
 mgpsogui/util/recosu/utils/utils.py,sha256=QB8vftq3142ekG0ORjz0ZBHU5YknXbR0oTsrxrPAsF0,3951
 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.32.dist-info/METADATA,sha256=Ew3-YS7tRlGM8RBtx6i_cElqYmTkq88PvzjzDb0KspM,9455
-mg_pso_gui-0.2.32.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-mg_pso_gui-0.2.32.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.2.32.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.2.32.dist-info/RECORD,,
+mg_pso_gui-0.2.34.dist-info/METADATA,sha256=pGYSwhKSxk5zV-zZP0Rmtg4OSQKO2-bkoUdEA7dzeVw,9455
+mg_pso_gui-0.2.34.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+mg_pso_gui-0.2.34.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.2.34.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.2.34.dist-info/RECORD,,

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)

mgpsogui/gui/OptionManager.py

@@ -116,7 +116,10 @@ class OptionManager():
                 self._project_data[key] = value
             self._mode_sv.set(results["mode"])
             new_data = self.deserialize_data(results["data"])
-            self._data = {**self._data, **new_data}
+
+            for service in self._service_modes:
+                for key, value in new_data[service].items():
+                    self._data[service][key] = value
 
 
     def add_arguments(self, arguments):