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

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

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

{mg-pso-gui-0.1.120 → mg-pso-gui-0.1.121}/mg_pso_gui.egg-info/PKG-INFO

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

{mg-pso-gui-0.1.120 → mg-pso-gui-0.1.121}/mgpsogui/gui/HomePage.py

@@ -306,7 +306,7 @@ class App(customtkinter.CTk):
 	def make_request(self):
 		service_url = self.service_url.get()
 		try:
-			response = requests.get(service_url, timeout=1)
+			response = requests.get(service_url, timeout=5)
 				
 			response_json = json.loads(response.text)
 			status = response.status_code
@@ -325,6 +325,7 @@ class App(customtkinter.CTk):
 			self.refresh_button.configure(fg_color="green")
 		except Exception as e:
 			self.refresh_button.configure(fg_color="red")
+			self.after(1000, lambda: self.refresh_button.configure(fg_color=self.default_button_color))
 		
 	
 	def load(self):

{mg-pso-gui-0.1.120 → mg-pso-gui-0.1.121}/mgpsogui/util/PSORunner.py

@@ -5,6 +5,7 @@ from queue import Empty
 import threading
 import time
 import os
+from recosu.sampling.sampler import run_sampler
 
 #from cosu.pso import global_best
 from .recosu.pso import global_best
@@ -19,6 +20,8 @@ def run_process(stdout_queue, stderr_queue, results_queue, data, folder):
     args = data['arguments']
     calib = data['calibration_parameters']
     
+    my_mode = args["mode"]
+
     # If "mode" in args remove it
     if "mode" in args:
         del args["mode"]
@@ -76,6 +79,18 @@ def run_process(stdout_queue, stderr_queue, results_queue, data, folder):
             'step_trace': os.path.join(folder, 'pso_step_trace.json')
         }
 
+        if my_mode == "Sampling: Halton" or my_mode == "Sampling: Random":
+            config = {
+                'service_timeout': int(calibration_map['service_timeout']),
+                'http_retry': int(calibration_map['http_retry']),
+                'allow_redirects': True if calibration_map['allow_redirects'] == "True" else False,
+                'async_call': True if calibration_map['async_call'] == "True" else False,
+                'conn_timeout': int(calibration_map['conn_timeout']),
+                'read_timeout': int(calibration_map['read_timeout']),
+                'particles_fail': int(calibration_map['particles_fail']),
+                'step_trace': os.path.join(folder, 'pso_step_trace.json')
+            }
+
         print("\n")
         print(steps)
         print("\n")
@@ -92,20 +107,43 @@ def run_process(stdout_queue, stderr_queue, results_queue, data, folder):
 
         print("Running global_best...\n")
 
-        optimizer, trace = global_best(steps,   
-                rounds=(int(calibration_map['min_rounds']), int(calibration_map['max_rounds'])),              
-                args=args,      
-                n_particles=int(calibration_map['n_particles']),      
-                iters=int(calibration_map['iters']),  
-                n_threads=int(calibration_map['n_threads']),      
-                # ftol=0.00000001,
-                options=options,
-                oh_strategy=oh_strategy, 
-                conf=config
-            )
-        
-        results_queue.put(trace)
-        print(trace)
+        if my_mode == "Sampling: Halton":
+            trace = run_sampler(steps, 
+                                args, 
+                                int(calibration_map['count']), 
+                                int(calibration_map['num_threads']), 
+                                "halton", 
+                                conf=config, 
+                                trace_file="halton_trace.csv",
+                                offset=int(calibration_map['offset']))
+            results_queue.put(trace)
+            print(trace)
+            
+        elif my_mode == "Sampling: Random":
+            trace = run_sampler(steps, 
+                    args, 
+                    int(calibration_map['count']), 
+                    int(calibration_map['num_threads']), 
+                    "random", 
+                    conf=config, 
+                    trace_file="random_trace.csv")
+            results_queue.put(trace)
+            print(trace)
+        else:
+
+            optimizer, trace = global_best(steps,   
+                    rounds=(int(calibration_map['min_rounds']), int(calibration_map['max_rounds'])),              
+                    args=args,      
+                    n_particles=int(calibration_map['n_particles']),      
+                    iters=int(calibration_map['iters']),  
+                    n_threads=int(calibration_map['n_threads']),      
+                    options=options,
+                    oh_strategy=oh_strategy, 
+                    conf=config
+                )
+            
+            results_queue.put(trace)
+            print(trace)
         
         print("Finishing up...")
         time.sleep(5)

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

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