mg-pso-gui 0.1.198__py3-none-any.whl → 0.1.200__py3-none-any.whl

{mg_pso_gui-0.1.198.dist-info → mg_pso_gui-0.1.200.dist-info}/METADATA

@@ -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.dist-info → mg_pso_gui-0.1.200.dist-info}/RECORD

@@ -2,7 +2,7 @@ mgpsogui/__init__.py,sha256=q7AfBjeJABnFtbsZnsObpUwaXKPDVYtz46G6MKXLF74,42
 mgpsogui/mgpsogui.py,sha256=NIZmyNcbwC8EgSwf1ubdMUSJscrIEgoD4jLYziqHQ-k,148
 mgpsogui/start.yaml,sha256=ZjCVLb-MLqAxrGRm9kA7_SDpa-45EuKIELNQ2QqCAiU,4713
 mgpsogui/gui/HomePage.py,sha256=S4vm9gtwoWjfbNmFSX5e-_l18ti0YIFulrH9a3v953s,22845
-mgpsogui/gui/OptionManager.py,sha256=CmwUV6FdgBf1DN8EhCVM1IRptCGVlArZFjpgWvHUwpE,14807
+mgpsogui/gui/OptionManager.py,sha256=dtWY5jzNAaL6t3q7SLHiwoKQOYrAsMGE5UqwYdmPzF4,14829
 mgpsogui/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/PlatformTab/PlatformTab.py,sha256=q8x_tvVgSoyGINuQbivXRThF3gaSSfg8X_dsLSPv4F0,10492
 mgpsogui/gui/PlatformTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -11,13 +11,13 @@ mgpsogui/gui/RunTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 mgpsogui/gui/SetupTab/BoundsEditorWindow.py,sha256=_6_xEl46PY9MmNvpmoMNdNDbVav6ODwWSDROboy57Cs,2866
 mgpsogui/gui/SetupTab/BoundsList.py,sha256=L77UEaUJNiUE-ZsYIl44tWRb1zBfxaEQ-bAG1V5_IH0,12268
 mgpsogui/gui/SetupTab/CalibrationParametersView.py,sha256=ppVBHG3nphku9-P6Z8az-HTpgk8vHxnj-A5m80BZTgA,2784
-mgpsogui/gui/SetupTab/FunctionsList.py,sha256=tUqW43VWpxFpdo9UHaPvFQ0CtCo9mFI3mri52ikntrE,4092
+mgpsogui/gui/SetupTab/FunctionsList.py,sha256=Ty0S2Hs7XrtZCQNo7nSKNVYoMkRQN9-x0CEWogwgcO4,4709
 mgpsogui/gui/SetupTab/ListEditor.py,sha256=vlP0KDPu8J1_6KXuUTlE7OClgfF0Qk6cISsFm_SglUw,3232
 mgpsogui/gui/SetupTab/ListParametersView.py,sha256=wYcDcaooYkw-y7XW6dJUwhTWxLuUUOK5tGUFVHBf3ck,7352
 mgpsogui/gui/SetupTab/OptimalParameterView.py,sha256=VKn-4BlVyqspFIOkbWsM0q9pYVsmqnSND0xP2hDKb60,1785
 mgpsogui/gui/SetupTab/SetupTab.py,sha256=_cehQwQhDbX92da_AwqYQ2mQo7sFDGkN1IsYQmctK5o,2776
 mgpsogui/gui/SetupTab/StaticParameterView.py,sha256=iEG-UpBBlAJabZo3MG768oLqOROjUPc23tKOSd47IUc,2739
-mgpsogui/gui/SetupTab/StepView.py,sha256=mUtxtXoEnh86oILaTaobjW3lpkgNio1MZZuM2RLOsqU,9034
+mgpsogui/gui/SetupTab/StepView.py,sha256=C6DDinU9AgaUM1EOAHetFI4bE89ANJ247F0doksaPus,9091
 mgpsogui/gui/SetupTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/VisualizeTab/MatrixEditor.py,sha256=JPQmfljdddIwHtTKpFqUdk7hRzVdX-IKl4neOk3DsjM,3132
 mgpsogui/gui/VisualizeTab/SideBar.py,sha256=MtZfDScNFN0fQ8DyPm6bZGJSrFRgT14fZeUq-qc61O8,21936
@@ -35,7 +35,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=OyCPwIDkbRzNZiJQII3F76yTKj_EdeMiE8vaih-n5lE,22811
-mgpsogui/util/PSORunner.py,sha256=sWgickFGl97p3ybWz97LR5qeYhnNqryKx5nWAa-NhwA,6306
+mgpsogui/util/PSORunner.py,sha256=-kOjzPaYVq8G5NJSdUddAYxa5KVPTn3NYmVGv2I_1cg,10251
 mgpsogui/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/util/debug.py,sha256=Swzny9_1S-CCONWGssj9iDoSpbwu5Vr4f95g_9L8bec,19759
 mgpsogui/util/helpers.py,sha256=Ht2rge_4pGO7halz6KoLsL2eukB0k2tlkx68lBBmBA8,2669
@@ -60,8 +60,8 @@ mgpsogui/util/recosu/utils/trace_writer.py,sha256=V9BJlOjCbNYGoXGEk3CF5wjifBxvar
 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.198.dist-info/METADATA,sha256=uNvoylGNem8RiBo7616A0ZYctI_bdkS7vRpwf3JqGLQ,9456
-mg_pso_gui-0.1.198.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
-mg_pso_gui-0.1.198.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.1.198.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.1.198.dist-info/RECORD,,
+mg_pso_gui-0.1.200.dist-info/METADATA,sha256=MtO6uzSX0HXy_M1Crudg10PiS4-B2CVoslla7Mm34FY,9456
+mg_pso_gui-0.1.200.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
+mg_pso_gui-0.1.200.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.1.200.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.1.200.dist-info/RECORD,,

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()
 

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

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)
+        """

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)