mg-pso-gui 0.1.106__tar.gz → 0.1.108__tar.gz

{mg-pso-gui-0.1.106 → mg-pso-gui-0.1.108}/PKG-INFO

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

{mg-pso-gui-0.1.106 → mg-pso-gui-0.1.108}/mg_pso_gui.egg-info/PKG-INFO

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

mg-pso-gui-0.1.108/mgpsogui/util/PSORunner.py

@@ -0,0 +1,123 @@
+
+import sys
+from multiprocessing import Process, Queue
+from queue import Empty
+import threading
+import time
+import os
+
+#from cosu.pso import global_best
+from .recosu.pso import global_best
+
+def enqueue_output(out, queue):
+    for line in iter(out.readline, b''):
+        queue.put(line)
+    out.close()
+
+def run_process(stdout_queue, stderr_queue, results_queue, cosu_queue, data, folder):
+    steps = data['steps']
+    args = data['arguments']
+    calib = data['calibration_parameters']
+    
+    # If "mode" in args remove it
+    if "mode" in args:
+        del args["mode"]
+    
+    calibration_map = {}
+    for param in calib:
+        param_name = param['name']
+        param_value = param['value']
+        calibration_map[param_name] = param_value
+        
+    if not os.path.exists(folder):
+        os.makedirs(folder)
+
+    if (os.path.exists(os.path.join(folder, 'output.txt'))):
+        os.remove(os.path.join(folder, 'output.txt'))
+        
+    if (os.path.exists(os.path.join(folder, 'error.txt'))):
+        os.remove(os.path.join(folder, 'error.txt'))
+    
+    old_stdout = sys.stdout
+    old_stderr = sys.stderr
+    
+    read_stdout, write_stdout = os.pipe()
+    read_stderr, write_stderr = os.pipe()
+    
+    sys.stdout = os.fdopen(write_stdout, 'w')
+    sys.stderr = os.fdopen(write_stderr, 'w')
+    
+    stdout_thread = threading.Thread(target=enqueue_output, args=(os.fdopen(read_stdout, 'r'), stdout_queue))
+    stderr_thread = threading.Thread(target=enqueue_output, args=(os.fdopen(read_stderr, 'r'), stderr_queue))
+    stdout_thread.daemon = True
+    stderr_thread.daemon = True
+    stdout_thread.start()
+    stderr_thread.start()
+    
+    try:
+        
+        options = {}
+        oh_strategy = {}
+        
+        for key in calibration_map.keys():
+            if "options_" in key:
+                options[key.replace("options_", "")] = float(calibration_map[key])
+            if "strategy_" in key:
+                oh_strategy[key.replace("strategy_", "")] = calibration_map[key]
+
+        config = {
+            'service_timeout': int(calibration_map['service_timeout']),
+            'http_retry': int(calibration_map['http_retry']),
+            'http_allow_redirects': True if calibration_map['allow_redirects'] == "True" else False,
+            'async_call': True if calibration_map['async_call'] == "True" else False,
+            'http_conn_timeout': int(calibration_map['conn_timeout']),
+            'http_read_timeout': int(calibration_map['read_timeout']),
+            'particles_fail': int(calibration_map['particles_fail']),
+            'step_trace': os.path.join(folder, 'step_trace.json')
+        }
+
+        print("\n")
+        print(steps)
+        print("\n")
+        print(args)
+        print("\n")
+        print(calibration_map)
+        print("\n")
+        print(options)
+        print("\n")
+        print(oh_strategy)
+        print("\n")
+        print(config)
+        print("\n")
+
+        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)
+        
+        print("Finishing up...")
+        time.sleep(5)
+    except Exception as e:
+        print("An exception occurred: ")
+        print(str(e))
+        # Print stack trace
+        import traceback
+        traceback.print_exc()
+    finally:
+        stdout_thread.join()
+        stderr_thread.join()
+        
+        sys.stdout = old_stdout
+        sys.stderr = old_stderr

{mg-pso-gui-0.1.106 → mg-pso-gui-0.1.108}/mgpsogui/util/recosu/pso/pso.py

@@ -276,7 +276,8 @@ def global_best(steps: Dict, rounds: Tuple, args: Dict, n_particles: int, iters:
             key = "r{}s{}".format(r + 1, s + 1)
             step_trace[key] = {}
             step_trace[key]['time'] = str(datetime.datetime.now())
-            step_trace[key]['best_costs'] = str(best_cost)
+            
+            step_trace[key]['best_costs'] = best_cost.tolist() # BUG
             step_trace[key]['steps'] = copy.deepcopy(steps)
 
             if step_file is not None:
@@ -313,8 +314,8 @@ def global_best(steps: Dict, rounds: Tuple, args: Dict, n_particles: int, iters:
         step_trace[key] = {}
         step_trace[key]['time'] = str(datetime.datetime.now())
         step_trace[key]['round_cost'] = round_cost
-        step_trace[key]['best_costs'] = best_cost
-        step_trace[key]['improvements'] = no_improvement
+        step_trace[key]['best_costs'] = best_cost.tolist()
+        step_trace[key]['improvements'] = no_improvement.tolist()
         if step_file is not None:
             with open(step_file, "w") as fo:
                 json.dump(step_trace, fo)

{mg-pso-gui-0.1.106 → mg-pso-gui-0.1.108}/setup.py

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

mg-pso-gui-0.1.106/mgpsogui/util/PSORunner.py

@@ -1,119 +0,0 @@
-
-import sys
-from multiprocessing import Process, Queue
-from queue import Empty
-import threading
-import time
-import os
-
-#from cosu.pso import global_best
-from .recosu.pso import global_best
-
-def enqueue_output(out, queue):
-    for line in iter(out.readline, b''):
-        queue.put(line)
-    out.close()
-
-def run_process(stdout_queue, stderr_queue, results_queue, cosu_queue, data, folder):
-    steps = data['steps']
-    args = data['arguments']
-    calib = data['calibration_parameters']
-    
-    # If "mode" in args remove it
-    if "mode" in args:
-        del args["mode"]
-    
-    calibration_map = {}
-    for param in calib:
-        param_name = param['name']
-        param_value = param['value']
-        calibration_map[param_name] = param_value
-        
-    if not os.path.exists(folder):
-        os.makedirs(folder)
-
-    if (os.path.exists(os.path.join(folder, 'output.txt'))):
-        os.remove(os.path.join(folder, 'output.txt'))
-        
-    if (os.path.exists(os.path.join(folder, 'error.txt'))):
-        os.remove(os.path.join(folder, 'error.txt'))
-    
-    old_stdout = sys.stdout
-    old_stderr = sys.stderr
-    
-    read_stdout, write_stdout = os.pipe()
-    read_stderr, write_stderr = os.pipe()
-    
-    sys.stdout = os.fdopen(write_stdout, 'w')
-    sys.stderr = os.fdopen(write_stderr, 'w')
-    
-    stdour_thread = threading.Thread(target=enqueue_output, args=(os.fdopen(read_stdout, 'r'), stdout_queue))
-    stderr_thread = threading.Thread(target=enqueue_output, args=(os.fdopen(read_stderr, 'r'), stderr_queue))
-    stdour_thread.daemon = True
-    stderr_thread.daemon = True
-    stdour_thread.start()
-    stderr_thread.start()
-    
-    options = {}
-    oh_strategy = {}
-    
-    for key in calibration_map.keys():
-        if "options_" in key:
-            options[key.replace("options_", "")] = float(calibration_map[key])
-        if "strategy_" in key:
-            oh_strategy[key.replace("strategy_", "")] = calibration_map[key]
-
-    config = {
-        'service_timeout': int(calibration_map['service_timeout']),
-        'http_retry': int(calibration_map['http_retry']),
-        'http_allow_redirects': True if calibration_map['allow_redirects'] == "True" else False,
-        'async_call': True if calibration_map['async_call'] == "True" else False,
-        'http_conn_timeout': int(calibration_map['conn_timeout']),
-        'http_read_timeout': int(calibration_map['read_timeout']),
-        'particles_fail': int(calibration_map['particles_fail']),
-        'step_trace': os.path.join(folder, 'step_trace.json')
-    }
-
-    print("\n")
-    print(steps)
-    print("\n")
-    print(args)
-    print("\n")
-    print(calibration_map)
-    print("\n")
-    print(options)
-    print("\n")
-    print(oh_strategy)
-    print("\n")
-    print(config)
-    print("\n")
-
-
-    
-    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)
-    
-    print("Finishing up...")
-    time.sleep(5)
-    
-    stdour_thread.join()
-    stderr_thread.join()
-    
-    sys.stdout = old_stdout
-    sys.stderr = old_stderr