mg-pso-gui 0.1.134__tar.gz → 0.1.135__tar.gz

{mg-pso-gui-0.1.134 → mg-pso-gui-0.1.135}/PKG-INFO

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

{mg-pso-gui-0.1.134 → mg-pso-gui-0.1.135}/mg_pso_gui.egg-info/PKG-INFO

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

{mg-pso-gui-0.1.134 → mg-pso-gui-0.1.135}/mgpsogui/util/PSORunner.py

@@ -68,16 +68,7 @@ def run_process(stdout_queue, stderr_queue, results_queue, data, folder):
             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, 'pso_step_trace.json')
-        }
+        config = {}
 
         if my_mode == "Sampling: Halton" or my_mode == "Sampling: Random":
             config = {
@@ -90,6 +81,17 @@ def run_process(stdout_queue, stderr_queue, results_queue, data, folder):
                 'particles_fail': int(calibration_map['particles_fail']),
                 'step_trace': os.path.join(folder, 'pso_step_trace.json')
             }
+        else:
+            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, 'pso_step_trace.json')
+            }
 
         print("\n")
         print(steps)
@@ -105,9 +107,8 @@ def run_process(stdout_queue, stderr_queue, results_queue, data, folder):
         print(config)
         print("\n")
 
-        print("Running global_best...\n")
-
         if my_mode == "Sampling: Halton":
+            print("Running Halton Sampling..\n")
             trace = run_sampler(steps, 
                                 args, 
                                 int(calibration_map['count']), 
@@ -120,6 +121,7 @@ def run_process(stdout_queue, stderr_queue, results_queue, data, folder):
             print(trace)
             
         elif my_mode == "Sampling: Random":
+            print("Running Random Sampling...\n")
             trace = run_sampler(steps, 
                     args, 
                     int(calibration_map['count']), 
@@ -130,7 +132,7 @@ def run_process(stdout_queue, stderr_queue, results_queue, data, folder):
             results_queue.put(trace)
             print(trace)
         else:
-
+            print("Running MG-PSO Optimization...\n")
             optimizer, trace = global_best(steps,   
                     rounds=(int(calibration_map['min_rounds']), int(calibration_map['max_rounds'])),              
                     args=args,      

{mg-pso-gui-0.1.134 → mg-pso-gui-0.1.135}/setup.py

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