mg-pso-gui 0.2.94__tar.gz → 0.2.96__tar.gz

{mg_pso_gui-0.2.94 → mg_pso_gui-0.2.96}/PKG-INFO

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

{mg_pso_gui-0.2.94 → mg_pso_gui-0.2.96}/mg_pso_gui.egg-info/PKG-INFO

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

{mg_pso_gui-0.2.94 → mg_pso_gui-0.2.96}/mgpsogui/gui/HomePage.py

@@ -153,7 +153,10 @@ class App(customtkinter.CTk):
 																command=self.change_scaling_event)
 		self.scaling_optionemenu.grid(row=0, column=8, padx=(5, 20), pady=header_padding_y)
 		self.scaling_optionemenu.set("100%")
-		
+
+		self.help_button = customtkinter.CTkButton(self.sidebar_frame, text="Help", width=20, command=self.open_help)
+		self.help_button.grid(row=0, column=9, padx=header_padding_x, pady=header_padding_y)
+
 		expand_image = customtkinter.CTkImage(Image.open(os.path.join("./images", "expand.png")), size=(20, 20))
 		#self.new_window = customtkinter.CTkButton(self.sidebar_frame, text=None, width=30, image=expand_image, command=self.open_new_window)
 		#ctt(self.new_window, delay=0.1, alpha=0.95, message="Open New Window")
@@ -211,7 +214,10 @@ class App(customtkinter.CTk):
 		self.after(1000, self.running_loop)
 
 		# Read the file ./messages/welcome.txt and load it as a string and put it into the message
+
+		self.open_help()
 		
+	def open_help(self):
 		with open(os.path.join("./messages", "welcome.txt"), "r") as f:
 			message = f.read()
 			NW(title="Welcome!", message=message)
@@ -484,6 +490,15 @@ class App(customtkinter.CTk):
 		if not os.path.exists(folder):
 			os.makedirs(folder)
 			
+		# Check if crash.txt exists in the folder
+		if (os.path.exists(os.path.join(folder, 'crash.txt'))):
+			with open(os.path.join(folder, 'crash.txt'), "r") as f:
+				message = f.read()
+				NW(title="Error Occurred!", message=message)
+			# Rename crash.txt to crash_read.txt
+			os.rename(os.path.join(folder, 'crash.txt'), os.path.join(folder, 'crash_read.txt'))
+			self.stop()
+
 		while True:
 			try:
 				stdout_line = stdout_queue.get_nowait()

{mg_pso_gui-0.2.94 → mg_pso_gui-0.2.96}/mgpsogui/gui/SetupTab/FunctionsList.py

@@ -43,6 +43,8 @@ class FunctionsList(CTkFrame):
         self.containerFrame.grid(row=0, column=0, padx=(5, 5), pady=(5, 5), sticky="nsew")
         self.containerFrame.grid_columnconfigure((0, 1), weight=1)
         
+        mode = self.option_manager.get_mode()
+
         row = 1
         
         funcs = self.option_manager.get_steps()[self.step_index]["objective_functions"]
@@ -56,23 +58,23 @@ class FunctionsList(CTkFrame):
             
             row += 1
             
-            columns = ["absdiff",
-                       "absdifflog",
-                       "ave",
-                       "bias",
-                       "fhf",
-                       "ioa",
-                       "ioa2",
+            columns = ["absdiff (not supported)",
+                       "absdifflog  (not supported)",
+                       "ave  (not supported)",
+                       "bias  (not supported)",
+                       "fhf  (not supported)",
+                       "ioa  (not supported)",
+                       "ioa2  (not supported)",
                        "kge",
-                       "kge09",
-                       "mns",
-                       "mse",
+                       "kge09  (not supported)",
+                       "mns  (not supported)",
+                       "mse  (not supported)",
                        "ns",
-                       "ns2log",
+                       "ns2log  (not supported)",
                        "nslog1p",
-                       "nslog2",
+                       "nslog2  (not supported)",
                        "pbias",
-                       "pmcc",
+                       "pmcc  (not supported)",
                        "rmse",
                        "trmse",
                        "custom"]
@@ -105,14 +107,15 @@ class FunctionsList(CTkFrame):
 
                 row += 1
             
-            CTkLabel(self.containerFrame, text="Observed and Simulated Data:").grid(row=row, column=0, columnspan=3, padx=(5, 5), pady=(5, 5), sticky="nsew")
-            
-            row += 1
-            
-            CTkEntry(self.containerFrame, textvariable=func["data_observed"]).grid(row=row, column=0, columnspan=3, padx=(5, 5), pady=(5, 5), sticky="nsew")
-            row += 1
-            CTkEntry(self.containerFrame, textvariable=func["data_simulated"]).grid(row=row, column=0, columnspan=3, padx=(5, 5), pady=(5, 5), sticky="nsew")
-            row += 1
+            if mode != "Sensitive Analysis":
+                CTkLabel(self.containerFrame, text="Observed and Simulated Data:").grid(row=row, column=0, columnspan=3, padx=(5, 5), pady=(5, 5), sticky="nsew")
+                
+                row += 1
+                
+                CTkEntry(self.containerFrame, textvariable=func["data_observed"]).grid(row=row, column=0, columnspan=3, padx=(5, 5), pady=(5, 5), sticky="nsew")
+                row += 1
+                CTkEntry(self.containerFrame, textvariable=func["data_simulated"]).grid(row=row, column=0, columnspan=3, padx=(5, 5), pady=(5, 5), sticky="nsew")
+                row += 1
 
             if self.edit_mode:
                 remove_func = lambda index=index: (self.clear(), self.option_manager.remove_function(self.step_index, index), self.render())

{mg_pso_gui-0.2.94 → mg_pso_gui-0.2.96}/mgpsogui/util/PSORunner.py

@@ -14,6 +14,19 @@ import shutil
 import json
 import numpy as np
 
+ZERO_BEST = [
+    'rmse',
+    'trmse',
+    'pbias'
+]
+
+POSITIVE_BEST = [
+    'kge',
+    'nslog',
+    'nslog1p',
+    'ns'
+]
+
 def enqueue_output(out, queue):
     for line in iter(out.readline, b''):
         queue.put(line)
@@ -378,6 +391,15 @@ def run_sensitivity_analysis(data, folder, results_queue):
     for param in output_steps[0]['param']:
         parameters.append(param['name'])
 
+    positive_best = []
+    zero_best = []
+
+    for obj in output_steps[0]['objfunc']:
+        if obj['of'] in POSITIVE_BEST:
+            positive_best.append(obj['of'])
+        elif obj['of'] in ZERO_BEST:
+            zero_best.append(obj['of'])
+
     request_json = {
         "metainfo": {
             "service_url": None,
@@ -392,11 +414,11 @@ def run_sensitivity_analysis(data, folder, results_queue):
             },
             {
             "name": "positiveBestMetrics",
-            "value": ["ns","kge","mns","kge09","nslog2"]
+            "value": positive_best
             },
             {
             "name": "zeroBestMetrics",
-            "value": ["pbias","rmse"]
+            "value": zero_best
             }
         ]
     }

{mg_pso_gui-0.2.94 → mg_pso_gui-0.2.96}/setup.py

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