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

Make world quality arguments optional 

In the absence of provided values, the script will use the "normal"
values for everything. While this may produce suboptimal results, it
could prove helpful for creating worst-case scenario designs.
This commit is contained in:
Jeremy Saklad 2021-07-11 15:45:04 -05:00
parent c73023d4dc
commit 545e46e301
Signed by: Jeremy Saklad
GPG Key ID: 9CA2149583EDBF84
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Bone Market Solver.py
View File

@ -1216,7 +1216,7 @@ DiplomatFascination = Enum(
DiplomatFascination.__doc__ = "The current fascination of the Trifling Diplomat." DiplomatFascination.__doc__ = "The current fascination of the Trifling Diplomat."
def Solve(shadowy_level, bone_market_fluctuations, zoological_mania, occasional_buyer = None, diplomat_fascination = None, desired_buyers = [], maximum_cost = cp_model.INT32_MAX, maximum_exhaustion = cp_model.INT32_MAX, time_limit = float('inf'), workers = cpu_count(), stdscr = None): def Solve(shadowy_level, bone_market_fluctuations = None, zoological_mania = None, occasional_buyer = None, diplomat_fascination = None, desired_buyers = [], maximum_cost = cp_model.INT32_MAX, maximum_exhaustion = cp_model.INT32_MAX, time_limit = float('inf'), workers = cpu_count(), stdscr = None):
model = cp_model.CpModel() model = cp_model.CpModel()
actions = {} actions = {}
@ -1287,16 +1287,20 @@ def Solve(shadowy_level, bone_market_fluctuations, zoological_mania, occasional_
original_value = model.NewIntVar(0, cp_model.INT32_MAX, 'original value') original_value = model.NewIntVar(0, cp_model.INT32_MAX, 'original value')
model.Add(original_value == cp_model.LinearExpr.ScalProd(actions.values(), [action.value.value for action in actions.keys()])) model.Add(original_value == cp_model.LinearExpr.ScalProd(actions.values(), [action.value.value for action in actions.keys()]))
value = model.NewIntVar(0, cp_model.INT32_MAX, 'value')
if zoological_mania:
multiplier = 115 if zoological_mania in [Declaration.FISH, Declaration.INSECT, Declaration.SPIDER] else 110 multiplier = 115 if zoological_mania in [Declaration.FISH, Declaration.INSECT, Declaration.SPIDER] else 110
multiplied_value = model.NewIntVar(0, cp_model.INT32_MAX, 'multiplied value') multiplied_value = model.NewIntVar(0, cp_model.INT32_MAX, 'multiplied value')
model.Add(multiplied_value == multiplier*original_value).OnlyEnforceIf(actions[zoological_mania]) model.Add(multiplied_value == multiplier*original_value).OnlyEnforceIf(actions[zoological_mania])
model.Add(multiplied_value == 100*original_value).OnlyEnforceIf(actions[zoological_mania].Not()) model.Add(multiplied_value == 100*original_value).OnlyEnforceIf(actions[zoological_mania].Not())
value = model.NewIntVar(0, cp_model.INT32_MAX, 'value')
model.AddDivisionEquality(value, multiplied_value, 100) model.AddDivisionEquality(value, multiplied_value, 100)
else:
model.Add(value == original_value)
del original_value, multiplier, multiplied_value del original_value
# Torso Style calculation # Torso Style calculation
@ -2401,7 +2405,6 @@ def main():
"-f", "--bone-market-fluctuations", "-f", "--bone-market-fluctuations",
action=EnumAction, action=EnumAction,
type=Fluctuation, type=Fluctuation,
required=True,
help="current value of Bone Market Fluctuations, which grants various bonuses to certain buyers", help="current value of Bone Market Fluctuations, which grants various bonuses to certain buyers",
dest='bone_market_fluctuations' dest='bone_market_fluctuations'
) )
@ -2410,7 +2413,6 @@ def main():
"-m", "--zoological-mania", "-m", "--zoological-mania",
action=EnumAction, action=EnumAction,
type=Declaration, type=Declaration,
required=True,
help="current value of Zoological Mania, which grants a percentage bonus to value for a certain declaration", help="current value of Zoological Mania, which grants a percentage bonus to value for a certain declaration",
dest='zoological_mania' dest='zoological_mania'
) )