mg-pso-gui 0.1.198__tar.gz → 0.1.200__tar.gz

{mg_pso_gui-0.1.198 → mg_pso_gui-0.1.200}/PKG-INFO

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

{mg_pso_gui-0.1.198 → mg_pso_gui-0.1.200}/mg_pso_gui.egg-info/PKG-INFO

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

{mg_pso_gui-0.1.198 → mg_pso_gui-0.1.200}/mgpsogui/gui/OptionManager.py

@@ -22,7 +22,7 @@ class OptionManager():
         self.steps = []
         self.service_parameters = {}
 
-        self.service_modes = ["Optimization: MG-PSO", "Sampling: Halton", "Sampling: Random", "Sensitivity Analysis"]
+        self.service_modes = ["Optimization: MG-PSO", "Sampling: Halton", "Sampling: Random", "Sensitivity: Halton", "Sensitivity: Random"]
         for mode in self.service_modes:
             self.arguments["urls"][mode] = sv()
 

{mg_pso_gui-0.1.198 → mg_pso_gui-0.1.200}/mgpsogui/gui/SetupTab/FunctionsList.py

@@ -47,8 +47,27 @@ class FunctionsList(CTkFrame):
             
             row += 1
             
+            columns = ["absdiff",
+                       "absdifflog",
+                       "ave",
+                       "bias",
+                       "fhf",
+                       "ioa",
+                       "ioa2",
+                       "kge",
+                       "kge09",
+                       "mns",
+                       "mse",
+                       "ns",
+                       "ns2log",
+                       "nslog1p",
+                       "nslog2",
+                       "pbias",
+                       "pmcc",
+                       "rmse",
+                       "trmse"]
             CTkEntry(self.containerFrame, textvariable=func["name"]).grid(row=row, column=0, padx=(5, 5), pady=(5, 5), sticky="ew")
-            CTkEntry(self.containerFrame, textvariable=func["of"]).grid(row=row, column=1, padx=(5, 5), pady=(5, 5), sticky="ew")
+            CTkOptionMenu(self.containerFrame, values=columns, variable=func["of"]).grid(row=row, column=1, padx=(5, 5), pady=(5, 5), sticky="ew")
             CTkEntry(self.containerFrame, textvariable=func["weight"]).grid(row=row, column=2, padx=(5, 5), pady=(5, 5), sticky="ew")
             
             row += 1

{mg_pso_gui-0.1.198 → mg_pso_gui-0.1.200}/mgpsogui/gui/SetupTab/StepView.py

@@ -106,7 +106,7 @@ class StepView(CTkScrollableFrame):
 
                 row += 1
 
-            if step['open'] or (self.mode == "Sampling: Halton" or self.mode == "Sampling: Random" or self.mode == "Sensitivity Analysis"):
+            if step['open'] or (self.mode == "Sampling: Halton" or self.mode == "Sampling: Random" or self.mode == "Sensitivity: Halton" or self.mode == "Sensitivity: Random"):
                 bounds = BoundsList.BoundsList(
                     self.containerFrame, option_manager=self.option_manager, step_index=index)
                 bounds.grid(row=row, column=0, padx=(10, 10),
@@ -132,6 +132,7 @@ class StepView(CTkScrollableFrame):
             CTkButton(self.containerFrame, text="Add Group", command=self.create_new_step).grid(
                 row=row, columnspan=2, column=0, padx=(10, 10), pady=(10, 10), sticky="ew")
             
+        """
         if (self.mode == "Sampling: Halton" or self.mode == "Sampling: Random" or self.mode == "Sensitivity Analysis"):
             self.analysisFrame = CTkFrame(self)
             self.analysisFrame.grid(row=2, column=0, columnspan=2, padx=(10, 10), pady=(10, 10), sticky="nsew")
@@ -161,7 +162,7 @@ class StepView(CTkScrollableFrame):
             self.positive_editor.grid_rowconfigure(0, weight=1)
 
             self.negative_editor = ListEditor.ListEditor(self.analysisFrame, option_manager=self.option_manager, 
-                                                       title = "Negative Best Metrics",
+                                                       title = "Zero Best Metrics",
                                                        columns=columns,
                                                        parameter_name="sensitivity_negativeBestMetrics",
                                                        parameter_remove_func=self.option_manager.remove_sensitivity_negativeBestMetrics,
@@ -169,3 +170,4 @@ class StepView(CTkScrollableFrame):
             self.negative_editor.grid(row=0, column=2, padx=(10, 10), pady=(10, 0), sticky="nsew")
             self.negative_editor.grid_columnconfigure(0, weight=1)
             self.negative_editor.grid_rowconfigure(0, weight=1)
+        """

{mg_pso_gui-0.1.198 → mg_pso_gui-0.1.200}/mgpsogui/util/PSORunner.py

@@ -7,6 +7,10 @@ import time
 import os
 from .recosu.sampling.sampling import run_sampler
 from .recosu.pso import global_best
+from csip import Client
+import traceback
+import urllib
+import shutil
 
 def enqueue_output(out, queue):
     for line in iter(out.readline, b''):
@@ -131,6 +135,80 @@ def run_process(stdout_queue, stderr_queue, results_queue, data, folder):
                     trace_file=os.path.join(folder, 'results', 'random_trace.csv'))
             results_queue.put(trace)
             print(trace, flush=True)
