mg-pso-gui 0.2.42__tar.gz → 0.2.44__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/PKG-INFO +1 -1
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mg_pso_gui.egg-info/PKG-INFO +1 -1
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/gui/General/ParameterView.py +13 -2
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/gui/HomePage.py +28 -23
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/gui/SetupTab/OverrideParameterMetrics.py +1 -1
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/gui/VisualizeTab/VisualizeTab.py +3 -4
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/setup.py +1 -1
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mg_pso_gui.egg-info/SOURCES.txt +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mg_pso_gui.egg-info/dependency_links.txt +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mg_pso_gui.egg-info/entry_points.txt +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mg_pso_gui.egg-info/requires.txt +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mg_pso_gui.egg-info/top_level.txt +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/__init__.py +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/gui/General/__init__.py +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/gui/OptionManager.py +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/gui/OptionManager_backup.py +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/gui/PlatformTab/PlatformTab.py +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/gui/PlatformTab/__init__.py +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/gui/RunTab/RunTab.py +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/gui/RunTab/__init__.py +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/gui/SetupTab/BoundsEditorWindow.py +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/gui/SetupTab/BoundsList.py +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/gui/SetupTab/CustomFunctionEditorWindow.py +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/gui/SetupTab/CustomFunctionMetrics.py +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/gui/SetupTab/FunctionsList.py +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/gui/SetupTab/ListEditor.py +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/gui/SetupTab/ListParametersView.py +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/gui/SetupTab/OptimalParameterView.py +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/gui/SetupTab/OverrideParameterWindow.py +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/gui/SetupTab/SetupTab.py +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/gui/SetupTab/StepView.py +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/gui/SetupTab/__init__.py +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/gui/VisualizeTab/MatrixEditor.py +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/gui/VisualizeTab/SideBar.py +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/gui/VisualizeTab/__init__.py +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/gui/__init__.py +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/gui/defaults/__init__.py +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/gui/defaults/optimization.json +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/gui/defaults/sampling.json +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/gui/defaults/sensitivity.json +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/gui/images/collapse.png +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/gui/images/down.png +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/gui/images/expand.png +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/gui/images/play.png +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/gui/images/plus.png +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/gui/images/refresh.png +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/gui/images/refresh_hd.png +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/gui/images/stop.png +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/gui/images/test.png +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/gui/images/trash.png +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/gui/images/up.png +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/mgpsogui.py +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/start.yaml +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/util/CTkToolTip/__init__.py +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/util/CTkToolTip/ctk_tooltip.py +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/util/GraphGenerator.py +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/util/PSORunner.py +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/util/__init__.py +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/util/debug.py +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/util/helpers.py +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/util/recosu/__init__.py +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/util/recosu/pso/__init__.py +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/util/recosu/pso/csip_access.py +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/util/recosu/pso/pso.py +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/util/recosu/sampling/__init__.py +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/util/recosu/sampling/halton/__init__.py +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/util/recosu/sampling/halton/halton.py +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/util/recosu/sampling/halton/prime.py +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/util/recosu/sampling/random/__init__.py +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/util/recosu/sampling/random/random_sampler.py +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/util/recosu/sampling/sample_trace_writer.py +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/util/recosu/sampling/sampler_task.py +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/util/recosu/sampling/sampling.py +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/util/recosu/utils/__init__.py +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/util/recosu/utils/plot/__init__.py +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/util/recosu/utils/plot/cost_steps.py +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/util/recosu/utils/trace_writer.py +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/util/recosu/utils/utils.py +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/util/sampler_test_driver.py +0 -0
- {mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/setup.cfg +0 -0
@@ -43,9 +43,19 @@ class ParameterView(CTkScrollableFrame):
|
|
43
43
|
row += 1
|
44
44
|
|
45
45
|
for key_value_pair in self.key_values:
|
46
|
-
|
46
|
+
required = False
|
47
|
+
visual_name = "NONE"
|
48
|
+
if "required" in key_value_pair:
|
49
|
+
required = key_value_pair["required"]
|
50
|
+
if required and "visual_name" in key_value_pair:
|
51
|
+
visual_name = key_value_pair["visual_name"]
|
52
|
+
|
53
|
+
if visual_name != "NONE":
|
54
|
+
CTkEntry(self.containerFrame, state="disabled", textvariable=self.key_values[index]["visual_name"]).grid(row=row, column=0, columnspan=3, padx=(5, 5), pady=(5, 5), sticky="ew")
|
55
|
+
else:
|
56
|
+
CTkEntry(self.containerFrame, textvariable=self.key_values[index]["name"]).grid(row=row, column=0, columnspan=3, padx=(5, 5), pady=(5, 5), sticky="ew")
|
47
57
|
|
48
|
-
if self.edit_mode:
|
58
|
+
if self.edit_mode and not required:
|
49
59
|
type_menu = CTkOptionMenu(self.containerFrame, variable=self.key_values[index]["type"], values=["integer", "float", "date", "boolean", "string"], width=20)
|
50
60
|
type_menu.grid(row=row, column=3, columnspan=1, padx=(0, 0), pady=(5, 5), sticky="ew")
|
51
61
|
|
@@ -54,6 +64,7 @@ class ParameterView(CTkScrollableFrame):
|
|
54
64
|
|
55
65
|
|
56
66
|
return_func = lambda index=index: (self.clear(), self.option_manager.remove_key_value(self.list_name, index), self.render())
|
67
|
+
|
57
68
|
CTkButton(self.containerFrame, text="Remove", command=return_func).grid(row=row, column=5, columnspan=1, padx=(5, 5), pady=(5, 5), sticky="ew")
|
58
69
|
else:
|
59
70
|
type = self.key_values[index]["type"].get()
|
@@ -64,37 +64,37 @@ class App(customtkinter.CTk):
|
|
64
64
|
|
65
65
|
self.option_manager = om.OptionManager()
|
66
66
|
|
67
|
-
self.graph_selector_value = tk.StringVar()
|
68
|
-
self.graph_selector_value.set("Best Cost Stacked")
|
67
|
+
# self.graph_selector_value = tk.StringVar()
|
68
|
+
# self.graph_selector_value.set("Best Cost Stacked")
|
69
69
|
|
70
|
-
self.graph_theme_value = tk.StringVar()
|
71
|
-
self.graph_theme_value.set("Dark")
|
70
|
+
# self.graph_theme_value = tk.StringVar()
|
71
|
+
# self.graph_theme_value.set("Dark")
|
72
72
|
|
73
|
-
self.selected_csv = tk.StringVar()
|
74
|
-
self.selected_csv.set("No files found...")
|
75
|
-
self.open_file = "None"
|
76
|
-
self.csv_data = None
|
73
|
+
# self.selected_csv = tk.StringVar()
|
74
|
+
# self.selected_csv.set("No files found...")
|
75
|
+
# self.open_file = "None"
|
76
|
+
# self.csv_data = None
|
77
77
|
|
78
|
-
self.selected_csv2 = tk.StringVar()
|
79
|
-
self.selected_csv2.set("No files found...")
|
80
|
-
self.open_file2 = "None"
|
81
|
-
self.csv_data2 = None
|
78
|
+
# self.selected_csv2 = tk.StringVar()
|
79
|
+
# self.selected_csv2.set("No files found...")
|
80
|
+
# self.open_file2 = "None"
|
81
|
+
# self.csv_data2 = None
|
82
82
|
|
83
|
-
self.selected_x = tk.StringVar()
|
84
|
-
self.selected_x.set("time")
|
83
|
+
# self.selected_x = tk.StringVar()
|
84
|
+
# self.selected_x.set("time")
|
85
85
|
|
86
|
-
self.selected_y1 = tk.StringVar()
|
87
|
-
self.selected_y1.set("NONE")
|
86
|
+
# self.selected_y1 = tk.StringVar()
|
87
|
+
# self.selected_y1.set("NONE")
|
88
88
|
|
89
|
-
self.selected_y2 = tk.StringVar()
|
90
|
-
self.selected_y2.set("NONE")
|
89
|
+
# self.selected_y2 = tk.StringVar()
|
90
|
+
# self.selected_y2.set("NONE")
|
91
91
|
|
92
|
-
self.figure_style = tk.StringVar()
|
93
|
-
self.figure_style.set("Scatter")
|
92
|
+
# self.figure_style = tk.StringVar()
|
93
|
+
# self.figure_style.set("Scatter")
|
94
94
|
|
95
|
-
self.matrix_values = []
|
96
|
-
self.matrix_values.append(tk.StringVar())
|
97
|
-
self.matrix_values[0].set("NONE")
|
95
|
+
# self.matrix_values = []
|
96
|
+
# self.matrix_values.append(tk.StringVar())
|
97
|
+
# self.matrix_values[0].set("NONE")
|
98
98
|
|
99
99
|
self.running_config = None
|
100
100
|
self.selected_graph_name = None
|
@@ -235,6 +235,8 @@ class App(customtkinter.CTk):
|
|
235
235
|
def refresh_step_view(self, value):
|
236
236
|
mode = self.option_manager.get_mode()
|
237
237
|
self.service_url.configure(textvariable=self.option_manager.get("url"))
|
238
|
+
self.graph_theme.configure(variable=self.option_manager.get("graph_theme"))
|
239
|
+
self.graph_selector.configure(variable=self.option_manager.get("selected_graph"))
|
238
240
|
|
239
241
|
if mode == "Optimization":
|
240
242
|
self.test_button.configure(state="normal")
|
@@ -247,6 +249,9 @@ class App(customtkinter.CTk):
|
|
247
249
|
self.download_button.configure(state="disabled")
|
248
250
|
self.download_button.configure(fg_color="gray")
|
249
251
|
|
252
|
+
self.vis_sidebar.clear()
|
253
|
+
self.vis_sidebar.render()
|
254
|
+
|
250
255
|
self.steps_frame.clear()
|
251
256
|
self.steps_frame.render()
|
252
257
|
|
@@ -32,7 +32,7 @@ class OverrideParameterMetrics(CTkScrollableFrame):
|
|
32
32
|
self.edit_mode = not self.edit_mode
|
33
33
|
self.render()
|
34
34
|
|
35
|
-
def add_key(self, key="
|
35
|
+
def add_key(self, key="iters", value="1"):
|
36
36
|
self.option_manager.add_override(self.step_index, key, value)
|
37
37
|
|
38
38
|
def remove_key(self, index):
|
@@ -116,7 +116,8 @@ def create_tab(self, tab):
|
|
116
116
|
self.graph_container.grid_columnconfigure(0, weight=1)
|
117
117
|
self.graph_container.grid_rowconfigure(0, weight=1)
|
118
118
|
|
119
|
-
|
119
|
+
graph_types = ["Best Cost Stacked", "Best Cost by Round", "Custom CSV", "Compare CSV", "Sampling CSV", "Matrix Editor"]
|
120
|
+
self.graph_selector = customtkinter.CTkOptionMenu(self.graph_sidebar, values=graph_types, variable=self.option_manager.get("selected_graph"), command=self.update_graph)
|
120
121
|
self.graph_selector.grid(row=0, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")
|
121
122
|
|
122
123
|
# Create SideBar
|
@@ -124,7 +125,7 @@ def create_tab(self, tab):
|
|
124
125
|
self.vis_sidebar.grid(row=1, column=0, rowspan=6, padx=(0, 0), pady=(0, 0), sticky="nsew")
|
125
126
|
|
126
127
|
|
127
|
-
self.graph_theme = customtkinter.CTkOptionMenu(self.graph_sidebar, values=["Dark", "Light", "Publication"], variable=self.
|
128
|
+
self.graph_theme = customtkinter.CTkOptionMenu(self.graph_sidebar, values=["Dark", "Light", "Publication"], variable=self.option_manager.get("graph_theme"), command=self.update_graph)
|
128
129
|
self.graph_theme.grid(row=7, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")
|
129
130
|
|
130
131
|
self.graph_export = customtkinter.CTkButton(self.graph_sidebar, text="Export", command=export_graph)
|
@@ -138,5 +139,3 @@ def create_tab(self, tab):
|
|
138
139
|
self.graph_image = customtkinter.CTkImage(self.graph_image_obj, size=(1280, 720))
|
139
140
|
self.graph_label = customtkinter.CTkLabel(self.graph_container, text=None, image=self.graph_image)
|
140
141
|
self.graph_label.grid(row=0, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")
|
141
|
-
#window = customtkinter.CTk()
|
142
|
-
#self.graph_label.bind('<Configure>', _resize_image)
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
{mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/util/recosu/sampling/random/random_sampler.py
RENAMED
File without changes
|
{mg_pso_gui-0.2.42 → mg_pso_gui-0.2.44}/mgpsogui/util/recosu/sampling/sample_trace_writer.py
RENAMED
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|