mg-pso-gui 0.1.114__tar.gz → 0.1.116__tar.gz

{mg-pso-gui-0.1.114 → mg-pso-gui-0.1.116}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.1
 Name: mg-pso-gui
-Version: 0.1.114
+Version: 0.1.116
 Summary: GUI for MG-PSO
 Author: Robert Cordingly
 Author-email: <rcording@uw.ed>
 Keywords: python,muti-group,pso,particle,swarm,optimization,gui
 Classifier: Development Status :: 1 - Planning
 Classifier: Intended Audience :: Developers
-Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
 Classifier: Operating System :: Unix
 Classifier: Operating System :: MacOS :: MacOS X
 Classifier: Operating System :: Microsoft :: Windows

{mg-pso-gui-0.1.114 → mg-pso-gui-0.1.116}/mg_pso_gui.egg-info/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.1
 Name: mg-pso-gui
-Version: 0.1.114
+Version: 0.1.116
 Summary: GUI for MG-PSO
 Author: Robert Cordingly
 Author-email: <rcording@uw.ed>
 Keywords: python,muti-group,pso,particle,swarm,optimization,gui
 Classifier: Development Status :: 1 - Planning
 Classifier: Intended Audience :: Developers
-Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
 Classifier: Operating System :: Unix
 Classifier: Operating System :: MacOS :: MacOS X
 Classifier: Operating System :: Microsoft :: Windows

{mg-pso-gui-0.1.114 → mg-pso-gui-0.1.116}/mg_pso_gui.egg-info/SOURCES.txt

@@ -44,6 +44,7 @@ mgpsogui/util/PSORunner.py
 mgpsogui/util/__init__.py
 mgpsogui/util/debug.py
 mgpsogui/util/helpers.py
+mgpsogui/util/sampler_test_driver.py
 mgpsogui/util/CTkToolTip/__init__.py
 mgpsogui/util/CTkToolTip/ctk_tooltip.py
 mgpsogui/util/recosu/__init__.py

{mg-pso-gui-0.1.114 → mg-pso-gui-0.1.116}/mgpsogui/gui/HomePage.py

@@ -55,7 +55,6 @@ customtkinter.set_default_color_theme("blue")  # Themes: "blue" (standard), "gre
 results_queue = Queue()
 stdout_queue = Queue()
 stderr_queue = Queue()
-cosu_queue = Queue()
 
 class App(customtkinter.CTk):
 	def __init__(self):
@@ -432,7 +431,7 @@ class App(customtkinter.CTk):
 			if (os.path.exists(os.path.join(folder, 'error.txt'))):
 				os.remove(os.path.join(folder, 'error.txt'))
 			
-			self.train_process = Process(target=PSORunner.run_process, args=(stdout_queue, stderr_queue, results_queue, cosu_queue, metrics, folder))
+			self.train_process = Process(target=PSORunner.run_process, args=(stdout_queue, stderr_queue, results_queue, metrics, folder))
 			self.train_process.daemon = True
 			self.train_process.start()
 			self.after(1000, self.watch_loop)
@@ -508,28 +507,18 @@ class App(customtkinter.CTk):
 				print("# " + stdout_line, flush=True)
 				with open(os.path.join(folder, 'output.txt'), 'a') as f:
 					f.write(stdout_line)
-				
 			except Empty:
 				break
 			
 		while True:
 			try:
 				stderr_line = stderr_queue.get_nowait()
-				
 				print("? " + stderr_line, flush=True)
 				with open(os.path.join(folder, 'error.txt'), 'a') as f:
 					f.write(stderr_line)
 				
 			except Empty:
 				break
-			
-		while True:
-			try:
-				cosu_line = cosu_queue.get_nowait()
-				
-				print("COSU " + cosu_line, flush=True)
-			except Empty:
-				break
 
 		while True:
 			try:
@@ -552,14 +541,13 @@ class App(customtkinter.CTk):
 								target_param['optimal_value'].set(value)
 					index += 1
 				print("Applied optimal values")
-    
-    
 			except Empty:
 				break
 			except Exception as e:
 				print("Some error happened when getting the trace!")
 				print(e)
 		
+		# Write output to textbox
 		if (os.path.exists(os.path.join(folder, 'output.txt'))):
 			with open(os.path.join(folder, 'output.txt'), 'r') as f:
 				lines = f.readlines()
@@ -593,17 +581,10 @@ class App(customtkinter.CTk):
 				calibrated_params = [ast.literal_eval(i) for i in calibrated_params]
 				best_particle_values = [ast.literal_eval(i) for i in best_particle_values]
 				progress_values = [tuple(map(float, i)) for i in progress_values]
-				
-				#print("Current params: " + str(calibrated_params), flush=True)
-	
 				self.calibration_data = calibrated_params
 				
