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

{mg_pso_gui-0.2.125.dist-info → mg_pso_gui-0.2.127.dist-info}/METADATA

@@ -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.dist-info → mg_pso_gui-0.2.127.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=N_0FGZ8R6fiMBHiNWYNMM8h3QvudteaJ_Fq5GDxoPug,26053
+mgpsogui/gui/HomePage.py,sha256=fTGAuCUBWaydSe0t7HO95snJ1B6j2xa5GJcEJSLymBA,25974
 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
@@ -19,7 +19,7 @@ mgpsogui/gui/SetupTab/CustomFunctionEditorWindow.py,sha256=lZ9a20YucwhCDiUN3eGA6
 mgpsogui/gui/SetupTab/CustomFunctionMetrics.py,sha256=vOJpElbTgz043m6JYwe9xz_2MBHg985S6KdbJkJERW4,5923
 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/ListParametersView.py,sha256=CdK7OVdccwk0_OLgrwwNFTHuV2hMvETsocQIKndZoV4,7459
 mgpsogui/gui/SetupTab/OverrideParameterMetrics.py,sha256=rBfaSitYDOajbHvyi2TfoXAHYlz1cCt028UVpIJ_Dc0,3369
 mgpsogui/gui/SetupTab/OverrideParameterWindow.py,sha256=1UJHel0BH4sYa5WQnuSaFd3cdpRwAIwOpFIbhDS30IY,1824
 mgpsogui/gui/SetupTab/SamplingListView.py,sha256=DhZBAhDcrqZn1XioCs1gTe_v-8W10C0UfPm0fLAbeXM,5260
@@ -57,8 +57,11 @@ mgpsogui/util/CTkToolTip/__init__.py,sha256=G1jxV55hGtGgwyC1sR-uUUdasDdh0XZgcI-a
 mgpsogui/util/CTkToolTip/ctk_tooltip.py,sha256=SZMovpQIGvdpDRbqCKl9SHs92DrFCO2MOYL2ifolvOE,6329
 mgpsogui/util/recosu/__init__.py,sha256=pPR0lB6clIi6q73H1W8eT5u0dd3bIemwa9-XFmOaVVk,279
 mgpsogui/util/recosu/pso/__init__.py,sha256=PQ548aEKVOk6MMzxxDg7yMO_1hHfoEoYLLkGLeij73Y,247
-mgpsogui/util/recosu/pso/csip_access.py,sha256=_oA71d6CSwhKSa3pgywIW7mXRJtgJTNu1X2DiBkQkuA,4152
-mgpsogui/util/recosu/pso/pso.py,sha256=qUwpp6gjhCTXA6twKGAda84HIeQebKGB6MJ4K9GfcdM,23181
+mgpsogui/util/recosu/pso/csip_access.py,sha256=jBli1MSShUUwQCMKOUvMaGuNwBViCrjXJi_FmSEJsZA,2721
+mgpsogui/util/recosu/pso/csip_access_new.py,sha256=_oA71d6CSwhKSa3pgywIW7mXRJtgJTNu1X2DiBkQkuA,4152
+mgpsogui/util/recosu/pso/pso modified.py,sha256=sFY1csASu5Os5SSheWWdpVcjpPwJeBqZKsv89DLXdxk,21648
+mgpsogui/util/recosu/pso/pso.py,sha256=iPqT6aI1vi8LYuWmtxuHkLEM9sQwhUznPInBgps7ANI,13708
+mgpsogui/util/recosu/pso/pso_new.py,sha256=qUwpp6gjhCTXA6twKGAda84HIeQebKGB6MJ4K9GfcdM,23181
 mgpsogui/util/recosu/sampling/__init__.py,sha256=dWs1MPx0o2UFmOmUfFaomQWBTIZAwALsVJzZQNZePZU,252
 mgpsogui/util/recosu/sampling/sample_trace_writer.py,sha256=M9w-POLlZgjL5a7J7yxr73OG6mCsS2aUuP9d3HKfkbA,1966
 mgpsogui/util/recosu/sampling/sampler_task.py,sha256=uZobpR83u6xEaUzIknvW9FbB84c2AL7T-5T8O8QIhzY,2776
@@ -73,8 +76,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.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,,
+mg_pso_gui-0.2.127.dist-info/METADATA,sha256=CKrIBp-9Wkp8fyOPmG0KADmYCL5jRNH3OBKdhit0Rl8,9542
+mg_pso_gui-0.2.127.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+mg_pso_gui-0.2.127.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.2.127.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.2.127.dist-info/RECORD,,

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]

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
         
         

mgpsogui/util/recosu/pso/csip_access.py

