mg-pso-gui 0.1.213__py3-none-any.whl → 0.1.215__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.
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: mg-pso-gui
3
- Version: 0.1.213
3
+ Version: 0.1.215
4
4
  Summary: GUI for MG-PSO
5
5
  Author: Robert Cordingly
6
6
  Author-email: <rcording@uw.ed>
@@ -2,7 +2,7 @@ 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
4
  mgpsogui/gui/HomePage.py,sha256=L2Vj2B6BzdXvoi6CkLWgxvtrzRMPJlF2sfbB8VpCVyc,22925
5
- mgpsogui/gui/OptionManager.py,sha256=dtWY5jzNAaL6t3q7SLHiwoKQOYrAsMGE5UqwYdmPzF4,14829
5
+ mgpsogui/gui/OptionManager.py,sha256=S7BiDHtCIS8QU0RBqCcsKpzTT9gEjiokizLMSGuD3vw,16353
6
6
  mgpsogui/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
7
7
  mgpsogui/gui/PlatformTab/PlatformTab.py,sha256=q8x_tvVgSoyGINuQbivXRThF3gaSSfg8X_dsLSPv4F0,10492
8
8
  mgpsogui/gui/PlatformTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -11,7 +11,7 @@ mgpsogui/gui/RunTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
11
11
  mgpsogui/gui/SetupTab/BoundsEditorWindow.py,sha256=_6_xEl46PY9MmNvpmoMNdNDbVav6ODwWSDROboy57Cs,2866
12
12
  mgpsogui/gui/SetupTab/BoundsList.py,sha256=L77UEaUJNiUE-ZsYIl44tWRb1zBfxaEQ-bAG1V5_IH0,12268
13
13
  mgpsogui/gui/SetupTab/CalibrationParametersView.py,sha256=ppVBHG3nphku9-P6Z8az-HTpgk8vHxnj-A5m80BZTgA,2784
14
- mgpsogui/gui/SetupTab/FunctionsList.py,sha256=Ty0S2Hs7XrtZCQNo7nSKNVYoMkRQN9-x0CEWogwgcO4,4709
14
+ mgpsogui/gui/SetupTab/FunctionsList.py,sha256=bZrgV3Ec4B41-zpOylgndUaNsbpm1RpsHCv_JCjZI-E,5402
15
15
  mgpsogui/gui/SetupTab/ListEditor.py,sha256=vlP0KDPu8J1_6KXuUTlE7OClgfF0Qk6cISsFm_SglUw,3232
16
16
  mgpsogui/gui/SetupTab/ListParametersView.py,sha256=wYcDcaooYkw-y7XW6dJUwhTWxLuUUOK5tGUFVHBf3ck,7352
17
17
  mgpsogui/gui/SetupTab/OptimalParameterView.py,sha256=VKn-4BlVyqspFIOkbWsM0q9pYVsmqnSND0xP2hDKb60,1785
@@ -34,7 +34,7 @@ mgpsogui/gui/images/stop.png,sha256=JPuxXQerCGpLikcp7cAj3iLCOjULMYYZ2sZe0lArh68,
34
34
  mgpsogui/gui/images/test.png,sha256=MUnVpRK-isxhEHzx4Q6Yh0M6FRZD1qvgCHH2XmiSBbk,3642
35
35
  mgpsogui/gui/images/trash.png,sha256=j8cf0kWbJd-4Jp20lUVV1o1NSeQ4v1Ej4gfcIA3DVRQ,2958
36
36
  mgpsogui/gui/images/up.png,sha256=AQvFWCUqSQNaQ1E6LKZ9zNfSvW6t4mgy8uswdg9T2Hg,2457
37
- mgpsogui/util/GraphGenerator.py,sha256=dkrGl5rkKJdloi_Mm-TKw4gEddpFlTJxiF1HZEH8Pzc,28627
37
+ mgpsogui/util/GraphGenerator.py,sha256=7JRq4um5UJd5tAYmffHWi558pcCMAwd6k3yvO0kEbPk,31779
38
38
  mgpsogui/util/PSORunner.py,sha256=ELpRgEpUiLV4hW-A-y4yzfkFN1BXgH7LZ0qlwWBRz3s,11012
39
39
  mgpsogui/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
