Saklad5
/
Bone-Market-Solver
2
0
Fork 0
Code Issues Pull Requests Activity

fix: Include effects of skulls when adding joints 

The cost of adding joints is dependent on the current amount, which may
be affected by both the torso and skulls.

The new implementation still ignores the effects of other Appendage
actions, since joints may be added before doing anything else. This may
warrant revisiting in the future.
This commit is contained in:
Jeremy Saklad 2022-05-26 08:12:34 -06:00
parent 57a2e9ce36
commit 0757dc3275
Signed by: Jeremy Saklad
GPG Key ID: 94B02EA3D0B6481B
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bonemarketsolver/solve.py
View File

@ -4,6 +4,7 @@ __all__ = ['Adjustment', 'Appendage', 'Buyer', 'Declaration', 'DiplomatFascinati
__author__ = "Jeremy Saklad"
from functools import partialmethod
from itertools import chain
from os import cpu_count
from ortools.sat.python import cp_model
@ -290,8 +291,9 @@ def Solve(shadowy_level, bone_market_fluctuations = None, zoological_mania = Non
add_joints = actions[Appendage.ADD_JOINTS]
# Joints may be added once the torso and skulls are chosen, so the sum of their properties are the starting point.
base_joints = model.NewIntVar('base joints', lb = 0)
model.Add(base_joints == cp_model.LinearExpr.WeightedSum([value for (key, value) in actions.items() if isinstance(key, Torso)], [torso.value.limbs_needed + torso.value.arms + torso.value.legs + torso.value.wings + torso.value.fins + torso.value.tentacles for torso in Torso]))
model.Add(base_joints == cp_model.LinearExpr.WeightedSum([value for (key, value) in actions.items() if isinstance(key, (Torso, Skull))], [action.value.limbs_needed + action.value.arms + action.value.legs + action.value.wings + action.value.fins + action.value.tentacles for action in chain(Torso, Skull)]))
add_joints_amber_cost_multiple = model.NewIntVar('add joints amber cost multiple', lb = 0)