mg-pso-gui 0.1.17__tar.gz → 0.1.19__tar.gz

{mg-pso-gui-0.1.17 → mg-pso-gui-0.1.19}/PKG-INFO

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

{mg-pso-gui-0.1.17 → mg-pso-gui-0.1.19}/mg_pso_gui.egg-info/PKG-INFO

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

{mg-pso-gui-0.1.17 → mg-pso-gui-0.1.19}/mg_pso_gui.egg-info/SOURCES.txt

@@ -8,7 +8,6 @@ mg_pso_gui.egg-info/top_level.txt
 mgpsogui/__init__.py
 mgpsogui/mgpsogui.py
 mgpsogui/start.yaml
-mgpsogui/trace.json
 mgpsogui/gui/HomePage.py
 mgpsogui/gui/OptionManager.py
 mgpsogui/gui/__init__.py

{mg-pso-gui-0.1.17 → mg-pso-gui-0.1.19}/mgpsogui/gui/HomePage.py

@@ -113,7 +113,7 @@ class App(customtkinter.CTk):
 		
 		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.new_window)
-		ctt(self.refresh_button, delay=0.1, alpha=0.95, message="Open New Window")
+		ctt(self.new_window, delay=0.1, alpha=0.95, message="Open New Window")
 		self.new_window.grid(row=0, column=8, padx=(5, 20), pady=header_padding_y)
 		
 		self.tabview = customtkinter.CTkTabview(self, bg_color="transparent", fg_color="transparent")
@@ -148,14 +148,14 @@ class App(customtkinter.CTk):
 		self.footer_progress_bar.grid(row=0, column=4, padx=(50, 100), pady=header_padding_y, sticky="ew")
 		self.footer_progress_bar.set(0)
 		
-		self.algorithm_optionmenu = customtkinter.CTkOptionMenu(self.sidebar_frame, values=["PSO", "Halton"], width=50)
+		self.algorithm_optionmenu = customtkinter.CTkOptionMenu(self.footer_frame, values=["PSO", "Halton"], width=50)
 		self.algorithm_optionmenu.grid(row=0, column=6, padx=header_padding_x, pady=header_padding_y)
 		self.algorithm_optionmenu.set("PSO")
 
 		play_image = customtkinter.CTkImage(Image.open(os.path.join("./images", "play.png")), size=(20, 20))
 		self.run_button = customtkinter.CTkButton(self.footer_frame, text=None, width=30, image=play_image, command=self.run)
 		ctt(self.run_button, delay=0.1, alpha=0.95, message="Start Calibration")
-		self.run_button.grid(row=0, column=7, padx=(5, 5), pady=header_padding_y)
+		self.run_button.grid(row=0, column=7, padx=(20, 5), pady=header_padding_y)
 
 		test_image = customtkinter.CTkImage(Image.open(os.path.join("./images", "test.png")), size=(20, 20))
 		self.test_button = customtkinter.CTkButton(self.footer_frame, text=None, width=30, image=test_image, command=self.run)
@@ -168,7 +168,7 @@ class App(customtkinter.CTk):
 		self.stop_button.grid(row=0, column=9, padx=(5, 20), pady=header_padding_y)
 
 		download_image = customtkinter.CTkImage(Image.open(os.path.join("./images", "down.png")), size=(20, 20))
-		self.download_button = customtkinter.CTkButton(self.footer_frame, text=None, width=30, image=stop_image, command=self.stop)
+		self.download_button = customtkinter.CTkButton(self.footer_frame, text=None, width=30, image=download_image, command=self.stop)
 		ctt(self.download_button, delay=0.1, alpha=0.95, message="Download Results")
 		self.download_button.grid(row=0, column=10, padx=(5, 20), pady=header_padding_y)
 
@@ -582,47 +582,6 @@ class App(customtkinter.CTk):
 			self.progress_message_right.configure(text="")
 			self.textbox.insert("0.0", "\nCalibration finished!\n")
 