40
40
  mgpsogui/util/debug.py,sha256=Swzny9_1S-CCONWGssj9iDoSpbwu5Vr4f95g_9L8bec,19759
@@ -60,8 +60,8 @@ mgpsogui/util/recosu/utils/trace_writer.py,sha256=V9BJlOjCbNYGoXGEk3CF5wjifBxvar
60
60
  mgpsogui/util/recosu/utils/utils.py,sha256=QB8vftq3142ekG0ORjz0ZBHU5YknXbR0oTsrxrPAsF0,3951
61
61
  mgpsogui/util/recosu/utils/plot/__init__.py,sha256=h1KjM7_tNDv351pcwt8A6Ibb1jhwWyx5Gbu-zj-sI3Q,71
62
62
  mgpsogui/util/recosu/utils/plot/cost_steps.py,sha256=1Ce11AJyweWkmvjXPxEygzS-h8yVLmQEDLS53yjPLqQ,3779
63
- mg_pso_gui-0.1.213.dist-info/METADATA,sha256=q1SRoqQHAafc-bm4NWTM4RlNyqrhWYY04R-IfnDWfEw,9456
64
- mg_pso_gui-0.1.213.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
65
- mg_pso_gui-0.1.213.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
66
- mg_pso_gui-0.1.213.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
67
- mg_pso_gui-0.1.213.dist-info/RECORD,,
63
+ mg_pso_gui-0.1.215.dist-info/METADATA,sha256=DwO9mrXwvfQfYrbbUl4GMapIxFKmY02NM7mtlhHgH-Y,9456
64
+ mg_pso_gui-0.1.215.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
65
+ mg_pso_gui-0.1.215.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
66
+ mg_pso_gui-0.1.215.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
67
+ mg_pso_gui-0.1.215.dist-info/RECORD,,
@@ -121,7 +121,13 @@ class OptionManager():
121
121
  obj["param"].append(param_obj)
122
122
 
123
123
  for objfunc in step["objfunc"]:
124
- objfunc_obj = {"name": sv(), "of": sv(), "weight": sv(), "data": (sv(), sv())}
124
+ objfunc_obj = {"name": sv(),
125
+ "of": sv(),
126
+ "weight": sv(),
127
+ "custom_function": sv(),
128
+ "custom_function_goal": sv(),
129
+ "custom_function_value": sv(),
130
+ "data": (sv(), sv())}
125
131
  objfunc_obj["name"].set(objfunc["name"])
126
132
  objfunc_obj["of"].set(objfunc["of"])
127
133
 
@@ -130,6 +136,13 @@ class OptionManager():
130
136
  else:
131
137
  objfunc_obj["weight"].set(1)
132
138
 
139
+ if ("custom_function" in objfunc):
140
+ objfunc_obj["custom_function"].set(objfunc["custom_function"])
141
+ if ("custom_function_goal" in objfunc):
142
+ objfunc_obj["custom_function_goal"].set(objfunc["custom_function_goal"])
143
+ if ("custom_function_value" in objfunc):
144
+ objfunc_obj["custom_function_value"].set(objfunc["custom_function_value"])
145
+
133
146
  objfunc_obj["data"][0].set(objfunc["data"][0])
134
147
  objfunc_obj["data"][1].set(objfunc["data"][1])
135
148
  obj["objfunc"].append(objfunc_obj)
@@ -137,12 +150,22 @@ class OptionManager():
137
150
  self.steps.append(obj)
138
151
 
139
152
  def add_function(self, step_index):
140
- obj = {"name": sv(), "of": sv(), "weight": sv(), "data": (sv(), sv())}
153
+ obj = {"name": sv(),
154
+ "of": sv(),
155
+ "weight": sv(),
156
+ "custom_function": sv(),
157
+ "custom_function_goal": sv(),
158
+ "custom_function_value": sv(),
159
+ "data": (sv(), sv())}
141
160
  obj["name"].set("ns")
142
161
  obj["of"].set("ns")
143
162
  obj["weight"].set(1)
144
163
  obj["data"][0].set("")
145
164
  obj["data"][1].set("")
165
+ obj["custom_function"].set("")
166
+ obj["custom_function_goal"].set("")
167
+ obj["custom_function_value"].set("")
168
+
146
169
  self.steps[step_index]["objfunc"].append(obj)
147
170
 
148
171
  def remove_function(self, step_index, index):
@@ -151,12 +174,21 @@ class OptionManager():
151
174
  def dupe_function(self, step_index, index):
152
175
  my_func = self.steps[step_index]["objfunc"][index]
153
176
 
154
- new_object = {"name": sv(), "of": sv(), "weight": sv(), "data": (sv(), sv())}
177
+ new_object = {"name": sv(),
178
+ "of": sv(),
179
+ "weight": sv(),
180
+ "custom_function": sv(),
181
+ "custom_function_goal": sv(),
182
+ "custom_function_value": sv(),
183
+ "data": (sv(), sv())}
155
184
  new_object["name"].set(my_func["name"].get())
156
185
  new_object["of"].set(my_func["of"].get())
157
186
  new_object["weight"].set(my_func["weight"].get())
158
187
  new_object["data"][0].set(my_func["data"][0].get())
159
188
  new_object["data"][1].set(my_func["data"][1].get())
189
+ new_object["custom_function"].set(my_func["custom_function"].get())
190
+ new_object["custom_function_goal"].set(my_func["custom_function_goal"].get())
191
+ new_object["custom_function_value"].set(my_func["custom_function_value"].get())
160
192
 
161
193
  self.steps[step_index]["objfunc"].append(new_object)
162
194
 
@@ -65,11 +65,22 @@ class FunctionsList(CTkFrame):
65
65
  "pbias",
66
66
  "pmcc",
67
67
  "rmse",
68
- "trmse"]
68
+ "trmse",
69
+ "custom"]
69
70
  CTkEntry(self.containerFrame, textvariable=func["name"]).grid(row=row, column=0, padx=(5, 5), pady=(5, 5), sticky="ew")
70
71
  CTkOptionMenu(self.containerFrame, values=columns, variable=func["of"]).grid(row=row, column=1, padx=(5, 5), pady=(5, 5), sticky="ew")
71
72
  CTkEntry(self.containerFrame, textvariable=func["weight"]).grid(row=row, column=2, padx=(5, 5), pady=(5, 5), sticky="ew")
72
73
 
74
+ row += 1
75
+
76
+ CTkLabel(self.containerFrame, text="Custom Function:").grid(row=row, column=0, columnspan=2, padx=(5, 5), pady=(5, 5), sticky="nsew")
77
+ CTkLabel(self.containerFrame, text="Target:").grid(row=row, column=2, padx=(5, 5), pady=(5, 5), sticky="nsew")
78
+
79
+ row += 1
80
+
81
+ CTkEntry(self.containerFrame, textvariable=func["custom_function"]).grid(row=row, column=0, columnspan=2, padx=(5, 5), pady=(5, 5), sticky="ew")
82
+ CTkOptionMenu(self.containerFrame, values=["Positive Best", "Zero Best"], variable=func["custom_function_goal"]).grid(row=row, column=1, padx=(5, 5), pady=(5, 5), sticky="ew")
83
+
73
84
  row += 1
74
85
 
75
86
  CTkLabel(self.containerFrame, text="Data:").grid(row=row, column=0, padx=(5, 5), pady=(5, 5), sticky="nsew")
@@ -146,6 +146,20 @@ def best_cost_stacked(homepage, config, data, option_manager):
146
146
  fig.update_layout(
147
147
  font=dict(
148
148
  size=16
149
+ ),
150
+ legend=dict(
151
+ orientation="h",
152
+ yanchor="bottom",
153
+ y=1.02,
154
+ xanchor="center",
155
+ x=0.47
156
+ ),
157
+ margin=dict(
158
+ t=0,
159
+ b=1,
160
+ l=1,
161
+ r=1,
162
+ autoexpand=True
149
163
  )
150
164
  )
151
165
 
@@ -206,6 +220,20 @@ def table(homepage, config, dataframe, option_manager):
206
220
  fig.update_layout(
207
221
  font=dict(
208
222
  size=16
223
+ ),
224
+ legend=dict(
225
+ orientation="h",
226
+ yanchor="bottom",
227
+ y=1.02,
228
+ xanchor="center",
229
+ x=0.47
230
+ ),
231
+ margin=dict(
232
+ t=0,
233
+ b=1,
234
+ l=1,
235
+ r=1,
236
+ autoexpand=True
209
237
  )
210
238
  )