-				#GraphGenerator.calibrated_params_by_round(self.running_config['steps'], calibrated_params, self.option_manager)
-				#self.update_graph("")
 			except Exception as e:
-				# Print stack trace
 				traceback.print_exc()
-				
 				print(e)
 				
 		if (os.path.exists(os.path.join(folder, 'error.txt'))):

{mg-pso-gui-0.1.114 → mg-pso-gui-0.1.116}/mgpsogui/util/PSORunner.py

@@ -14,7 +14,7 @@ def enqueue_output(out, queue):
         queue.put(line)
     out.close()
 
-def run_process(stdout_queue, stderr_queue, results_queue, cosu_queue, data, folder):
+def run_process(stdout_queue, stderr_queue, results_queue, data, folder):
     steps = data['steps']
     args = data['arguments']
     calib = data['calibration_parameters']

mg-pso-gui-0.1.116/mgpsogui/util/sampler_test_driver.py

@@ -0,0 +1,129 @@
+from typing import List, Dict, Iterable
+from recosu.sampling.sampler import run_sampler
+
+
+def main():
+    steps: List[Dict[str, any]] = [
+        {
+            "param": [
+                {
+                    "name": "Ksink",
+                    "bounds": [
+                        0.0,
+                        5.0
+                    ],
+                    "default_value": 1.0,
+                    "type": "float",
+                    "calibration_strategy": "none"
+                },
+                {
+                    "name": "a_rain",
+                    "bounds": [
+                        5.0,
+                        10.0
+                    ],
+                    "default_value": 1.0,
+                    "type": "float",
+                    "calibration_strategy": "none"
+                },
+                {
+                    "name": "flowRouteTA",
+                    "bounds": [
+                        0.01,
+                        0.1
+                    ],
+                    "default_value": 1.0,
+                    "type": "float",
+                    "calibration_strategy": "none"
+                },
+                {
+                    "name": "soilMaxDPS",
+                    "bounds": [
+                        0.001,
+                        10.0
+                    ],
+                    "default_value": 1.0,
+                    "type": "float",
+                    "calibration_strategy": "none"
+                }
+            ],
+            "objfunc": [
+                {
+                    "name": "ns",
+                    "of": "ns",
+                    "weight": 1.0,
+                    "data": [
+                        "orun5minall.csv/Runoff/orun[0]",
+                        "output/csip_run/out/subDailyOutlet.csv/output/subDailyCatchmentSimRunoff"
+                    ]
+                }
+            ]
+        }
+    ]
+
+    args: Dict[str, any] = {
+        "param": [
+            {
+                "name": "startTime",
+                "value": "2011-06-08"
+            },
+            {
+                "name": "endTime",
+                "value": "2011-07-13"
+            },
+            {
+                "name": "dataStartTime",
+                "value": "2011-06-08"
+            },
+            {
+                "name": "dataEndTime",
+                "value": "2011-07-13"
+            },
+            {
+                "name": "cal_startTime",
+                "value": "2011-06-08"
+            },
+            {
+                "name": "cal_endTime",
+                "value": "2011-07-13"
+            },
+            {
+                "name": "parallelismThreads",
+                "value": "8"
+            },
+            {
+                "name": "flagLoadState",
+                "value": "True"
+            },
+            {
+                "name": "payload",
+                "value": "false"
+            },
+            {
+                "name": "project",
+                "value": "drake58hru-5min"
+            }
+        ],
+        "url": "http://csip.engr.colostate.edu:8087/csip-oms/m/ages/1.0.1_sub",
+        "files": []
+    }
+
+    conf: Dict[str, any] = {
+        "service_timeout": 400,
+        "http_retry": 5,
+        "allow_redirects": True,
+        "async_call": True,
+        "conn_timeout": 10,
+        "read_timeout": 400,
+    }
+
+    trace = run_sampler(steps, args, 10, 2, "halton", conf=conf, trace_file="halton_trace.csv", offset=5)
+    print(trace)
+    
+    
+    trace = run_sampler(steps, args, 10, 2, "random", conf=conf, trace_file="random_trace.csv")
+    print(trace)
+
+
+if __name__ == "__main__":
+    main()

{mg-pso-gui-0.1.114 → mg-pso-gui-0.1.116}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import codecs
 import os
 
-VERSION = '0.1.114'
+VERSION = '0.1.116'
 DESCRIPTION = 'GUI for MG-PSO'
 LONG_DESCRIPTION = open('../README.md').read()
 
@@ -34,7 +34,7 @@ setup(
     classifiers=[
         "Development Status :: 1 - Planning",
         "Intended Audience :: Developers",
-        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
         "Operating System :: Unix",
         "Operating System :: MacOS :: MacOS X",
         "Operating System :: Microsoft :: Windows",