mg-pso-gui 0.1.118__py3-none-any.whl → 0.1.120__py3-none-any.whl

{mg_pso_gui-0.1.118.dist-info → mg_pso_gui-0.1.120.dist-info}/METADATA

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

{mg_pso_gui-0.1.118.dist-info → mg_pso_gui-0.1.120.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=AqSNY9NDdIVcjNKtu4aAKbQiWPXWzHSH9tJNVq_zjsE,22562
-mgpsogui/gui/OptionManager.py,sha256=H5ofd7PA5f6dVfSghUhKdPiqLHNE0IVpPPzf93k7JD4,12527
+mgpsogui/gui/HomePage.py,sha256=fsEYYsO-M6cbAOfAKHKNIpJfbB127ZVlWXfXFeRJN8o,22573
+mgpsogui/gui/OptionManager.py,sha256=36_MlFd6nLt6xd6HHE2sHtL8oW7VBOZbCvJ8er-wWJ4,12544
 mgpsogui/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/PlatformTab/PlatformTab.py,sha256=KyIoHlMKD9nfQqHeGJwRDA4RCoe4UykjB2l6xMTKK_M,10486
 mgpsogui/gui/PlatformTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -13,10 +13,10 @@ mgpsogui/gui/SetupTab/BoundsList.py,sha256=L77UEaUJNiUE-ZsYIl44tWRb1zBfxaEQ-bAG1
 mgpsogui/gui/SetupTab/CalibrationParametersView.py,sha256=ppVBHG3nphku9-P6Z8az-HTpgk8vHxnj-A5m80BZTgA,2784
 mgpsogui/gui/SetupTab/FunctionsList.py,sha256=tUqW43VWpxFpdo9UHaPvFQ0CtCo9mFI3mri52ikntrE,4092
 mgpsogui/gui/SetupTab/ListParametersView.py,sha256=wYcDcaooYkw-y7XW6dJUwhTWxLuUUOK5tGUFVHBf3ck,7352
-mgpsogui/gui/SetupTab/OptimalParameterView.py,sha256=Z6XuGEVQYa2GlpDe_nxqcXjGoqSaaNkTGKYHzfnsyRg,2003
+mgpsogui/gui/SetupTab/OptimalParameterView.py,sha256=lKmXqvtK8iPZf5ctWaTYypMwxJDiI9OW8FsfRQ8RzZo,1750
 mgpsogui/gui/SetupTab/SetupTab.py,sha256=8f_xqmMaD8grmSKFFUHm8zIGEDrSUzU_sNW6CdRLrrE,2436
 mgpsogui/gui/SetupTab/StaticParameterView.py,sha256=iEG-UpBBlAJabZo3MG768oLqOROjUPc23tKOSd47IUc,2739
-mgpsogui/gui/SetupTab/StepView.py,sha256=Okmmwpvyu6eu3LO0up8qyUuH8wuQK43kudv1TNNsj8E,5937
+mgpsogui/gui/SetupTab/StepView.py,sha256=5kMkOiYt2wP_O2yCY1l0JcEKlip9rbMpWeytz1GhLhY,5998
 mgpsogui/gui/SetupTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/VisualizeTab/SideBar.py,sha256=TpTY4iFG5TzPMIjxfxREgAxLHvxma3Ihtq_EavWhZq8,13322
 mgpsogui/gui/VisualizeTab/VisualizeTab.py,sha256=y3ZjLR78yXjHTcHMpB637ipBKxb1CCEM3qzG8OUJvpQ,3477
@@ -35,7 +35,7 @@ mgpsogui/gui/images/up.png,sha256=AQvFWCUqSQNaQ1E6LKZ9zNfSvW6t4mgy8uswdg9T2Hg,24
 mgpsogui/util/GraphGenerator.py,sha256=HhUsFUFhCv3wTYV8CTqU0wo56Ph9c1DocPj25AVIAdI,15076
 mgpsogui/util/PSORunner.py,sha256=ZXFpfL1U8PxRwMDtuHmXHdJclzounq0mCJ0YOVEBtm4,3934
 mgpsogui/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mgpsogui/util/debug.py,sha256=36oZ3wf3_zGQbdZLGwHJ1Kk8QArl9pjNqkIaz6IPt74,19742
+mgpsogui/util/debug.py,sha256=Swzny9_1S-CCONWGssj9iDoSpbwu5Vr4f95g_9L8bec,19759
 mgpsogui/util/helpers.py,sha256=fCfVDaGholx16FVVqf2BhWs9KCevI7aFIve1w2W68EQ,769
 mgpsogui/util/sampler_test_driver.py,sha256=1iJTLVFZ_VCsuIdl3mXQBA1GNAH5jJO3z5h4E_bd5U8,3703
 mgpsogui/util/CTkToolTip/__init__.py,sha256=G1jxV55hGtGgwyC1sR-uUUdasDdh0XZgcI-aILgGYA0,225
@@ -49,8 +49,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.1.118.dist-info/METADATA,sha256=HecEFv_X6j2ia2lewYOJapHllNStBybzS3PAXrXhpN8,9460
-mg_pso_gui-0.1.118.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-mg_pso_gui-0.1.118.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.1.118.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.1.118.dist-info/RECORD,,
+mg_pso_gui-0.1.120.dist-info/METADATA,sha256=VCRyQq7JpVEA2VUbXCeYjgSCKeepT3-IzDINAMXAnM0,9460
+mg_pso_gui-0.1.120.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+mg_pso_gui-0.1.120.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.1.120.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.1.120.dist-info/RECORD,,

mgpsogui/gui/HomePage.py

@@ -128,10 +128,10 @@ class App(customtkinter.CTk):
 		refresh_image = customtkinter.CTkImage(Image.open(os.path.join("./images", "refresh.png")), size=(20, 20))
 		self.refresh_button = customtkinter.CTkButton(self.sidebar_frame, text=None, width=30, image=refresh_image, command=self.load)
 		ctt(self.refresh_button, delay=0.1, alpha=0.95, message="Connect to Service")
-		self.refresh_button.grid(row=0, column=5, padx=(5, 80), pady=header_padding_y)
+		self.refresh_button.grid(row=0, column=5, padx=header_padding_x, pady=header_padding_y)
 
 		self.algorithm_optionmenu = customtkinter.CTkOptionMenu(self.sidebar_frame, variable=self.option_manager.get_arguments()['mode'], values=["Optimization: MG-PSO", "Sampling: Halton", "Sampling: Random"], width=50, command=self.refresh_step_view)
-		self.algorithm_optionmenu.grid(row=0, column=6, padx=header_padding_x, pady=header_padding_y)
+		self.algorithm_optionmenu.grid(row=0, column=6, padx=(5, 80), pady=header_padding_y)
 		self.algorithm_optionmenu.set("Optimization: MG-PSO")
 		
 		self.scaling_label = customtkinter.CTkLabel(self.sidebar_frame, text="Scale:", anchor="w")
@@ -306,7 +306,7 @@ class App(customtkinter.CTk):
 	def make_request(self):
 		service_url = self.service_url.get()
 		try:
-			response = requests.get(service_url)
+			response = requests.get(service_url, timeout=1)
 				
 			response_json = json.loads(response.text)
 			status = response.status_code

mgpsogui/gui/OptionManager.py

@@ -20,7 +20,7 @@ class OptionManager():
     def clear(self):
         self.arguments['param'].clear()
         self.arguments['url'].set("")
-        self.arguments['mode'].set("PSO")
+        self.arguments['mode'].set("Optimization: MG-PSO")
         self.arguments['files'] = {}
         self.arguments['calibration_parameters'].clear()
         self.steps = []

mgpsogui/gui/SetupTab/OptimalParameterView.py

@@ -28,16 +28,11 @@ class OptimalParameterView(CTkScrollableFrame):
         self.containerFrame.grid_columnconfigure((0, 1), weight=1)
         
         self.mode = self.option_manager.get_arguments()['mode'].get()
-        
-        #CTkLabel(self.containerFrame, text="Name:").grid(row=row, column=0, columnspan=1, padx=5, pady=5, sticky="")
-        #CTkLabel(self.containerFrame, text="Value:").grid(row=row, column=1, columnspan=1, padx=5, pady=5, sticky="")
-        #row += 1
-        
         self.steps = self.option_manager.get_steps()
 
         for step in self.steps:
             
-            if self.mode != "Halton":
+            if self.mode != "Sampling: Halton":
                 name = step['name'].get()
                 CTkLabel(self.containerFrame, text=name).grid(row=row, column=0, columnspan=1, padx=5, pady=5, sticky="")
                 row += 1
@@ -50,5 +45,5 @@ class OptimalParameterView(CTkScrollableFrame):
                 bb.configure(textvariable=param['optimal_value'])
                 row += 1
                 
-            if self.mode == "Halton":
+            if self.mode == "Sampling: Halton":
                 break

mgpsogui/gui/SetupTab/StepView.py

@@ -86,7 +86,7 @@ class StepView(CTkScrollableFrame):
             
             #CTkLabel(self.containerFrame, text="Step:").grid(row=row, column=0, padx=10, pady=5, sticky="nsew")
             
-            if (self.mode == "PSO"):
+            if (self.mode == "Optimization: MG-PSO"):
                 button_container = CTkFrame(self.containerFrame, width=200)
                 button_container.grid(row=row, column=1, sticky="nse", padx=(10, 10), pady=(10, 10))
                 button_container.grid_rowconfigure(0, weight=1)
@@ -102,7 +102,7 @@ class StepView(CTkScrollableFrame):
 
                 row += 1
 
-            if step['open'] or self.mode == "Halton":
+            if step['open'] or self.mode == "Sampling: Halton":
                 bounds = BoundsList.BoundsList(
                     self.containerFrame, option_manager=self.option_manager, step_index=index)
                 bounds.grid(row=row, column=0, padx=(10, 10),
@@ -120,11 +120,11 @@ class StepView(CTkScrollableFrame):
             row += 1
             index += 1
             
-            if (self.mode != "PSO"):
+            if (self.mode != "Optimization: MG-PSO"):
                 break
 
         # Create an "Add step button that is centered
         
-        if (self.mode == "PSO" or len(self.steps) == 0):
+        if (self.mode == "Optimization: MG-PSO" or len(self.steps) == 0):
             CTkButton(self.containerFrame, text="Add Group", command=self.create_new_step).grid(
                 row=row, columnspan=2, column=0, padx=(10, 10), pady=(10, 10), sticky="ew")

mgpsogui/util/debug.py

@@ -136,7 +136,7 @@ args = {
         {"name": "project", "value": "SFIR3"},
     ],
     "url": "http://csip.engr.colostate.edu:8087/csip-oms/m/ages/0.3.0",
-    "mode": "PSO",
+    "mode": "Optimization: MG-PSO",
     "files": {},
 }