211
239
 
@@ -298,6 +326,20 @@ def best_cost_by_round(homepage, config, data, option_manager):
298
326
  fig.update_layout(
299
327
  font=dict(
300
328
  size=16
329
+ ),
330
+ legend=dict(
331
+ orientation="h",
332
+ yanchor="bottom",
333
+ y=1.02,
334
+ xanchor="center",
335
+ x=0.47
336
+ ),
337
+ margin=dict(
338
+ t=0,
339
+ b=1,
340
+ l=1,
341
+ r=1,
342
+ autoexpand=True
301
343
  )
302
344
  )
303
345
 
@@ -373,6 +415,20 @@ def calibrated_params_by_round(homepage, config, list_of_objs, option_manager):
373
415
  fig.update_layout(
374
416
  font=dict(
375
417
  size=16
418
+ ),
419
+ legend=dict(
420
+ orientation="h",
421
+ yanchor="bottom",
422
+ y=1.02,
423
+ xanchor="center",
424
+ x=0.47
425
+ ),
426
+ margin=dict(
427
+ t=0,
428
+ b=1,
429
+ l=1,
430
+ r=1,
431
+ autoexpand=True
376
432
  )
377
433
  )
378
434
 
@@ -455,6 +511,20 @@ def custom_csv(homepage, option_manager):
455
511
  fig.update_layout(
456
512
  font=dict(
457
513
  size=16
514
+ ),
515
+ legend=dict(
516
+ orientation="h",
517
+ yanchor="bottom",
518
+ y=1.02,
519
+ xanchor="center",
520
+ x=0.47
521
+ ),
522
+ margin=dict(
523
+ t=0,
524
+ b=1,
525
+ l=1,
526
+ r=1,
527
+ autoexpand=True
458
528
  )
459
529
  )
460
530
 
@@ -546,6 +616,20 @@ def compare_csv(homepage, option_manager):
546
616
  fig.update_layout(
547
617
  font=dict(
548
618
  size=16
619
+ ),
620
+ legend=dict(
621
+ orientation="h",
622
+ yanchor="bottom",
623
+ y=1.02,
624
+ xanchor="center",
625
+ x=0.47
626
+ ),
627
+ margin=dict(
628
+ t=0,
629
+ b=1,
630
+ l=1,
631
+ r=1,
632
+ autoexpand=True
549
633
  )
550
634
  )
551
635
 
@@ -639,6 +723,20 @@ def sampling_csv(homepage, option_manager):
639
723
  fig.update_layout(
640
724
  font=dict(
641
725
  size=16
726
+ ),
727
+ legend=dict(
728
+ orientation="h",
729
+ yanchor="bottom",
730
+ y=1.02,
731
+ xanchor="center",
732
+ x=0.47
733
+ ),
734
+ margin=dict(
735
+ t=0,
736
+ b=1,
737
+ l=1,
738
+ r=1,
739
+ autoexpand=True
642
740
  )
643
741
  )
644
742
 
@@ -755,6 +853,20 @@ def matrix_editor(homepage, option_manager):
755
853
  fig.update_layout(
756
854
  font=dict(
757
855
  size=16
856
+ ),
857
+ legend=dict(
858
+ orientation="h",
859
+ yanchor="bottom",
860
+ y=1.02,
861
+ xanchor="center",
862
+ x=0.47
863
+ ),
864
+ margin=dict(
865
+ t=0,
866
+ b=1,
867
+ l=1,
868
+ r=1,
869
+ autoexpand=True
758
870
  )
759
871
  )
760
872
 
@@ -802,6 +914,20 @@ def matrix_editor(homepage, option_manager):
802
914
  fig.update_layout(
803
915
  font=dict(
804
916
  size=16
917
+ ),
918
+ legend=dict(
919
+ orientation="h",
920
+ yanchor="bottom",
921
+ y=1.02,
922
+ xanchor="center",
923
+ x=0.47
924
+ ),
925
+ margin=dict(
926
+ t=0,
927
+ b=1,
928
+ l=1,
929
+ r=1,
930
+ autoexpand=True
805
931
  )
806
932
  )
807
933