mg-pso-gui 0.1.118__tar.gz → 0.1.120__tar.gz

{mg-pso-gui-0.1.118 → mg-pso-gui-0.1.120}/PKG-INFO

@@ -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 → mg-pso-gui-0.1.120}/mg_pso_gui.egg-info/PKG-INFO

@@ -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 → mg-pso-gui-0.1.120}/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

{mg-pso-gui-0.1.118 → mg-pso-gui-0.1.120}/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 = []

{mg-pso-gui-0.1.118 → mg-pso-gui-0.1.120}/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

{mg-pso-gui-0.1.118 → mg-pso-gui-0.1.120}/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")

{mg-pso-gui-0.1.118 → mg-pso-gui-0.1.120}/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": {},
 }
 

{mg-pso-gui-0.1.118 → mg-pso-gui-0.1.120}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import codecs
 import os
 
-VERSION = '0.1.118'
+VERSION = '0.1.120'
 DESCRIPTION = 'GUI for MG-PSO'
 LONG_DESCRIPTION = open('../README.md').read()