@@ -10,56 +10,25 @@ def csip_worker(reqq: queue.Queue, thread_no: int, stop, full_trace,
     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, calib_params, objfunc, resq) = reqq.get(True, 0.5)
+            (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)
 
-            all_params = {}
-
             # 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)
-            values = x[particle]
-            idx = 0
-            for p in step_param:
-                value_type = p.get('type', 'float')
-                if 'float' == value_type:
-                    c.add_data(p['name'], values[idx])
-                    all_params[p['name']] = values[idx]
-                    idx = idx + 1
-                elif 'list' == value_type:
-                    base_name = p['name']
-                    calibration_strategy = p.get('calibration_strategy', 'mean')
-
-                    if 'mean' == calibration_strategy:
-                        mean = values[idx]
-                        default_value = p['default_value']
-                        value = [(1 + mean) * x for x in default_value]
-                        c.add_data(base_name, value)
-                        all_params[base_name] = value
-                        idx = idx + 1
-                    elif 'single' == calibration_strategy:
-                        default_value = p['default_value']
-                        sub_index = 0
-                        value = default_value.copy()
-                        while sub_index < len(default_value):
-                            value[sub_index] = values[idx]
-                            idx = idx + 1
-                            sub_index = sub_index + 1
-                        c.add_data(base_name, value)
-                        all_params[base_name] = value
+            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)
-                all_params[name] = value
 
             # objective function info
             for of in objfunc:
@@ -75,31 +44,31 @@ def csip_worker(reqq: queue.Queue, thread_no: int, stop, full_trace,
                 else:
                     res = c.execute(url, files=files, conf=conf)
 
-                # run_string = 'r{}s{}i{}p{}.json'.format(rnd, step, iteration, particle)
+                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)))
-
-                if res.is_failed():
-                    print(u'F')
-                    # print(res)
-                    resq.put((particle, 100))
-                else:
-                    # print(res)
-                    # print(u'\u2714', end='', flush=True)
-                    print(u'O', end='', flush=True)
-                    cost = utils.calc_cost(res, objfunc)
-                    resq.put((particle, cost))
-                    # break
+                    
+                # 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:
-                print(u'sF')
-                resq.put((particle, 100))
-                continue
+            except Exception as e:
+                print(res)
+                print(e)
 
             reqq.task_done()
         except queue.Empty:

mgpsogui/util/recosu/pso/csip_access_new.py

@@ -0,0 +1,106 @@
+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, calib_params, objfunc, resq) = reqq.get(True, 0.5)
+            # print(thread_no, particle)
+
+            c = Client(metainfo=metainfo)
+
+            all_params = {}
+
+            # 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)
+            values = x[particle]
+            idx = 0
+            for p in step_param:
+                value_type = p.get('type', 'float')
+                if 'float' == value_type:
+                    c.add_data(p['name'], values[idx])
+                    all_params[p['name']] = values[idx]
+                    idx = idx + 1
+                elif 'list' == value_type:
+                    base_name = p['name']
+                    calibration_strategy = p.get('calibration_strategy', 'mean')
+
+                    if 'mean' == calibration_strategy:
+                        mean = values[idx]
+                        default_value = p['default_value']
+                        value = [(1 + mean) * x for x in default_value]
+                        c.add_data(base_name, value)
+                        all_params[base_name] = value
+                        idx = idx + 1
+                    elif 'single' == calibration_strategy:
+                        default_value = p['default_value']
+                        sub_index = 0
+                        value = default_value.copy()
+                        while sub_index < len(default_value):
+                            value[sub_index] = values[idx]
+                            idx = idx + 1
+                            sub_index = sub_index + 1
+                        c.add_data(base_name, value)
+                        all_params[base_name] = value
+
+            # other, previously calibrated params (other steps)
+            for name, value in calib_params.items():
+                c.add_data(name, value)
+                all_params[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)
+
+                # run_string = 'r{}s{}i{}p{}.json'.format(rnd, step, iteration, particle)
+
+                if save_resp:
+                    res.save_to(os.path.join(save_resp, 'r{}s{}i{}p{}.json'.format(rnd, step, iteration, particle)))
+
+                if res.is_failed():
+                    print(u'F')
+                    # print(res)
+                    resq.put((particle, 100))
+                else:
+                    # print(res)
+                    # print(u'\u2714', end='', flush=True)
+                    print(u'O', end='', flush=True)
+                    cost = utils.calc_cost(res, objfunc)
+                    resq.put((particle, cost))
+                    # break
+
+                if full_trace is not None:
+                    full_trace.append((all_params, cost))
+
+                resq.put((particle, cost))
+            except:
+                print(u'sF')
+                resq.put((particle, 100))
+                continue
+
+            reqq.task_done()
+        except queue.Empty:
+            continue