mg-pso-gui 0.2.41__py3-none-any.whl → 0.2.43__py3-none-any.whl

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.
Files changed (9) hide show
  1. {mg_pso_gui-0.2.41.dist-info → mg_pso_gui-0.2.43.dist-info}/METADATA +1 -1
  2. {mg_pso_gui-0.2.41.dist-info → mg_pso_gui-0.2.43.dist-info}/RECORD +9 -9
  3. mgpsogui/gui/General/ParameterView.py +13 -2
  4. mgpsogui/gui/HomePage.py +23 -23
  5. mgpsogui/gui/SetupTab/OverrideParameterMetrics.py +1 -1
  6. mgpsogui/util/PSORunner.py +1 -1
  7. {mg_pso_gui-0.2.41.dist-info → mg_pso_gui-0.2.43.dist-info}/WHEEL +0 -0
  8. {mg_pso_gui-0.2.41.dist-info → mg_pso_gui-0.2.43.dist-info}/entry_points.txt +0 -0
  9. {mg_pso_gui-0.2.41.dist-info → mg_pso_gui-0.2.43.dist-info}/top_level.txt +0 -0
{mg_pso_gui-0.2.41.dist-info → mg_pso_gui-0.2.43.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: mg-pso-gui
3
- Version: 0.2.41
3
+ Version: 0.2.43
4
4
  Summary: GUI for MG-PSO
5
5
  Author: Robert Cordingly
6
6
  Author-email: <rcording@uw.ed>
{mg_pso_gui-0.2.41.dist-info → mg_pso_gui-0.2.43.dist-info}/RECORD RENAMED
@@ -1,11 +1,11 @@
1
1
  mgpsogui/__init__.py,sha256=q7AfBjeJABnFtbsZnsObpUwaXKPDVYtz46G6MKXLF74,42
2
2
  mgpsogui/mgpsogui.py,sha256=NIZmyNcbwC8EgSwf1ubdMUSJscrIEgoD4jLYziqHQ-k,148
3
3
  mgpsogui/start.yaml,sha256=ZjCVLb-MLqAxrGRm9kA7_SDpa-45EuKIELNQ2QqCAiU,4713
4
- mgpsogui/gui/HomePage.py,sha256=rNFDCgQ2aoEId7IqhQ43_QC9P5b1fuuypVIaXgTh0DM,21569
4
+ mgpsogui/gui/HomePage.py,sha256=TbMtfTgOtYeaocfVTxeHz38qH6xsGV2i5ZAGIXTx3Ug,21615
5
5
  mgpsogui/gui/OptionManager.py,sha256=HLVib_lHdMijykF78bJ9_PEl-oROuC8lxd1oBS7524U,21898
6
6
  mgpsogui/gui/OptionManager_backup.py,sha256=TCWfPnHL2foN5id47jsi267lamRG6yGU6y_M29eOOJk,18530
7
7
  mgpsogui/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
8
- mgpsogui/gui/General/ParameterView.py,sha256=ylnzYk9qTN31w_6LW4Iq3536CjfWswEqbE95M_SF8P4,5657
8
+ mgpsogui/gui/General/ParameterView.py,sha256=4jv15f0so1iIllOhU2ZxVRgTft7K3pNiZc-xi998b7A,6227
9
9
  mgpsogui/gui/General/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
10
10
  mgpsogui/gui/PlatformTab/PlatformTab.py,sha256=XVaXjNoH1MBI-587CWigLIT3LGT00yzEAEnXNkzCLrk,10947
11
11
  mgpsogui/gui/PlatformTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -19,7 +19,7 @@ mgpsogui/gui/SetupTab/FunctionsList.py,sha256=ntbIUs8q2Tm3KfBLleT7uL0gynwYuVycwv
19
19
  mgpsogui/gui/SetupTab/ListEditor.py,sha256=nin7Pl8z7d_yfKoAxM-yVS34uhj-LnprJ2mNRSB7Z0A,3197
20
20
  mgpsogui/gui/SetupTab/ListParametersView.py,sha256=mkGaC5cXhEOy5oD0MbTyK9z7VGZp019oK2Y8Ay-n05Q,7460
21
21
  mgpsogui/gui/SetupTab/OptimalParameterView.py,sha256=nliUEWA840cPBQt7wjiZ-L7uBOp_ozzJhyBkL08fJzI,1752
22
- mgpsogui/gui/SetupTab/OverrideParameterMetrics.py,sha256=QFSwLRLHwbqyO8gPOzIQ8nhFUktFipKj_aM9QoP0QT0,3372
22
+ mgpsogui/gui/SetupTab/OverrideParameterMetrics.py,sha256=rBfaSitYDOajbHvyi2TfoXAHYlz1cCt028UVpIJ_Dc0,3369
23
23
  mgpsogui/gui/SetupTab/OverrideParameterWindow.py,sha256=UpZDxTaFxee0BeviUYXeiIlMNYNy00qz3zlMlM5VcXE,1291
24
24
  mgpsogui/gui/SetupTab/SetupTab.py,sha256=uvz604wAgazX9P8naqX9eq-6xwaA8lq-cYTy8lHXkv0,2805
25
25
  mgpsogui/gui/SetupTab/StepView.py,sha256=e3QhepeAfDJdhefsJvzyppRuMdVAFKEnbZLtrFIczU4,8936
@@ -44,7 +44,7 @@ mgpsogui/gui/images/test.png,sha256=MUnVpRK-isxhEHzx4Q6Yh0M6FRZD1qvgCHH2XmiSBbk,
44
44
  mgpsogui/gui/images/trash.png,sha256=j8cf0kWbJd-4Jp20lUVV1o1NSeQ4v1Ej4gfcIA3DVRQ,2958
45
45
  mgpsogui/gui/images/up.png,sha256=AQvFWCUqSQNaQ1E6LKZ9zNfSvW6t4mgy8uswdg9T2Hg,2457
46
46
  mgpsogui/util/GraphGenerator.py,sha256=dKzDPMK-0S6j1yIp5xoQIgN9GTKMhGpboAXjofCpmIk,31973
47
- mgpsogui/util/PSORunner.py,sha256=hm7hAOOR-qzFZMPl0wXFd_dsrBJPSmZVfgfKv9HuYn4,22013
47
+ mgpsogui/util/PSORunner.py,sha256=zjOAKH7PBbNVT0imwGDIPJxwPD54eFuDjfIUaNeWcbY,22033
48
48
  mgpsogui/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
49
49
  mgpsogui/util/debug.py,sha256=Swzny9_1S-CCONWGssj9iDoSpbwu5Vr4f95g_9L8bec,19759
50
50
  mgpsogui/util/helpers.py,sha256=Ht2rge_4pGO7halz6KoLsL2eukB0k2tlkx68lBBmBA8,2669
@@ -69,8 +69,8 @@ mgpsogui/util/recosu/utils/trace_writer.py,sha256=V9BJlOjCbNYGoXGEk3CF5wjifBxvar
69
69
  mgpsogui/util/recosu/utils/utils.py,sha256=QB8vftq3142ekG0ORjz0ZBHU5YknXbR0oTsrxrPAsF0,3951
70
70
  mgpsogui/util/recosu/utils/plot/__init__.py,sha256=h1KjM7_tNDv351pcwt8A6Ibb1jhwWyx5Gbu-zj-sI3Q,71
71
71
  mgpsogui/util/recosu/utils/plot/cost_steps.py,sha256=1Ce11AJyweWkmvjXPxEygzS-h8yVLmQEDLS53yjPLqQ,3779
72
- mg_pso_gui-0.2.41.dist-info/METADATA,sha256=VgWbWM-Yf4UbwRnYKEEIXkQQB_b9cQFqbqi7SWfQleU,9455
73
- mg_pso_gui-0.2.41.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
74
- mg_pso_gui-0.2.41.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
75
- mg_pso_gui-0.2.41.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
76
- mg_pso_gui-0.2.41.dist-info/RECORD,,
72
+ mg_pso_gui-0.2.43.dist-info/METADATA,sha256=jDa_vHTLXQi2UruNBedCVlh5f2rp2u1SC55DcPUyhFU,9455
73
+ mg_pso_gui-0.2.43.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
74
+ mg_pso_gui-0.2.43.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
75
+ mg_pso_gui-0.2.43.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
76
+ mg_pso_gui-0.2.43.dist-info/RECORD,,
mgpsogui/gui/General/ParameterView.py CHANGED
@@ -43,9 +43,19 @@ class ParameterView(CTkScrollableFrame):
43
43
  row += 1
44
44
 
45
45
  for key_value_pair in self.key_values:
46
- CTkEntry(self.containerFrame, textvariable=self.key_values[index]["name"]).grid(row=row, column=0, columnspan=3, padx=(5, 5), pady=(5, 5), sticky="ew")
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()
mgpsogui/gui/HomePage.py CHANGED
@@ -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
mgpsogui/gui/SetupTab/OverrideParameterMetrics.py CHANGED
@@ -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="name", value="value"):
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):
mgpsogui/util/PSORunner.py CHANGED
@@ -124,7 +124,7 @@ def process_list(data, parameter_map, args, options, oh_strategy, config, metain
124
124
  converted_value = True if converted_value == "True" else False
125
125
 
126
126
  if destination == "args":
127
- args['param'].append((name, obj['value']))
127
+ args['param'].append({"name": name, "value": converted_value})
128
128
  elif destination == "kwargs":
129
129
  parameter_map[name] = original_value
130
130
  elif destination == "conf":