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

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

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

{mg_pso_gui-0.2.125 → mg_pso_gui-0.2.127}/mg_pso_gui.egg-info/PKG-INFO

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

{mg_pso_gui-0.2.125 → mg_pso_gui-0.2.127}/mg_pso_gui.egg-info/SOURCES.txt

@@ -65,7 +65,10 @@ mgpsogui/util/CTkToolTip/ctk_tooltip.py
 mgpsogui/util/recosu/__init__.py
 mgpsogui/util/recosu/pso/__init__.py
 mgpsogui/util/recosu/pso/csip_access.py
+mgpsogui/util/recosu/pso/csip_access_new.py
+mgpsogui/util/recosu/pso/pso modified.py
 mgpsogui/util/recosu/pso/pso.py
+mgpsogui/util/recosu/pso/pso_new.py
 mgpsogui/util/recosu/sampling/__init__.py
 mgpsogui/util/recosu/sampling/sample_trace_writer.py
 mgpsogui/util/recosu/sampling/sampler_task.py

{mg_pso_gui-0.2.125 → mg_pso_gui-0.2.127}/mgpsogui/gui/HomePage.py

@@ -145,7 +145,7 @@ class App(customtkinter.CTk):
 		self.sidebar_frame.grid_columnconfigure(4, weight=1)
 		self.logo_label = customtkinter.CTkLabel(self.sidebar_frame, text="COSU Manager (" + version + ")", font=customtkinter.CTkFont(size=20, weight="bold"))
 		self.logo_label.grid(row=0, column=0, padx=(20, 10), pady=header_padding_y)
-		self.save_button = customtkinter.CTkButton(self.sidebar_frame, text="Save", width=60, command=self.save_project)
+		self.save_button = customtkinter.CTkButton(self.sidebar_frame, text="Save As", width=60, command=self.save_project)
 		self.save_button.grid(row=0, column=1, padx=header_padding_x, pady=header_padding_y)
 		self.load_button = customtkinter.CTkButton(self.sidebar_frame, text="Load", width=60, command=self.load_project)
 		self.load_button.grid(row=0, column=2, padx=header_padding_x, pady=header_padding_y)
@@ -258,11 +258,11 @@ class App(customtkinter.CTk):
 				os.makedirs(os.path.join(folder, "results"))
 				
 			self.save_button.configure(text="Saved!")
-			self.after(3000, lambda: self.save_button.configure(text="Save"))
+			self.after(3000, lambda: self.save_button.configure(text="Save As"))
 		except Exception as e:
 			self.save_button.configure(text="Error!")
 			print(e)
-			self.after(3000, lambda: self.save_button.configure(text="Save"))
+			self.after(3000, lambda: self.save_button.configure(text="Save As"))
 
 	def auto_save_project(self):
 		data = self.option_manager.get_project_data()
@@ -281,8 +281,6 @@ class App(customtkinter.CTk):
 				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)
@@ -445,6 +443,8 @@ class App(customtkinter.CTk):
 			NW(title="Error", message="A process is already running!", x = 400, y = 200)
 			return 0
 		
+		self.auto_save_project()
+
 		data = self.option_manager.get_all_data()
 		mode = self.option_manager.get_mode()
 		data = data[mode]

{mg_pso_gui-0.2.125 → mg_pso_gui-0.2.127}/mgpsogui/gui/SetupTab/ListParametersView.py

@@ -138,7 +138,7 @@ class ListParametersView(CTkScrollableFrame):
         row += 1
         
         CTkButton(self.containerFrame, text="Open", command=self.open_csv).grid(row=row, column=0, padx=(5, 5), pady=(5, 5), sticky="ew")
-        CTkButton(self.containerFrame, text="Import", command=self.import_csv).grid(row=row, column=1, padx=(5, 5), pady=(5, 5), sticky="ew")
+        CTkButton(self.containerFrame, text="Paste", command=self.import_csv).grid(row=row, column=1, padx=(5, 5), pady=(5, 5), sticky="ew")
         row += 1
         
         

mg_pso_gui-0.2.127/mgpsogui/util/recosu/pso/csip_access.py

@@ -0,0 +1,75 @@
+from cosu import utils
+from csip import Client
+from typing import List, Dict, Tuple
+import queue, os
+
+
+def csip_worker(reqq: queue.Queue, thread_no: int, stop, full_trace,
+                url, files, arg_params, conf: Dict, metainfo: Dict) -> None:
+    async_call = conf.get('async_call', True)  # default is async
+    save_resp = conf.get('save_response_to', None)  # save response, set it to a folder if responses should be saved.
+
+    while not stop():
+        
+        try:
+            (rnd, step, iteration, particle, x, step_param_names, calib_params, objfunc, resq) = reqq.get(True, 0.5)
+            # print(thread_no, particle)
+    
+            c = Client(metainfo=metainfo)
+
+            # static params (from args)
+            for param in arg_params:
+                c.add_data(param['name'], param['value'])
+
+            # particle params  (generated from steps)
+            # for i, value in enumerate(x):
+            for idx, value in enumerate(x[particle, :]):
+                c.add_data(step_param_names[idx], value)
+
+            # other, previously calibrated params (other steps)
+            for name, value in calib_params.items():
+                c.add_data(name, value)
+
+            # objective function info
+            for of in objfunc:
+                c.add_cosu(of['name'], of['of'], of['data'])
+                # c.add_data(of['name'], (of['data'][0], of['data'][1]))
+
+            print('.', end='', flush=True)
+
+            try:
+                # print(c)
+                if async_call:
+                    res = c.execute_async(url, files=files, conf=conf)
+                else:
+                    res = c.execute(url, files=files, conf=conf)
+
+                if res.is_failed():
+                    print(res)
+
+                if save_resp:
+                    res.save_to(os.path.join(save_resp, 'r{}s{}i{}p{}.json'.format(rnd, step, iteration, particle)))
+                    
+                # print(res)
+                print('O', end='', flush=True)
+                
+                cost = utils.calc_cost(res, objfunc)
+
+                if full_trace is not None:
+                    all_params = {}
+                    # for i, value in enumerate(x):
+                    for idx, value in enumerate(x[particle, :]):
+                        all_params[step_param_names[idx]] = value
+                        
+                    for name, value in calib_params.items():
+                        all_params[name] = value
+                    full_trace.append((all_params, cost))
+
+                resq.put((particle, cost))
+            except Exception as e:
+                print(res)
+                print(e)
+
+            reqq.task_done()
+        except queue.Empty:
+            continue