-'''
-	def get_results(self):
-		request: Client = Client()
-		for name, value in parameters.items():
-			# if parameter name has a / in it assume that is a file based parameter and therefore value needs to be an array
-			if "/" in name and type(value) is not list:
-				request.add_data(name, [value])
-			else:
-				request.add_data(name, value)
-
-		conf = {
-			'service_timeout': 60.0 # (sec)
-		}
-		files: List[str] = [] #optional list of filenames
-
-		#Synchronous Call
-		result: Client = request.execute(CSIP_ENDPOINT, files=files, sync=True, conf=conf)
-
-		#Asynchronous Call
-		tsamp: float = 0
-		def callback(c: Client, progress: str):
-			tsamp2: float = time.time()
-			print('Halton Update {} - {} - {}'.format(halton_id, c.get_status(), tsamp2 - tsamp))
-
-
-		tsamp = time.time()
-		result: Client = request.execute_async(
-			CSIP_ENDPOINT,
-			files=files,
-			callback=callback,
-			first_poll=poll_time,
-			next_poll=poll_time,
-			conf=conf
-		)
-		# After recieving response
-		if result.is_finished():
-			print(result)
-		else:
-			print(result)
-'''
-
 def start():
 	app = App()
 	app.mainloop()

{mg-pso-gui-0.1.17 → mg-pso-gui-0.1.19}/mgpsogui/util/PSORunner.py

@@ -1,4 +1,5 @@
 import csip
+from csip import Client
 import cosu
 import sys
 from multiprocessing import Process, Queue
@@ -99,81 +100,43 @@ def run_process(stdout_queue, stderr_queue, results_queue, cosu_queue, data, fol
     sys.stderr = old_stderr
     results_queue.put((optimizer, trace))
 
+def get_results():
+    request: Client = Client()
+    for name, value in parameters.items():
+        # if parameter name has a / in it assume that is a file based parameter and therefore value needs to be an array
+        if "/" in name and type(value) is not list:
+            request.add_data(name, [value])
+        else:
+            request.add_data(name, value)
+
+    conf = {
+        'service_timeout': 60.0 # (sec)
+    }
+    files: List[str] = [] #optional list of filenames
+
+    #Synchronous Call
+    result: Client = request.execute(CSIP_ENDPOINT, files=files, sync=True, conf=conf)
+
+    #Asynchronous Call
+    tsamp: float = 0
+    def callback(c: Client, progress: str):
+        tsamp2: float = time.time()
+        print('Halton Update {} - {} - {}'.format(halton_id, c.get_status(), tsamp2 - tsamp))
+
+
+    tsamp = time.time()
+    result: Client = request.execute_async(
+        CSIP_ENDPOINT,
+        files=files,
+        callback=callback,
+        first_poll=poll_time,
+        next_poll=poll_time,
+        conf=conf
+    )
+    # After recieving response
+    if result.is_finished():
+        print(result)
+    else:
+        print(result)
 
 
-
-"""import csip
-import cosu
-import sys
-import multiprocessing
-import threading
-import time
-import os
-
-from cosu.pso import global_best
-
-def run_process(process_queue, data, folder):
-    steps = data['steps']
-    args = data['arguments']
-    calib = data['calibration_parameters']
-    
-    calibration_map = {}
-    for param in calib:
-        param_name = param['name']
-        param_value = param['value']
-        calibration_map[param_name] = param_value
-        
-    if not os.path.exists(folder):
-        os.makedirs(folder)
-
-    if (os.path.exists(os.path.join(folder, 'output.txt'))):
-        os.remove(os.path.join(folder, 'output.txt'))
-        
-    if (os.path.exists(os.path.join(folder, 'error.txt'))):
-        os.remove(os.path.join(folder, 'error.txt'))
-
-    sys.stdout = open(os.path.join(folder, 'output.txt'), 'w', buffering=1)
-    sys.stderr = open(os.path.join(folder, 'error.txt'), 'w', buffering=1)
-    
-    options = {}
-    oh_strategy = {}
-    
-    for key in calibration_map.keys():
-        if "options_" in key:
-            options[key.replace("options_", "")] = float(calibration_map[key])
-        if "strategy_" in key:
-            oh_strategy[key.replace("strategy_", "")] = calibration_map[key]
-
-    print("\n")
-    print(calibration_map)
-    print("\n")
-    print(options)
-    print("\n")
-    print(oh_strategy)
-    print("\n")
-    
-    print("Running global_best...\n")
-
-    optimizer, trace = global_best(steps,                 # step definition
-            rounds=(int(calibration_map['min_rounds']), int(calibration_map['max_rounds'])),                              # min/max number of rounds
-            args=args,                                  # static arguments    
-            n_particles=int(calibration_map['n_particles']),                             # number of particle candidates for each param
-            iters=int(calibration_map['iters']),                                   # max # of iterations
-            n_threads=int(calibration_map['n_threads']),                               # number of threads to use
-            # ftol=0.00000001,                          # min cost function delta for convergence
-            options=options,       # hyperparameter
-            oh_strategy=oh_strategy,   # adaptive hyperparameter adjustments based on current and max # of iterations 
-            conf={
-                'service_timeout': int(calibration_map['service_timeout']),
-                'http_retry': int(calibration_map['http_retry']),
-                'http_allow_redirects': True if calibration_map['allow_redirects'] == "True" else False,
-                'async_call': True if calibration_map['async_call'] == "True" else False,
-                'http_conn_timeout': int(calibration_map['conn_timeout']),
-                'http_read_timeout': int(calibration_map['read_timeout']),
-                'particles_fail': int(calibration_map['particles_fail'])
-                },
-        )  
-    
-    process_queue.put((optimizer, trace))
-
-"""

{mg-pso-gui-0.1.17 → mg-pso-gui-0.1.19}/setup.py

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

mg-pso-gui-0.1.17/mgpsogui/trace.json

@@ -1,472 +0,0 @@
-{
-  "dir": "C:\\Users\\robertcordingly\\PycharmProjects\\pythonProject6",
-  "start": "2024-03-13 02:06:28.041821",
-  "min_rounds": 1,
-  "max_rounds": 2,
-  "iters": 20,
-  "ftol": "-inf",
-  "ftol_iter": 1,
-  "rtol": 0.001,
-  "rtol_iter": 1,
-  "n_threads": 10,
-  "n_particles": 10,
-  "n_steps": 2,
-  "steps": [
-    {
-      "param": [
-        {
-          "name": "soilOutLPS",
-          "bounds": [
-            0.0,
-            2.0
-          ]
-        },
-        {
-          "name": "lagInterflow",
-          "bounds": [
-            10.0,
-            80.0
-          ]
-        }
-      ],
-      "objfunc": [
-        {
-          "name": "ns",
-          "of": "ns",
-          "data": [
-            "obs_data02_14.csv/obs/orun[1]",
-            "output/csip_run/out/Outlet.csv/output/catchmentSimRunoff"
-          ]
-        }
-      ]
-    },
-    {
-      "param": [
-        {
-          "name": "flowRouteTA",
-          "bounds": [
-            0.4,
-            5.0
-          ]
-        },
-        {
-          "name": "soilMaxDPS",
-          "bounds": [
-            0.0,
-            5.0
-          ]
-        }
-      ],
-      "objfunc": [
-        {
-          "name": "ns",
-          "of": "ns",
-          "data": [
-            "obs_data02_14.csv/obs/orun[1]",
-            "output/csip_run/out/Outlet.csv/output/catchmentSimRunoff"
-          ]
-        }
-      ]
-    }
-  ],
-  "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",
-    "files": {},
-    "step_param_names": [
-      "flowRouteTA",
-      "soilMaxDPS"
-    ],
-    "step_objfunc": [
-      {
-        "name": "ns",
-        "of": "ns",
-        "data": [
-          "obs_data02_14.csv/obs/orun[1]",
-          "output/csip_run/out/Outlet.csv/output/catchmentSimRunoff"
-        ]
-      }
-    ],
-    "calib_params": {
-      "soilOutLPS": 1.3852729993614596,
-      "lagInterflow": 56.51654153627339
-    },
-    "req_queue": "<queue.Queue at 0x2b66bfe9f40>",
-    "conf": {
-      "service_timeout": 400.0,
-      "http_retry": 5,
-      "http_allow_redirects": true,
-      "async_call": false,
-      "http_conn_timeout": 10,
-      "http_read_timeout": 400,
-      "particles_fail": 5
-    },
-    "rnd": 2,
-    "step": 2
-  },
-  "r1s1": {
-    "time": "2024-03-13 02:09:17.010187",
-    "best_costs": [
-      [
-        0.4132185,
-        0.41315801
-      ]
-    ],
-    "steps": [
-      {
-        "param": [
-          {
-            "name": "soilOutLPS",
-            "bounds": [
-              0.0,
-              2.0
-            ],
-            "value": 1.4232478417536503
-          },
-          {
-            "name": "lagInterflow",
-            "bounds": [
-              10.0,
-              80.0
-            ],
-            "value": 58.2004069813242
-          }
-        ],
-        "objfunc": [
-          {
-            "name": "ns",
-            "of": "ns",
-            "data": [
-              "obs_data02_14.csv/obs/orun[1]",
-              "output/csip_run/out/Outlet.csv/output/catchmentSimRunoff"
-            ]
-          }
-        ],
-        "cost": 0.4965635659744849
-      },
-      {
-        "param": [
-          {
-            "name": "flowRouteTA",
-            "bounds": [
-              0.4,
-              5.0
-            ]
-          },
-          {
-            "name": "soilMaxDPS",
-            "bounds": [
-              0.0,
-              5.0
-            ]
-          }
-        ],
-        "objfunc": [
-          {
-            "name": "ns",
-            "of": "ns",
-            "data": [
-              "obs_data02_14.csv/obs/orun[1]",
-              "output/csip_run/out/Outlet.csv/output/catchmentSimRunoff"
-            ]
-          }
-        ]
-      }
-    ]
-  },
-  "r1s2": {
-    "time": "2024-03-13 02:11:57.122093",
-    "best_costs": [
-      [
-        0.4132185,
-        0.41315801
-      ]
-    ],
-    "steps": [
-      {
-        "param": [
-          {
-            "name": "soilOutLPS",
-            "bounds": [
-              0.0,
-              2.0
-            ],
-            "value": 1.4232478417536503
-          },
-          {
-            "name": "lagInterflow",
-            "bounds": [
-              10.0,
-              80.0
-            ],
-            "value": 58.2004069813242
-          }
-        ],
-        "objfunc": [
-          {
-            "name": "ns",
-            "of": "ns",
-            "data": [
-              "obs_data02_14.csv/obs/orun[1]",
-              "output/csip_run/out/Outlet.csv/output/catchmentSimRunoff"
-            ]
-          }
-        ],
-        "cost": 0.4965635659744849
-      },
-      {
-        "param": [
-          {
-            "name": "flowRouteTA",
-            "bounds": [
-              0.4,
-              5.0
-            ],
-            "value": 1.9829062991388553
-          },
-          {
-            "name": "soilMaxDPS",
-            "bounds": [
-              0.0,
-              5.0
-            ],
-            "value": 2.569282303473601
-          }
-        ],
-        "objfunc": [
-          {
-            "name": "ns",
-            "of": "ns",
-            "data": [
-              "obs_data02_14.csv/obs/orun[1]",
-              "output/csip_run/out/Outlet.csv/output/catchmentSimRunoff"
-            ]
-          }
-        ],
-        "cost": 0.41587191865116957
-      }
-    ]
-  },
-  "r1": {
-    "time": "2024-03-13 02:11:57.122093",
-    "round_cost": 0.9124354846256545,
-    "best_costs": [
-      [
-        0.4132185,
-        0.41315801
-      ]
-    ],
-    "improvements": [
-      [
-        false,
-        false
-      ]
-    ]
-  },
-  "r2s1": {
-    "time": "2024-03-13 02:14:38.624493",
-    "best_costs": [
-      [
-        0.4132185,
-        0.41315801
-      ]
-    ],
-    "steps": [
-      {
-        "param": [
-          {
-            "name": "soilOutLPS",
-            "bounds": [
-              0.0,
-              2.0
-            ],
-            "value": 1.3852729993614596
-          },
-          {
-            "name": "lagInterflow",
-            "bounds": [
-              10.0,
-              80.0
-            ],
-            "value": 56.51654153627339
-          }
-        ],
-        "objfunc": [
-          {
-            "name": "ns",
-            "of": "ns",
-            "data": [
-              "obs_data02_14.csv/obs/orun[1]",
-              "output/csip_run/out/Outlet.csv/output/catchmentSimRunoff"
-            ]
-          }
-        ],
-        "cost": 0.41321849826662227
-      },
-      {
-        "param": [
-          {
-            "name": "flowRouteTA",
-            "bounds": [
-              0.4,
-              5.0
-            ],
-            "value": 1.9829062991388553
-          },
-          {
-            "name": "soilMaxDPS",
-            "bounds": [
-              0.0,
-              5.0
-            ],
-            "value": 2.569282303473601
-          }
-        ],
-        "objfunc": [
-          {
-            "name": "ns",
-            "of": "ns",
-            "data": [
-              "obs_data02_14.csv/obs/orun[1]",
-              "output/csip_run/out/Outlet.csv/output/catchmentSimRunoff"
-            ]
-          }
-        ],
-        "cost": 0.41587191865116957
-      }
-    ]
-  },
-  "r2s2": {
-    "time": "2024-03-13 02:17:21.403554",
-    "best_costs": [
-      [
-        0.4132185,
-        0.41315801
-      ]
-    ],
-    "steps": [
-      {
-        "param": [
-          {
-            "name": "soilOutLPS",
-            "bounds": [
-              0.0,
-              2.0
-            ],
-            "value": 1.3852729993614596
-          },
-          {
-            "name": "lagInterflow",
-            "bounds": [
-              10.0,
-              80.0
-            ],
-            "value": 56.51654153627339
-          }
-        ],
-        "objfunc": [
-          {
-            "name": "ns",
-            "of": "ns",
-            "data": [
-              "obs_data02_14.csv/obs/orun[1]",
-              "output/csip_run/out/Outlet.csv/output/catchmentSimRunoff"
-            ]
-          }
-        ],
-        "cost": 0.41321849826662227
-      },
-      {
-        "param": [
-          {
-            "name": "flowRouteTA",
-            "bounds": [
-              0.4,
-              5.0
-            ],
-            "value": 1.9512811039470743
-          },
-          {
-            "name": "soilMaxDPS",
-            "bounds": [
-              0.0,
-              5.0
-            ],
-            "value": 1.4271995521553167
-          }
-        ],
-        "objfunc": [
-          {
-            "name": "ns",
-            "of": "ns",
-            "data": [
-              "obs_data02_14.csv/obs/orun[1]",
-              "output/csip_run/out/Outlet.csv/output/catchmentSimRunoff"
-            ]
-          }
-        ],
-        "cost": 0.41315801069598224
-      }
-    ]
-  },
-  "r2": {
-    "time": "2024-03-13 02:17:21.403554",
-    "round_cost": 0.8263765089626045,
-    "best_costs": [
-      [
-        0.4132185,
-        0.41315801
-      ]
-    ],
-    "improvements": [
-      [
-        false,
-        false
-      ]
-    ]
-  },
-  "rounds": 2,
-  "end": "2024-03-13 02:17:21.901600",
-  "time": "0:10:53.346725"
-}