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

{mg_pso_gui-0.2.123.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.123
+Version: 0.2.125
 Summary: GUI for MG-PSO
 Author: Robert Cordingly
 Author-email: <rcording@uw.ed>

{mg_pso_gui-0.2.123.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
@@ -14,10 +14,10 @@ mgpsogui/gui/RunTab/OptimalParameterView.py,sha256=nliUEWA840cPBQt7wjiZ-L7uBOp_o
 mgpsogui/gui/RunTab/RunTab.py,sha256=_JWzDx5LT_uISw0Vnv-W2ypIeuKgoWqBnvFnvrLhNQA,5917
 mgpsogui/gui/RunTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/SetupTab/BoundsEditorWindow.py,sha256=7Vic6AkBI2FStMlYyPH0-dNJJyqEckYJpwxknAqtp84,3403
-mgpsogui/gui/SetupTab/BoundsList.py,sha256=VEZDZj-Rr8_W6qYg2F3_xMdg41nDN-dYZ92iK3EjNLM,15661
+mgpsogui/gui/SetupTab/BoundsList.py,sha256=7Xx8If4J19sfJSinI_95rCp2o4vuh_clwfAIcRA-3gM,15827
 mgpsogui/gui/SetupTab/CustomFunctionEditorWindow.py,sha256=lZ9a20YucwhCDiUN3eGA6WXQK7laToB7FP4Zev4Zxnc,3417
 mgpsogui/gui/SetupTab/CustomFunctionMetrics.py,sha256=vOJpElbTgz043m6JYwe9xz_2MBHg985S6KdbJkJERW4,5923
-mgpsogui/gui/SetupTab/FunctionsList.py,sha256=6oFS8qKF3OCtxNi5aY5Rj_ovM9nv4-vh-oT_CbhVTj4,7043
+mgpsogui/gui/SetupTab/FunctionsList.py,sha256=wmYmppyB5y8QADe3X_FQ5mAYVDC0HAPQgqtkegNwmLA,7007
 mgpsogui/gui/SetupTab/ListEditor.py,sha256=nin7Pl8z7d_yfKoAxM-yVS34uhj-LnprJ2mNRSB7Z0A,3197
 mgpsogui/gui/SetupTab/ListParametersView.py,sha256=mkGaC5cXhEOy5oD0MbTyK9z7VGZp019oK2Y8Ay-n05Q,7460
 mgpsogui/gui/SetupTab/OverrideParameterMetrics.py,sha256=rBfaSitYDOajbHvyi2TfoXAHYlz1cCt028UVpIJ_Dc0,3369
@@ -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.123.dist-info/METADATA,sha256=WcRMx4qjUxJpmDC_0-9hhdKfuYVqMxq9kAZ_xbZqFRE,9542
-mg_pso_gui-0.2.123.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-mg_pso_gui-0.2.123.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.2.123.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.2.123.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/gui/SetupTab/BoundsList.py

@@ -116,7 +116,11 @@ class BoundsList(CTkFrame):
             tt2 = None
             tt3 = None
                         
-            tt = CTkOptionMenu(self.containerFrame, dynamic_resizing=False, values=['float', 'list', 'custom'], variable=bound["type"], command=self.refresh)
+            options_list = ['custom', 'float', 'list']
+            if self.optParams == [] or self.optParams is None:
+                options_list = ['custom', 'list']
+            
+            tt = CTkOptionMenu(self.containerFrame, dynamic_resizing=False, values=options_list, variable=bound["type"], command=self.refresh)
             #command = lambda _, index=index, option=tt: (self.update_type(index, option)) 
             #tt.configure(command=command)
             #tt.set(bound["type"].get())

mgpsogui/gui/SetupTab/FunctionsList.py

@@ -59,7 +59,7 @@ class FunctionsList(CTkFrame):
             
             row += 1
             
-            columns = ["absdiff (not supported)",
+            columns = ["absdiff",
                        "absdifflog  (not supported)",
                        "ave  (not supported)",
                        "bias  (not supported)",
@@ -67,13 +67,14 @@ class FunctionsList(CTkFrame):
                        "ioa  (not supported)",
                        "ioa2  (not supported)",
                        "kge",
-                       "kge09  (not supported)",
-                       "mns  (not supported)",
+                       "kge09",
+                       "mns",
                        "mse  (not supported)",
+                       "rmse",
                        "ns",
                        "ns2log  (not supported)",
                        "nslog1p",
-                       "nslog2  (not supported)",
+                       "nslog2",
                        "pbias",
                        "pmcc  (not supported)",
                        "rmse",