Skip to content

Commit

Permalink
bug in decisions
Browse files Browse the repository at this point in the history
  • Loading branch information
@Graveflo
Graveflo committed Jul 24, 2020
1 parent dd17b93 commit df4666d
Show file tree
Hide file tree
Showing 2 changed files with 52 additions and 21 deletions.
70 changes: 51 additions & 19 deletions DlgCompact.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,10 @@ def closeEvent(self, a0: QtGui.QCloseEvent) -> None:
super(Dlg_Compact, self).closeEvent(a0)
self.frmMain.show()

def keyPressEvent(self, a0: QtGui.QKeyEvent) -> None:
if a0.key() is not Qt.Key_Escape:
super(Dlg_Compact, self).keyPressEvent(a0)

def gear_changed(self):
self.not_included = None
self.update_decision_tree()
Expand Down Expand Up @@ -261,7 +265,7 @@ def get_fs_attempt(self, fs_lvl, best_fser_idxs, best_enh_idxs, fs_c_T, eh_c_T,
fs_decision = StackFails(this_gear, 0, this_decision, alt_cur_fs=i)
this_decision.addChild(fs_decision)
if attempt_found:
chosen_attempt_idx = best_enh_idxs[fs_lvl + i]
chosen_attempt_idx = best_enh_idxs[i]
if chosen_attempt_idx < mod_enhance_split_idx: # This section only applies for best_enh_idxs != best_real_enh_idxs
attempt_gear = enhance_me[chosen_attempt_idx]
this_decision.set_gear_item(attempt_gear)
Expand All @@ -274,9 +278,9 @@ def get_fs_attempt(self, fs_lvl, best_fser_idxs, best_enh_idxs, fs_c_T, eh_c_T,
else:
return None

def get_loss_prev_fs_attempt(self, fs_lvl, best_fser_idxs, best_enh_idxs, fs_c_T, eh_c_T, mod_fail_stackers, mod_enhance_me, excluded):
def get_loss_prev_fs_attempt(self, fs_lvl, best_fser_idxs, best_real_enh_idxs, fs_c_T, eh_c_T, mod_fail_stackers, enhance_me, excluded):
best_fser_idx = best_fser_idxs[fs_lvl]
best_enh_idx = best_enh_idxs[fs_lvl]
best_enh_idx = best_real_enh_idxs[fs_lvl]
this_fsers = fs_c_T[fs_lvl]

this_gear: Gear = mod_fail_stackers[best_fser_idx]
Expand All @@ -293,9 +297,9 @@ def get_loss_prev_fs_attempt(self, fs_lvl, best_fser_idxs, best_enh_idxs, fs_c_T
cost_failstack = fs_c_T[fs_lvl][best_fser_idx]
i = fs_lvl
# for i in range(fs_lvl, len(best_fs_idxs)):
while i < len(best_enh_idxs) and attempt_found is None:
this_gear = mod_enhance_me[best_enh_idxs[i]]
loss_prev_out = self.test_for_loss_pre_dec(i, this_gear, best_enh_idx, eh_c_T, excluded, mod_enhance_me)
while i < len(best_fser_idxs) and attempt_found is None:
this_gear = enhance_me[best_real_enh_idxs[i]]
loss_prev_out = self.test_for_loss_pre_dec(i, this_gear, best_enh_idx, eh_c_T, excluded, enhance_me)
still_failing = len(loss_prev_out) <= 0
if not still_failing:
best = loss_prev_out[0]
Expand Down Expand Up @@ -346,6 +350,8 @@ def get_loss_prev_fs_attempt(self, fs_lvl, best_fser_idxs, best_enh_idxs, fs_c_T
def test_for_loss_pre_dec(self, fs_lvl, this_gear, best_enh_idx, eh_c_T, excluded, mod_enhance_me) -> typing.List[Decision]:
finds = []
for excl_gear in excluded:
if excl_gear is this_gear:
continue
eh_idx = excl_gear.get_enhance_lvl_idx()
cost_vec_l = excl_gear.cost_vec[eh_idx]
idx_ = numpy.argmin(cost_vec_l)
Expand All @@ -355,7 +361,7 @@ def test_for_loss_pre_dec(self, fs_lvl, this_gear, best_enh_idx, eh_c_T, exclude
index = mod_enhance_me.index(excl_gear)
cost = eh_c_T[fs_lvl][index] - eh_c_T[fs_lvl][best_enh_idx]
this_decision = Decision(excl_gear, cost, self.ui.treeWidget)
loss_prev_enh_step = LossPreventionEnhancement(excl_gear, this_gear, this_decision, cost_diff=cost)
loss_prev_enh_step = LossPreventionEnhancement(excl_gear, this_gear, this_decision, cost_diff=cost, loss_prev=optimality)
this_decision.addChild(loss_prev_enh_step)
enhance_decision = AttemptEnhancement(excl_gear, this_decision, on_fs=fs_lvl)
this_decision.addChild(enhance_decision)
Expand All @@ -375,6 +381,7 @@ def check_out_fs_lvl(self, fs_lvl, alt_idx, alts, fs_c_T, eh_c_T, excluded, enha
best_enh_idx = best_enh_idxs[fs_lvl]

if this_fsers[best_fser_idx] < this_enhancers[best_enh_idx]:
this_gear = mod_fail_stackers[best_fser_idx]
this_decision = self.get_fs_attempt(fs_lvl, best_fs_idxs, best_enh_idxs, fs_c_T, eh_c_T, mod_fail_stackers,
mod_enhance_split_idx, enhance_me)

Expand All @@ -400,9 +407,9 @@ def check_out_fs_lvl(self, fs_lvl, alt_idx, alts, fs_c_T, eh_c_T, excluded, enha
enhance_decision = AttemptEnhancement(this_gear, this_decision, on_fs=fs_lvl)
this_decision.addChild(enhance_decision)
these_decisions.append(this_decision)
# Check loss prevention enhancements
prevs = self.test_for_loss_pre_dec(fs_lvl, this_gear, best_enh_idx, eh_c_T, excluded, mod_enhance_me)
for lprev in prevs:
# Check loss prevention enhancements
prevs = self.test_for_loss_pre_dec(fs_lvl, this_gear, best_enh_idx, eh_c_T, excluded, mod_enhance_me)
for lprev in prevs:
switch_alt_step = SwitchAlt(alt_idx, alts, lprev)
lprev.insertChild(1, switch_alt_step)
these_loss_prev_dec.append(lprev)
Expand Down Expand Up @@ -436,9 +443,9 @@ def decide(self):
mod_fail_stackers = frmMain.mod_fail_stackers

included = set()
frmMain_table_Strat:QtWidgets.QTableWidget = frmMain.ui.table_Strat
for i in range(min_fs, frmMain_table_Strat.rowCount()):
included.add(frmMain_table_Strat.cellWidget(i, 1).gear)
#frmMain_table_Strat:QtWidgets.QTableWidget = frmMain.ui.table_Strat
#for i in range(min_fs, frmMain_table_Strat.rowCount()):
# included.add(frmMain_table_Strat.cellWidget(i, 1).gear)
excluded = set([x for x in enhance_me if x not in included])

best_fs_idxs = numpy.argmin(fs_c_T, axis=1)
Expand All @@ -450,15 +457,19 @@ def decide(self):
loss_prev_dec = []
ground_up_dec = []

alt_dict = {a[2]:(i, a[0], a[1]) for i,a in enumerate(alts)} # TODO: reverse this order so laters dont overwrite priors
#alt_dict = {a[2]:(i, a[0], a[1]) for i,a in enumerate(alts)} # reverse this order so laters dont overwrite priors
alt_dict = {}
for i,a in enumerate(alts):
if a[2] not in alt_dict:
alt_dict[a[2]] = (i, a[0], a[1])

found_mins = False

for fs_lvl,pack in alt_dict.items():
if fs_lvl <= min_fs and not found_mins:
this_decision = self.get_fs_attempt(min_fs, best_fs_idxs, best_real_enh_idxs, fs_c_T, eh_c_T, mod_fail_stackers,
mod_enhance_split_idx, enhance_me)
loss_dec = self.get_loss_prev_fs_attempt(fs_lvl, best_fs_idxs, best_enh_idxs, fs_c_T, eh_c_T, mod_fail_stackers, mod_enhance_me, excluded)
loss_dec = self.get_loss_prev_fs_attempt(fs_lvl, best_fs_idxs, best_real_enh_idxs, fs_c_T, eh_c_T, mod_fail_stackers, mod_enhance_me, excluded)
alt_idx, alt_pic, alt_name = alt_dict[min_fs]
if this_decision is not None:
for i in range(0, this_decision.childCount()):
Expand Down Expand Up @@ -634,6 +645,7 @@ def update_decision_tree(self):
frmObj.treeWidget.takeTopLevelItem(0)

self.cmd_buttons.clear()
self.ui.lblInfo.clear()

for decision in self.decisions:
frmObj.treeWidget.addTopLevelItem(decision)
Expand All @@ -645,19 +657,39 @@ def update_decision_tree(self):
frmObj.treeWidget.sortItems(2, Qt.AscendingOrder)
frmObj.treeWidget.resizeColumnToContents(1)

def invalidate(self):
frmObj = self.ui
self.decisions = None
self.selected_decision = None
for i in range(frmObj.treeWidget.topLevelItemCount()):
frmObj.treeWidget.takeTopLevelItem(0)

self.cmd_buttons.clear()
self.ui.lblInfo.clear()
self.bs_wid.set_pixmap(self.black_spirits[BS_HMM])

def get_cur_fs(self):
return self.ui.spinFS.value()


class LossPreventionEnhancement(DecisionStep):
DESR = 'Go for this item even if {} is ~{:,} silver more effiecent? Do this for items that are not effiecent in gerneal or when you need to rush.'
def __init__(self, this_gear, sub_gear, *args, cost_diff=None):
DESR = 'Go for this item even if {} is ~{:,} silver more effiecent? Do this for items that are not effiecent in gerneal or when you need to rush. Loss prevention: {}'
def __init__(self, this_gear, sub_gear, *args, cost_diff=None, loss_prev=None):
super(LossPreventionEnhancement, self).__init__(*args)
self.gear = this_gear
self.sub_gear = sub_gear
self.setText(1, 'Consider {} instead of {}'.format(this_gear.get_full_name(), sub_gear.get_full_name()))
self.update_text()
self.ok = False
self.cost_diff = cost_diff
self.loss_prev = loss_prev

def set_loss_prev(self, loss_prev):
self.loss_prev = loss_prev

def update_text(self):
this_gear = self.gear
sub_gear = self.sub_gear
self.setText(1, 'Consider {} instead of {}'.format(this_gear.get_full_name(), sub_gear.get_full_name()))

def set_cost_diff(self, cost_diff):
self.cost_diff = cost_diff
Expand All @@ -677,7 +709,7 @@ def cmdSucceed_clicked():
return[cmdSucceed]

def get_description(self):
return self.DESR.format(self.sub_gear.get_full_name(), int(round(self.cost_diff)))
return self.DESR.format(self.sub_gear.get_full_name(), int(round(self.cost_diff)), self.loss_prev)


class AttemptEnhancement(DecisionStep):
Expand Down
3 changes: 1 addition & 2 deletions FrmMain.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,6 @@ def get_path(self):
return self.img_path



class DlgManageAlts(QDialog):
def __init__(self, frmMain):
super(DlgManageAlts, self).__init__(parent=frmMain)
Expand Down Expand Up @@ -299,7 +298,6 @@ def spin_changed(self, pint, twi:QTableWidgetItem):
twi.setText(str(pint))
self.frmMain.invalidate_strategy()


def lbl_sig_picture_changed(self, lbl, path):
idx = self.pics.index(lbl)
frmObj = self.ui
Expand Down Expand Up @@ -1852,6 +1850,7 @@ def invalidate_strategy(self):
clear_table(tw_eh)
with QBlockSig(tw_fs):
clear_table(tw_fs)
self.compact_window.invalidate()
self.model.save()

def open_file_dlg(self):
Expand Down

0 comments on commit df4666d

Please sign in to comment.