mg-pso-gui 0.1.107__py3-none-any.whl → 0.1.109__py3-none-any.whl

{mg_pso_gui-0.1.107.dist-info → mg_pso_gui-0.1.109.dist-info}/METADATA

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

{mg_pso_gui-0.1.107.dist-info → mg_pso_gui-0.1.109.dist-info}/RECORD

@@ -33,7 +33,7 @@ mgpsogui/gui/images/test.png,sha256=MUnVpRK-isxhEHzx4Q6Yh0M6FRZD1qvgCHH2XmiSBbk,
 mgpsogui/gui/images/trash.png,sha256=j8cf0kWbJd-4Jp20lUVV1o1NSeQ4v1Ej4gfcIA3DVRQ,2958
 mgpsogui/gui/images/up.png,sha256=AQvFWCUqSQNaQ1E6LKZ9zNfSvW6t4mgy8uswdg9T2Hg,2457
 mgpsogui/util/GraphGenerator.py,sha256=HhUsFUFhCv3wTYV8CTqU0wo56Ph9c1DocPj25AVIAdI,15076
-mgpsogui/util/PSORunner.py,sha256=xximtpisXKtXWtjlT9jTdOjPZNCfnWXC7xuAi_etuC8,3535
+mgpsogui/util/PSORunner.py,sha256=Do3-OUH7iZGL6aoCcwsM-6lxof8ERwyKA-_g8rDr_DM,3942
 mgpsogui/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/util/debug.py,sha256=R-OBdE7XH5ejfDGoOHIgKr-TomzFy-jPvUhVzhSbzm0,5159
 mgpsogui/util/CTkToolTip/__init__.py,sha256=G1jxV55hGtGgwyC1sR-uUUdasDdh0XZgcI-aILgGYA0,225
@@ -41,14 +41,14 @@ mgpsogui/util/CTkToolTip/ctk_tooltip.py,sha256=SZMovpQIGvdpDRbqCKl9SHs92DrFCO2MO
 mgpsogui/util/recosu/__init__.py,sha256=T7_iigIlowGbPOHLO3hwihjw2kbwIg6olOMhFhNiL38,236
 mgpsogui/util/recosu/pso/__init__.py,sha256=PQ548aEKVOk6MMzxxDg7yMO_1hHfoEoYLLkGLeij73Y,247
 mgpsogui/util/recosu/pso/csip_access.py,sha256=jBli1MSShUUwQCMKOUvMaGuNwBViCrjXJi_FmSEJsZA,2721
-mgpsogui/util/recosu/pso/pso.py,sha256=JN4nJcQRw_XAPfdUQSJx60HARCBB5V-hz7toTe_vSbQ,12867
+mgpsogui/util/recosu/pso/pso.py,sha256=D5UhgIR9gD1lVF_OjGkvun-zctWRlofHeMvlJhazEaI,13667
 mgpsogui/util/recosu/utils/__init__.py,sha256=TXz_TpNif2GeGu22pzTnkUQvaP-PmLQ9Sz4BgMIS6ig,196
 mgpsogui/util/recosu/utils/trace_writer.py,sha256=V9BJlOjCbNYGoXGEk3CF5wjifBxvarrMRXJMbDBWqI8,3023
 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.107.dist-info/METADATA,sha256=XI6EjVCh872bujkdZdK76sHiy3ZT_T0qtEiDk7jcYNI,9459
-mg_pso_gui-0.1.107.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-mg_pso_gui-0.1.107.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.1.107.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.1.107.dist-info/RECORD,,
+mg_pso_gui-0.1.109.dist-info/METADATA,sha256=ByqRMvtrHClBmhkGdQvpb0puilL4eh9ZAsErz4Dhrco,9459
+mg_pso_gui-0.1.109.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+mg_pso_gui-0.1.109.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.1.109.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.1.109.dist-info/RECORD,,

mgpsogui/util/PSORunner.py

@@ -47,73 +47,77 @@ def run_process(stdout_queue, stderr_queue, results_queue, cosu_queue, data, fol
     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))
+    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))
-    stdour_thread.daemon = True
+    stdout_thread.daemon = True
     stderr_thread.daemon = True
-    stdour_thread.start()
+    stdout_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")
-
+    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]
 
-    
-    print("Running global_best...\n")
+        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
+        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

mgpsogui/util/recosu/pso/pso.py

@@ -168,7 +168,15 @@ def global_best(steps: Dict, rounds: Tuple, args: Dict, n_particles: int, iters:
     step_trace['min_rounds'] = min_rounds
     step_trace['max_rounds'] = max_rounds
     step_trace['iters'] = iters
-    #step_trace['ftol'] = ftol BUG DOES NOT HANDLE -INF
+    
+    # BUG If ftol is -inf set it to a string
+    ftol_value = ftol
+    if ftol == -np.inf:
+        ftol_value = '-inf'
+    elif ftol == np.inf:
+        ftol_value = 'inf'
+    
+    step_trace['ftol'] = ftol_value
     step_trace['ftol_iter'] = ftol_iter
     step_trace['rtol'] = rtol
     step_trace['rtol_iter'] = rtol_iter
@@ -176,7 +184,7 @@ def global_best(steps: Dict, rounds: Tuple, args: Dict, n_particles: int, iters:
     step_trace['n_particles'] = n_particles
     step_trace['n_steps'] = len(steps)
     step_trace['steps'] = copy.deepcopy(steps)
-    #step_trace['args'] = args BUG MUST BE REMOVED
+    step_trace['args'] = str(args) #BUG MUST BE REMOVED
 
     if step_file is not None:
         with open(step_file, "w") as fo:
@@ -277,7 +285,15 @@ 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]['best_costs'] = best_cost.tolist() # BUG
+            best_costs_list = best_cost.tolist()
+            # If the cost is inf, set it to a string
+            for i, c in enumerate(best_costs_list):
+                if c == np.inf:
+                    best_costs_list[i] = 'inf'
+                elif c == -np.inf:
+                    best_costs_list[i] = '-inf'
+            
+            step_trace[key]['best_costs'] = best_costs_list # BUG
             step_trace[key]['steps'] = copy.deepcopy(steps)
 
             if step_file is not None:
@@ -314,7 +330,16 @@ 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.tolist()
+        
+        best_costs_list = best_cost.tolist() #BUG
+        # If the cost is inf, set it to a string
+        for i, c in enumerate(best_costs_list):
+            if c == np.inf:
+                best_costs_list[i] = 'inf'
+            elif c == -np.inf:
+                best_costs_list[i] = '-inf'
+        
+        step_trace[key]['best_costs'] = best_costs_list
         step_trace[key]['improvements'] = no_improvement.tolist()
         if step_file is not None:
             with open(step_file, "w") as fo: