mg-pso-gui 0.1.81__tar.gz → 0.1.84__tar.gz

{mg-pso-gui-0.1.81 → mg-pso-gui-0.1.84}/PKG-INFO

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

{mg-pso-gui-0.1.81 → mg-pso-gui-0.1.84}/mg_pso_gui.egg-info/PKG-INFO

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

{mg-pso-gui-0.1.81 → mg-pso-gui-0.1.84}/mgpsogui/gui/HomePage.py

@@ -174,7 +174,7 @@ 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.footer_frame, values=["PSO", "Halton"], width=50)
+		self.algorithm_optionmenu = customtkinter.CTkOptionMenu(self.footer_frame, textvariable=self.option_manager.get_arguments()['mode'], 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")
 

{mg-pso-gui-0.1.81 → mg-pso-gui-0.1.84}/mgpsogui/gui/OptionManager.py

@@ -11,6 +11,7 @@ class OptionManager():
         self.project_data = {"name": "", "path": ""}
         self.arguments = {"param": [],
                  "url": sv(),
+                 "mode": sv(),
                  "files": {},
                  "calibration_parameters": []}
         self.steps = []
@@ -19,6 +20,7 @@ class OptionManager():
     def clear(self):
         self.arguments['param'].clear()
         self.arguments['url'].set("")
+        self.arguments['mode'].set("PSO")
         self.arguments['files'] = {}
         self.arguments['calibration_parameters'].clear()
         self.steps = []
@@ -29,6 +31,9 @@ class OptionManager():
         if ("url" in arguments):
             self.arguments["url"].set(arguments["url"])
             
+        if ("mode" in arguments):
+            self.arguments["mode"].set(arguments["mode"])
+            
         if ("files" in arguments):
             for file in arguments["files"]:
                 name = file["name"]
@@ -240,7 +245,7 @@ class OptionManager():
         result['service_parameters'] = {}
         result['project_data'] = self.project_data
         for key, value in self.arguments.items():
-            if key == 'url':
+            if key == 'url' or key == 'mode':
                 result['arguments'][key] = value.get()
             elif key == 'files':
                 result['arguments'][key] = {}

{mg-pso-gui-0.1.81 → mg-pso-gui-0.1.84}/mgpsogui/gui/SetupTab/StepView.py

@@ -64,8 +64,16 @@ class StepView(CTkScrollableFrame):
         self.containerFrame.grid_columnconfigure((0, 1), weight=1)
 
         self.steps = self.option_manager.get_steps()
+        self.mode = self.option_manager.get_arguments()['mode'].get()
+        
+        tempSteps = self.steps
+        if self.mode == "Halton":
+            # Collapse all steps 
+            tempSteps = []
+            if len(self.steps) > 0:
+                tempSteps.append(self.steps[0])
 
-        for step in self.steps:
+        for step in tempSteps:
 
             up_image = CTkImage(Image.open(os.path.join("./images", "up.png")), size=(20, 20))
             down_image = CTkImage(Image.open(os.path.join("./images", "down.png")), size=(20, 20))
@@ -89,9 +97,11 @@ class StepView(CTkScrollableFrame):
             CTkEntry(self.containerFrame, textvariable=step['name'], width=500).grid(row=row, column=0, padx=(20, 20), pady=(20, 20), sticky="nsw")
             #CTkLabel(self.containerFrame, textvariable=step['message']).grid(row=row, column=1, padx=(20, 20), pady=(20, 20), sticky="nsew")
             CTkButton(button_container, width=30, text=None, image=expand_image if not step['open'] else collapse_image, command=expand_func).grid(row=0, column=0, padx=(10, 10), pady=(10, 10), sticky="nsew")
-            CTkButton(button_container, width=30, text=None, image=up_image, state="disabled" if index==0 else "normal", fg_color="gray" if index==0 else None, command=up_func).grid(row=0, column=1, padx=(10, 10), pady=(10, 10), sticky="nsew")
-            CTkButton(button_container, width=30, text=None, image=down_image, state="disabled" if index==(len(self.steps)-1) else "normal", fg_color="gray" if index==(len(self.steps)-1) else None, command=down_func).grid(row=0, column=2, padx=(10, 10), pady=(10, 10), sticky="nsew")
-            CTkButton(button_container, width=30, text=None, image=trash_image, command=remove_func).grid(row=0, column=3, padx=(10, 10), pady=(10, 10), sticky="nsew")
+            
+            if (self.mode == "PSO"):
+                CTkButton(button_container, width=30, text=None, image=up_image, state="disabled" if index==0 else "normal", fg_color="gray" if index==0 else None, command=up_func).grid(row=0, column=1, padx=(10, 10), pady=(10, 10), sticky="nsew")
+                CTkButton(button_container, width=30, text=None, image=down_image, state="disabled" if index==(len(self.steps)-1) else "normal", fg_color="gray" if index==(len(self.steps)-1) else None, command=down_func).grid(row=0, column=2, padx=(10, 10), pady=(10, 10), sticky="nsew")
+                CTkButton(button_container, width=30, text=None, image=trash_image, command=remove_func).grid(row=0, column=3, padx=(10, 10), pady=(10, 10), sticky="nsew")
 
             row += 1
 
@@ -114,5 +124,7 @@ class StepView(CTkScrollableFrame):
             index += 1
 
         # Create an "Add step button that is centered
-        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 == "PSO" or len(self.steps) == 0):
+            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")

{mg-pso-gui-0.1.81 → mg-pso-gui-0.1.84}/mgpsogui/gui/VisualizeTab/SideBar.py

@@ -210,6 +210,13 @@ class SideBar(CTkScrollableFrame):
         with open(file_path, "r") as file:
             lines = file.readlines()
             
+            if (not lines[0].startswith("@")):
+                return {
+                    "file_attributes": {},
+                    "data_attributes": {},
+                    "data": pd.read_csv(file_path)
+                }
+            
             for line in lines:
                 if (line.startswith("@H,")):
                     mode = "data_metadata"

{mg-pso-gui-0.1.81 → mg-pso-gui-0.1.84}/mgpsogui/util/PSORunner.py

@@ -87,8 +87,8 @@ def run_process(stdout_queue, stderr_queue, results_queue, cosu_queue, data, fol
                 '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']),
-                'step_trace': os.path.join(folder, 'trace.json')
+                'particles_fail': int(calibration_map['particles_fail'])
+                #,'step_trace': os.path.join(folder, 'trace.json')
                 },
             result_queue = cosu_queue
         )
@@ -103,45 +103,4 @@ def run_process(stdout_queue, stderr_queue, results_queue, cosu_queue, data, fol
     stderr_thread.join()
     
     sys.stdout = old_stdout
-    sys.stderr = old_stderr
-
-"""
-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)
-"""
+    sys.stderr = old_stderr

{mg-pso-gui-0.1.81 → mg-pso-gui-0.1.84}/mgpsogui/util/recosu/pso/pso.py

@@ -168,7 +168,7 @@ def global_best(steps: Dict, rounds: Tuple, args: Dict, n_particles: int, iters:
     step_trace['min_rounds'] = min_rounds
     step_trace['max_rounds'] = max_rounds
     step_trace['iters'] = iters
-    step_trace['ftol'] = ftol
+    #step_trace['ftol'] = ftol BUG DOES NOT HANDLE -INF
     step_trace['ftol_iter'] = ftol_iter
     step_trace['rtol'] = rtol
     step_trace['rtol_iter'] = rtol_iter
@@ -176,7 +176,7 @@ def global_best(steps: Dict, rounds: Tuple, args: Dict, n_particles: int, iters:
     step_trace['n_particles'] = n_particles
     step_trace['n_steps'] = len(steps)
     step_trace['steps'] = copy.deepcopy(steps)
-    step_trace['args'] = args
+    #step_trace['args'] = args BUG MUST BE REMOVED
 
     if step_file is not None:
         with open(step_file, "w") as fo:

{mg-pso-gui-0.1.81 → mg-pso-gui-0.1.84}/setup.py

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