+        elif my_mode == "Sensitivity: Halton":
+            shutil.copyfile(os.path.join(folder, 'results', 'halton_trace.csv'), os.path.join(folder, 'results', 'trace.csv'))
+            trace_path = os.path.join(folder, 'results', 'trace.csv')
+
+            # Get list of parameters from steps
+            parameters = []
+            for param in steps[0]['parameters']:
+                parameters.append(param['name'])
+
+            request_json = {
+                "metainfo": {
+                    "service_url": None,
+                    "description": "",
+                    "name": "",
+                    "mode": "async"
+                },
+                "parameter": [
+                    {
+                    "name": "parameters",
+                    "value": parameters
+                    },
+                    {
+                    "name": "positiveBestMetrics",
+                    "value": ["ns","kge","mns","kge09","nslog2"]
+                    },
+                    {
+                    "name": "zeroBestMetrics",
+                    "value": ["pbias","rmse"]
+                    }
+                ]
+            }
+            # Write the request to a file
+            with open(os.path.join(folder, 'results', 'request.json'), 'w') as f:
+                f.write(str(request_json))
+            request_path = os.path.join(folder, 'results', 'request.json')
+
+            sensitivity_analysis(args['url'], request_path, trace_path, folder)
+        elif my_mode == "Sensitivity: Random":
+            shutil.copyfile(os.path.join(folder, 'results', 'random_trace.csv'), os.path.join(folder, 'results', 'trace.csv'))
+            trace_path = os.path.join(folder, 'results', 'trace.csv')
+            
+            # Get list of parameters from steps
+            parameters = []
+            for param in steps[0]['parameters']:
+                parameters.append(param['name'])
+
+            request_json = {
+                "metainfo": {
+                    "service_url": None,
+                    "description": "",
+                    "name": "",
+                    "mode": "async"
+                },
+                "parameter": [
+                    {
+                    "name": "parameters",
+                    "value": parameters
+                    },
+                    {
+                    "name": "positiveBestMetrics",
+                    "value": ["ns","kge","mns","kge09","nslog2"]
+                    },
+                    {
+                    "name": "zeroBestMetrics",
+                    "value": ["pbias","rmse"]
+                    }
+                ]
+            }
+            # Write the request to a file
+            with open(os.path.join(folder, 'results', 'request.json'), 'w') as f:
+                f.write(str(request_json))
+            request_path = os.path.join(folder, 'results', 'request.json')
+
+            sensitivity_analysis(args['url'], request_path, trace_path, folder)
         else:
             print("Running MG-PSO Optimization...\n", flush=True)
             optimizer, trace = global_best(steps,   
@@ -166,4 +244,31 @@ def run_process(stdout_queue, stderr_queue, results_queue, data, folder):
         stderr_thread.join()
         
         sys.stdout = old_stdout
-        sys.stderr = old_stderr
+        sys.stderr = old_stderr
+
+def create_request(request_file: str) -> Client:
+    request: Client = Client.from_file(request_file)
+    return request
+
+def download_output(response: Client, target_directory) -> None:
+    data_names: list[str] = response.get_data_names()
+    for name in data_names:
+        url = response.get_data_value(name)
+        file_path = os.path.join(target_directory, name)
+        urllib.request.urlretrieve(url, file_path)
+
+def sensitivity_analysis(url, request_file, trace_file, output_directory):
+    request: Client = create_request(request_file)
+    files: list[str] = [trace_file] if os.path.isfile(trace_file) else []
+    conf = {
+        'service_timeout': 60.0,  # (sec)
+    }
+    result: Client = Client()
+    try:
+        result = request.execute(url, files=files, sync=True, conf=conf)
+    except Exception as ex:
+        traceback.print_exc()
+        exit(1)
+
+    if result.is_finished():
+        download_output(result, output_directory)

{mg_pso_gui-0.1.198 → mg_pso_gui-0.1.200}/setup.py

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