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

Implement scaling implausibility for Vake skulls 

Vake skulls now have scaling implausibility, which is calculated using a
partial sum formula.

Implausibility calculation has been reorganized to accomodate the
change.
This commit is contained in:
Jeremy Saklad 2021-09-01 13:21:47 -05:00
parent 5d7c972169
commit ebd2c2fc48
Signed by: Jeremy Saklad
GPG Key ID: 9CA2149583EDBF84
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonemarketsolver/data/skulls.py
View File

@ -129,7 +129,7 @@ class Skull(Enum):
skulls_needed = -1 skulls_needed = -1
) )
# Value scales with repetition and is implemented separately # Value and implausibility scale with repetition and are implemented separately
VAKE_SKULL = Action( VAKE_SKULL = Action(
"Duplicate the Vake's skull and use it to decorate your (Skeleton Type)", "Duplicate the Vake's skull and use it to decorate your (Skeleton Type)",
cost = Cost.ACTION.value + 6000*Cost.BONE_FRAGMENT.value, cost = Cost.ACTION.value + 6000*Cost.BONE_FRAGMENT.value,

31
bonemarketsolver/solve.py
View File

@ -232,9 +232,38 @@ def Solve(shadowy_level, bone_market_fluctuations = None, zoological_mania = Non
menace = model.NewIntVar(cp_model.INT32_MIN, cp_model.INT32_MAX, 'menace') menace = model.NewIntVar(cp_model.INT32_MIN, cp_model.INT32_MAX, 'menace')
model.Add(menace == cp_model.LinearExpr.ScalProd(actions.values(), [action.value.menace for action in actions.keys()])) model.Add(menace == cp_model.LinearExpr.ScalProd(actions.values(), [action.value.menace for action in actions.keys()]))
# Implausibility calculation # Implausibility calculation
implausibility = model.NewIntVar(cp_model.INT32_MIN, cp_model.INT32_MAX, 'implausibility') implausibility = model.NewIntVar(cp_model.INT32_MIN, cp_model.INT32_MAX, 'implausibility')
model.Add(implausibility == cp_model.LinearExpr.ScalProd(actions.values(), [action.value.implausibility for action in actions.keys()]))
constant_base_implausibility = model.NewIntVar(cp_model.INT32_MIN, cp_model.INT32_MAX, 'implausibility')
model.Add(constant_base_implausibility == cp_model.LinearExpr.ScalProd(actions.values(), [action.value.implausibility for action in actions.keys()]))
# Calculate implausibility from Vake skulls
# This is a partial sum formula.
vake_skull_implausibility = model.NewIntVar(0, cp_model.INT32_MAX, 'vake skull implausibility')
vake_skull_implausibility_numerator = model.NewIntVar(0, cp_model.INT32_MAX, 'vake skull implausibility numerator')
vake_skulls = actions[Skull.VAKE_SKULL]
vake_skull_implausibility_numerator_second_term = model.NewIntVar(0, cp_model.INT32_MAX, 'vake skull implausibility numerator second term')
model.AddMultiplicationEquality(vake_skull_implausibility_numerator_second_term, [vake_skulls, vake_skulls])
vake_skull_implausibility_numerator_third_term = model.NewIntVar(0, 1, 'vake skull implausibility numerator third term')
model.AddModuloEquality(vake_skull_implausibility_numerator_third_term, vake_skulls, 2)
model.Add(vake_skull_implausibility_numerator == -2 * vake_skulls + vake_skull_implausibility_numerator_second_term + vake_skull_implausibility_numerator_third_term)
del vake_skulls, vake_skull_implausibility_numerator_second_term, vake_skull_implausibility_numerator_third_term
model.AddDivisionEquality(vake_skull_implausibility, vake_skull_implausibility_numerator, 4)
del vake_skull_implausibility_numerator
model.Add(implausibility == constant_base_implausibility + vake_skull_implausibility)
del constant_base_implausibility, vake_skull_implausibility
# Counter-church calculation # Counter-church calculation