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

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

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

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

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

{mg-pso-gui-0.1.108 → mg-pso-gui-0.1.110}/mgpsogui/gui/HomePage.py

@@ -330,14 +330,11 @@ class App(customtkinter.CTk):
    
 			self.optimal_param_frame.clear()
 			self.optimal_param_frame.render()
-   
-			info = self.option_manager.get_project_data()
-			folder = os.path.join(info['path'], info['name'])
-			self.HRU_data = pd.read_csv(os.path.join(folder, "results", "HRU_1.csv"), skiprows=3)
-			print(self.HRU_data)
 			
 			self.load_button.configure(text="Loaded!")
 			self.after(3000, lambda: self.load_button.configure(text="Load"))
+   
+  			self.make_request()
 			
 		except Exception as e:
 			print(e)

{mg-pso-gui-0.1.108 → mg-pso-gui-0.1.110}/mgpsogui/gui/SetupTab/SetupTab.py

@@ -17,8 +17,8 @@ def create_tab(self, tab):
     self.paramtabview.grid(row=0, column=1, padx=(0, 0), pady=(10, 10), sticky="nsew")
     
     tab1 = "Static"
-    tab2 = "Calibration"
-    tab3 = "Optimal Parameters"
+    tab2 = "Hyperparameters"
+    tab3 = "Optimal"
     self.paramtabview.add(tab1)
     self.paramtabview.add(tab2)
     self.paramtabview.add(tab3)

{mg-pso-gui-0.1.108 → mg-pso-gui-0.1.110}/mgpsogui/util/debug.py

@@ -100,6 +100,9 @@ args = {
 
 args = {'param': [{'name': 'startTime', 'value': '2002-01-01'}, {'name': 'endTime', 'value': '2006-12-31'}, {'name': 'dataStartTime', 'value': '2002-01-01'}, {'name': 'dataEndTime', 'value': '2006-12-31'}, {'name': 'cal_startTime', 'value': '2003-01-01'}, {'name': 'cal_endTime', 'value': '2006-12-31'}, {'name': 'parallelismThreads', 'value': '2'}, {'name': 'flagLoadState', 'value': 'True'}, {'name': 'payload', 'value': 'false'}, {'name': 'project', 'value': 'SFIR3'}], 'url': 'http://csip.engr.colostate.edu:8087/csip-oms/m/ages/0.3.0', 'mode': 'PSO', 'files': {}}
 
+if "mode" in args:
+    del args["mode"]
+
 # 3. perform optimization
 optimizer, trace  = global_best(steps,                 # step definition
                 rounds=(1, 2),                              # min/max number of rounds
@@ -117,6 +120,7 @@ optimizer, trace  = global_best(steps,                 # step definition
                     'async_call': False,
                     'http_conn_timeout': 10,
                     'http_read_timeout': 400,
-                    'particles_fail': 5
+                    'particles_fail': 5,
+                    'step_trace': './step_trace.json'
                     }
             )  

{mg-pso-gui-0.1.108 → mg-pso-gui-0.1.110}/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:
@@ -351,7 +376,8 @@ def global_best(steps: Dict, rounds: Tuple, args: Dict, n_particles: int, iters:
         with open(step_file, "w") as fo:
             json.dump(step_trace, fo)
 
-    result_queue.put("Step Trace")
-    result_queue.put(step_trace)
+    if result_queue is not None:
+        result_queue.put("Step Trace")
+        result_queue.put(step_trace)
 
     return optimizer, step_trace

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

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