Saklad5
/
Bone-Market-Solver
2
0
Fork 0
Code Issues Pull Requests Activity
Bone-Market-Solver/bonemarketsolver/solve.py

1090 lines
54 KiB
Python
Raw Normal View History

Add module-level information A docstring has been added describing the module's purpose. __all__ has been added. It is limited to the declarations needed to use Solve(). The author's name has been added.
2021-06-18 20:28:56 +00:00
"""Use constraint programming to devise the optimal skeleton at the Bone Market in Fallen London."""
Add blacklist parameter to solver Enum members in this dictionary are disallowed by the solver. The types that can be blacklisted have been added to __all__ in solve.py.
2021-08-13 13:39:04 +00:00
__all__ = ['Adjustment', 'Appendage', 'Buyer', 'Declaration', 'DiplomatFascination', 'Embellishment', 'Fluctuation', 'OccasionalBuyer', 'Skull', 'Solve', 'Torso']
Add module-level information A docstring has been added describing the module's purpose. __all__ has been added. It is limited to the declarations needed to use Solve(). The author's name has been added.
2021-06-18 20:28:56 +00:00
__author__ = "Jeremy Saklad"
Refactor simpler buyers Buyer requirements now use helper methods and control flow to increase readability and compactness. The main benefit of this is no longer having to declare intermediate variables directly. This is a work-in-progress, as some buyers have complex formulae that necessitate more work or additional helper methods to refactor.
2021-10-15 22:46:13 +00:00
from functools import partialmethod
Initial commit
2021-06-08 22:28:15 +00:00
from ortools.sat.python import cp_model
Convert project to package All scripts are now contained in a package named "bonemarketsolver". The command-line interface has been moved to __main__.py. The solver script has been moved to solve.py. Relative module imports are now used where appropriate. The invocation method of the CLI has changed: instead of running Python itself, you can now use "pipenv run bone_market_solver". The README has been updated to reflect the new usage method.
2021-08-03 19:48:42 +00:00
from .data.adjustments import Adjustment
from .data.appendages import Appendage
from .data.buyers import Buyer
from .data.costs import Cost
from .data.declarations import Declaration
from .data.diplomat_fascinations import DiplomatFascination
from .data.embellishments import Embellishment
from .data.fluctuations import Fluctuation
from .data.occasional_buyers import OccasionalBuyer
from .data.skulls import Skull
from .data.torsos import Torso
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
from .objects.bone_market_model import BoneMarketModel
Move Cost enumeration to different file Having a single extremely large file harms readability. To solve this problem, the Cost enumeration is now in a distinct file.
2021-08-03 17:02:06 +00:00
Initial commit
2021-06-08 22:28:15 +00:00
# This multiplier is applied to the profit margin to avoid losing precision due to rounding.
Update OR-Tools to v9.1 This update, despite ostensibly being a minor version, includes breaking changes that must be accounted for. Overflow is much more strictly checked, so the magnitude of certain constants has been decreased. CP-SAT's default number of workers has been changed to reflect the default of this script. As such, the script no longer needs to change that parameter unless a specific number of workers has been specified. In light of the breaking changes, the OR-Tools version is now pinned at 9.1 instead of being permitted to use future minor versions.
2021-10-16 02:32:55 +00:00
PROFIT_MARGIN_MULTIPLIER = 10000
Initial commit
2021-06-08 22:28:15 +00:00
# This is the highest number of attribute to calculate fractional exponents for.
MAXIMUM_ATTRIBUTE = 100
# This is a constant used to calculate difficulty checks. You almost certainly do not need to change this.
DIFFICULTY_SCALER = 0.6
Update OR-Tools to v9.1 This update, despite ostensibly being a minor version, includes breaking changes that must be accounted for. Overflow is much more strictly checked, so the magnitude of certain constants has been decreased. CP-SAT's default number of workers has been changed to reflect the default of this script. As such, the script no longer needs to change that parameter unless a specific number of workers has been specified. In light of the breaking changes, the OR-Tools version is now pinned at 9.1 instead of being permitted to use future minor versions.
2021-10-16 02:32:55 +00:00
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 = None, blacklist = [], stdscr = None):
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
model = BoneMarketModel()
Initial commit
2021-06-08 22:28:15 +00:00
actions = {}
Remove data model Rather than having a single action list, actions are now added to the model enumeration-by-enumeration. This allows for more flexibility and clarity when introducing exceptions to the norm. Skipping tails is now modelled correctly: it can only be done once, and doing so removes all remaining tails. As far as the model is concerned, this means that not all tails need to be filled if tails have been skipped.
2021-06-13 17:37:15 +00:00
# Torso
for torso in Torso:
actions[torso] = model.NewBoolVar(torso.value.name)
# Skull
for skull in Skull:
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
actions[skull] = model.NewIntVar(skull.value.name, lb = 0)
Remove data model Rather than having a single action list, actions are now added to the model enumeration-by-enumeration. This allows for more flexibility and clarity when introducing exceptions to the norm. Skipping tails is now modelled correctly: it can only be done once, and doing so removes all remaining tails. As far as the model is concerned, this means that not all tails need to be filled if tails have been skipped.
2021-06-13 17:37:15 +00:00
# Appendage
for appendage in Appendage:
if appendage == Appendage.SKIP_TAILS:
actions[appendage] = model.NewBoolVar(appendage.value.name)
Initial commit
2021-06-08 22:28:15 +00:00
else:
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
actions[appendage] = model.NewIntVar(appendage.value.name, lb = 0)
Add hints and assumptions The solver now starts by trying to solve without adding joints or declaring skeletons chimeras. Desired buyers are now set as an assumption rather than a linear expression.
2021-06-15 22:27:59 +00:00
# Avoid adding joints at first
model.AddHint(actions[Appendage.ADD_JOINTS], 0)
Initial commit
2021-06-08 22:28:15 +00:00
Remove data model Rather than having a single action list, actions are now added to the model enumeration-by-enumeration. This allows for more flexibility and clarity when introducing exceptions to the norm. Skipping tails is now modelled correctly: it can only be done once, and doing so removes all remaining tails. As far as the model is concerned, this means that not all tails need to be filled if tails have been skipped.
2021-06-13 17:37:15 +00:00
# Adjustment
for adjustment in Adjustment:
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
actions[adjustment] = model.NewIntVar(adjustment.value.name, lb = 0)
Initial commit
2021-06-08 22:28:15 +00:00
Remove data model Rather than having a single action list, actions are now added to the model enumeration-by-enumeration. This allows for more flexibility and clarity when introducing exceptions to the norm. Skipping tails is now modelled correctly: it can only be done once, and doing so removes all remaining tails. As far as the model is concerned, this means that not all tails need to be filled if tails have been skipped.
2021-06-13 17:37:15 +00:00
# Declaration
Initial commit
2021-06-08 22:28:15 +00:00
for declaration in Declaration:
Remove data model Rather than having a single action list, actions are now added to the model enumeration-by-enumeration. This allows for more flexibility and clarity when introducing exceptions to the norm. Skipping tails is now modelled correctly: it can only be done once, and doing so removes all remaining tails. As far as the model is concerned, this means that not all tails need to be filled if tails have been skipped.
2021-06-13 17:37:15 +00:00
actions[declaration] = model.NewBoolVar(declaration.value.name)
Add hints and assumptions The solver now starts by trying to solve without adding joints or declaring skeletons chimeras. Desired buyers are now set as an assumption rather than a linear expression.
2021-06-15 22:27:59 +00:00
# Try non-Chimera declarations first
model.AddHint(actions[Declaration.CHIMERA], 0)
Remove data model Rather than having a single action list, actions are now added to the model enumeration-by-enumeration. This allows for more flexibility and clarity when introducing exceptions to the norm. Skipping tails is now modelled correctly: it can only be done once, and doing so removes all remaining tails. As far as the model is concerned, this means that not all tails need to be filled if tails have been skipped.
2021-06-13 17:37:15 +00:00
Add Embellishment enumeration These actions are taken after a declaration is made, but before the skeleton is sold. Since these actions offer a way of reducing implausibility, difficulty level has been tweaked to avoid allow lowering it past zero.
2021-06-13 19:27:53 +00:00
# Embellishment
for embellishment in Embellishment:
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
actions[embellishment] = model.NewIntVar(embellishment.value.name, lb = 0)
Add Embellishment enumeration These actions are taken after a declaration is made, but before the skeleton is sold. Since these actions offer a way of reducing implausibility, difficulty level has been tweaked to avoid allow lowering it past zero.
2021-06-13 19:27:53 +00:00
Add command-line parameter for occasional buyers Some buyers are only available based on a world quality. The solver now skips buyers if they are not available. This is specified using a new parameter, which is mutually-exclusive with specifying a specific buyer. If no buyer is specified, this world quality must be specified instead to tell the solver who is around.
2021-06-16 20:30:48 +00:00
Make buyers part of model Buyers are now part of the model, rather than being fixed. This means that the model can choose from among all buyers and determine the most profitable option. Accomplishing this meant replacing the if-else control flow with a large quantity of half-reified constraints.
2021-06-13 22:37:39 +00:00
# Buyer
for buyer in Buyer:
actions[buyer] = model.NewBoolVar(buyer.value.name)
Add command-line parameter for occasional buyers Some buyers are only available based on a world quality. The solver now skips buyers if they are not available. This is specified using a new parameter, which is mutually-exclusive with specifying a specific buyer. If no buyer is specified, this world quality must be specified instead to tell the solver who is around.
2021-06-16 20:30:48 +00:00
# Mark unavailable buyers
model.AddAssumptions([
actions[buyer].Not()
for unavailable_buyer in OccasionalBuyer if unavailable_buyer != occasional_buyer
Add ability to specify multiple buyers at once Users can now specify multiple buyers, allowing the solver to figure out the best skeleton that could be sold to any of them. This could be useful for buyers that share a payout.
2021-06-16 22:28:16 +00:00
for buyer in unavailable_buyer.value if buyer not in desired_buyers
Add command-line parameter for occasional buyers Some buyers are only available based on a world quality. The solver now skips buyers if they are not available. This is specified using a new parameter, which is mutually-exclusive with specifying a specific buyer. If no buyer is specified, this world quality must be specified instead to tell the solver who is around.
2021-06-16 20:30:48 +00:00
])
Add the Trifling Diplomat This buyer actually changes based on a world quality. As such, it has been implemented in a similar fashion to Occasional Buyer. The scaling for this buyer's difficulty level has not been established at the time of this writing, so it is being treated as 0.
2021-06-25 23:37:41 +00:00
model.AddAssumptions([
actions[outmoded_fascination.value].Not()
for outmoded_fascination in DiplomatFascination if outmoded_fascination != diplomat_fascination and outmoded_fascination.value not in desired_buyers
])
Add command-line parameter for occasional buyers Some buyers are only available based on a world quality. The solver now skips buyers if they are not available. This is specified using a new parameter, which is mutually-exclusive with specifying a specific buyer. If no buyer is specified, this world quality must be specified instead to tell the solver who is around.
2021-06-16 20:30:48 +00:00
Add ability to specify multiple buyers at once Users can now specify multiple buyers, allowing the solver to figure out the best skeleton that could be sold to any of them. This could be useful for buyers that share a payout.
2021-06-16 22:28:16 +00:00
# Restrict to desired buyers
if desired_buyers:
model.Add(cp_model.LinearExpr.Sum([actions[desired_buyer] for desired_buyer in desired_buyers]) == 1)
Add blacklist parameter to solver Enum members in this dictionary are disallowed by the solver. The types that can be blacklisted have been added to __all__ in solve.py.
2021-08-13 13:39:04 +00:00
# Blacklist
model.Add(cp_model.LinearExpr.Sum([actions[forbidden] for forbidden in blacklist]) == 0)
Add command-line parameter for occasional buyers Some buyers are only available based on a world quality. The solver now skips buyers if they are not available. This is specified using a new parameter, which is mutually-exclusive with specifying a specific buyer. If no buyer is specified, this world quality must be specified instead to tell the solver who is around.
2021-06-16 20:30:48 +00:00
Remove data model Rather than having a single action list, actions are now added to the model enumeration-by-enumeration. This allows for more flexibility and clarity when introducing exceptions to the norm. Skipping tails is now modelled correctly: it can only be done once, and doing so removes all remaining tails. As far as the model is concerned, this means that not all tails need to be filled if tails have been skipped.
2021-06-13 17:37:15 +00:00
# One torso
model.Add(cp_model.LinearExpr.Sum([value for (key, value) in actions.items() if isinstance(key, Torso)]) == 1)
# One declaration
model.Add(cp_model.LinearExpr.Sum([value for (key, value) in actions.items() if isinstance(key, Declaration)]) == 1)
Initial commit
2021-06-08 22:28:15 +00:00
Make buyers part of model Buyers are now part of the model, rather than being fixed. This means that the model can choose from among all buyers and determine the most profitable option. Accomplishing this meant replacing the if-else control flow with a large quantity of half-reified constraints.
2021-06-13 22:37:39 +00:00
# One buyer
model.Add(cp_model.LinearExpr.Sum([value for (key, value) in actions.items() if isinstance(key, Buyer)]) == 1)
Initial commit
2021-06-08 22:28:15 +00:00
# Value calculation
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
value = model.NewIntVar('value', lb = 0)
Implement scaling value for Vake skulls Vake skulls now have diminishing returns beyond the first skull, which are calculated using a partial sum formula similar to joint addition. Value calculation has been reorganized to accomodate the change.
2021-09-01 17:03:53 +00:00
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
base_value = model.NewIntVar('base value', lb = 0)
Decouple Zoological Mania's bonus from value Zoological Mania's bonus is now saved upon skeleton declaration, and used when calculating results rather than being added to value directly. Not all buyers benefit from the bonus, so this change better reflects the actual game. A crash caused by failing to specify Zoological Mania has been fixed.
2021-09-10 19:58:56 +00:00
model.Add(base_value == cp_model.LinearExpr.ScalProd(actions.values(), [action.value.value for action in actions.keys()]))
Implement scaling value for Vake skulls Vake skulls now have diminishing returns beyond the first skull, which are calculated using a partial sum formula similar to joint addition. Value calculation has been reorganized to accomodate the change.
2021-09-01 17:03:53 +00:00
# Calculate value from Vake skulls
# This is a partial sum formula.
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
vake_skull_value = model.NewIntVar('vake skull value')
Implement scaling value for Vake skulls Vake skulls now have diminishing returns beyond the first skull, which are calculated using a partial sum formula similar to joint addition. Value calculation has been reorganized to accomodate the change.
2021-09-01 17:03:53 +00:00
vake_skulls = actions[Skull.VAKE_SKULL]
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
vake_skulls_squared = model.NewIntVar('vake skulls squared', lb = 0)
model.AddMultiplicationEquality(vake_skulls_squared, (vake_skulls, vake_skulls))
Implement scaling value for Vake skulls Vake skulls now have diminishing returns beyond the first skull, which are calculated using a partial sum formula similar to joint addition. Value calculation has been reorganized to accomodate the change.
2021-09-01 17:03:53 +00:00
model.Add(vake_skull_value == -250 * vake_skulls_squared + 6750 * vake_skulls)
del vake_skulls, vake_skulls_squared
Decouple Zoological Mania's bonus from value Zoological Mania's bonus is now saved upon skeleton declaration, and used when calculating results rather than being added to value directly. Not all buyers benefit from the bonus, so this change better reflects the actual game. A crash caused by failing to specify Zoological Mania has been fixed.
2021-09-10 19:58:56 +00:00
model.Add(value == base_value + vake_skull_value)
Implement scaling value for Vake skulls Vake skulls now have diminishing returns beyond the first skull, which are calculated using a partial sum formula similar to joint addition. Value calculation has been reorganized to accomodate the change.
2021-09-01 17:03:53 +00:00
Decouple Zoological Mania's bonus from value Zoological Mania's bonus is now saved upon skeleton declaration, and used when calculating results rather than being added to value directly. Not all buyers benefit from the bonus, so this change better reflects the actual game. A crash caused by failing to specify Zoological Mania has been fixed.
2021-09-10 19:58:56 +00:00
del base_value, vake_skull_value
Update formula for Zoological Mania bonus Certain declarations now have their value boosted by 15% during Zoological Mania, rather than just 10%. The list of declarations is currently hardcoded, and may need to be updated in the future.
2021-06-24 13:45:59 +00:00
Implement scaling value for Vake skulls Vake skulls now have diminishing returns beyond the first skull, which are calculated using a partial sum formula similar to joint addition. Value calculation has been reorganized to accomodate the change.
2021-09-01 17:03:53 +00:00
# Zoological Mania
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
zoological_mania_bonus = model.NewIntVar('zoological mania bonus', lb = 0)
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.
2021-07-11 20:45:04 +00:00
if zoological_mania:
Decouple Zoological Mania's bonus from value Zoological Mania's bonus is now saved upon skeleton declaration, and used when calculating results rather than being added to value directly. Not all buyers benefit from the bonus, so this change better reflects the actual game. A crash caused by failing to specify Zoological Mania has been fixed.
2021-09-10 19:58:56 +00:00
multiplier = 15 if zoological_mania in [Declaration.FISH, Declaration.INSECT, Declaration.SPIDER] else 10
Initial commit
2021-06-08 22:28:15 +00:00
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
potential_zoological_mania_bonus = model.NewIntVar('potential zoological mania bonus', lb = 0)
multiplied_value = model.NewIntVar('multiplied value', lb = 0)
Decouple Zoological Mania's bonus from value Zoological Mania's bonus is now saved upon skeleton declaration, and used when calculating results rather than being added to value directly. Not all buyers benefit from the bonus, so this change better reflects the actual game. A crash caused by failing to specify Zoological Mania has been fixed.
2021-09-10 19:58:56 +00:00
model.Add(multiplied_value == multiplier*value)
model.AddDivisionEquality(potential_zoological_mania_bonus, multiplied_value, 100)
model.Add(zoological_mania_bonus == potential_zoological_mania_bonus).OnlyEnforceIf(actions[zoological_mania])
model.Add(zoological_mania_bonus == 0).OnlyEnforceIf(actions[zoological_mania].Not())
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.
2021-07-11 20:45:04 +00:00
Decouple Zoological Mania's bonus from value Zoological Mania's bonus is now saved upon skeleton declaration, and used when calculating results rather than being added to value directly. Not all buyers benefit from the bonus, so this change better reflects the actual game. A crash caused by failing to specify Zoological Mania has been fixed.
2021-09-10 19:58:56 +00:00
del multiplier, potential_zoological_mania_bonus, multiplied_value
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.
2021-07-11 20:45:04 +00:00
else:
Decouple Zoological Mania's bonus from value Zoological Mania's bonus is now saved upon skeleton declaration, and used when calculating results rather than being added to value directly. Not all buyers benefit from the bonus, so this change better reflects the actual game. A crash caused by failing to specify Zoological Mania has been fixed.
2021-09-10 19:58:56 +00:00
model.Add(zoological_mania_bonus == 0)
Initial commit
2021-06-08 22:28:15 +00:00
# Torso Style calculation
Fix identifier for torso style variable The previous identifier used an underscore instead of a space to separate the words.
2021-06-18 18:49:44 +00:00
torso_style = model.NewIntVarFromDomain(cp_model.Domain.FromValues([torso.value.torso_style for torso in Torso]), 'torso style')
Remove data model Rather than having a single action list, actions are now added to the model enumeration-by-enumeration. This allows for more flexibility and clarity when introducing exceptions to the norm. Skipping tails is now modelled correctly: it can only be done once, and doing so removes all remaining tails. As far as the model is concerned, this means that not all tails need to be filled if tails have been skipped.
2021-06-13 17:37:15 +00:00
for torso, torso_variable in {key: value for (key, value) in actions.items() if isinstance(key, Torso)}.items():
model.Add(torso_style == torso.value.torso_style).OnlyEnforceIf(torso_variable)
Initial commit
2021-06-08 22:28:15 +00:00
# Skulls calculation
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
skulls = model.NewIntVar('skulls', lb = 0)
Remove data model Rather than having a single action list, actions are now added to the model enumeration-by-enumeration. This allows for more flexibility and clarity when introducing exceptions to the norm. Skipping tails is now modelled correctly: it can only be done once, and doing so removes all remaining tails. As far as the model is concerned, this means that not all tails need to be filled if tails have been skipped.
2021-06-13 17:37:15 +00:00
model.Add(skulls == cp_model.LinearExpr.ScalProd(actions.values(), [action.value.skulls for action in actions.keys()]))
Initial commit
2021-06-08 22:28:15 +00:00
# Arms calculation
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
arms = model.NewIntVar('arms', lb = 0)
Remove data model Rather than having a single action list, actions are now added to the model enumeration-by-enumeration. This allows for more flexibility and clarity when introducing exceptions to the norm. Skipping tails is now modelled correctly: it can only be done once, and doing so removes all remaining tails. As far as the model is concerned, this means that not all tails need to be filled if tails have been skipped.
2021-06-13 17:37:15 +00:00
model.Add(arms == cp_model.LinearExpr.ScalProd(actions.values(), [action.value.arms for action in actions.keys()]))
Initial commit
2021-06-08 22:28:15 +00:00
# Legs calculation
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
legs = model.NewIntVar('legs', lb = 0)
Remove data model Rather than having a single action list, actions are now added to the model enumeration-by-enumeration. This allows for more flexibility and clarity when introducing exceptions to the norm. Skipping tails is now modelled correctly: it can only be done once, and doing so removes all remaining tails. As far as the model is concerned, this means that not all tails need to be filled if tails have been skipped.
2021-06-13 17:37:15 +00:00
model.Add(legs == cp_model.LinearExpr.ScalProd(actions.values(), [action.value.legs for action in actions.keys()]))
Initial commit
2021-06-08 22:28:15 +00:00
# Tails calculation
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
tails = model.NewIntVar('tails', lb = 0)
Remove data model Rather than having a single action list, actions are now added to the model enumeration-by-enumeration. This allows for more flexibility and clarity when introducing exceptions to the norm. Skipping tails is now modelled correctly: it can only be done once, and doing so removes all remaining tails. As far as the model is concerned, this means that not all tails need to be filled if tails have been skipped.
2021-06-13 17:37:15 +00:00
model.Add(tails == cp_model.LinearExpr.ScalProd(actions.values(), [action.value.tails for action in actions.keys()]))
Initial commit
2021-06-08 22:28:15 +00:00
# Wings calculation
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
wings = model.NewIntVar('wings', lb = 0)
Remove data model Rather than having a single action list, actions are now added to the model enumeration-by-enumeration. This allows for more flexibility and clarity when introducing exceptions to the norm. Skipping tails is now modelled correctly: it can only be done once, and doing so removes all remaining tails. As far as the model is concerned, this means that not all tails need to be filled if tails have been skipped.
2021-06-13 17:37:15 +00:00
model.Add(wings == cp_model.LinearExpr.ScalProd(actions.values(), [action.value.wings for action in actions.keys()]))
Initial commit
2021-06-08 22:28:15 +00:00
# Fins calculation
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
fins = model.NewIntVar('fins', lb = 0)
Remove data model Rather than having a single action list, actions are now added to the model enumeration-by-enumeration. This allows for more flexibility and clarity when introducing exceptions to the norm. Skipping tails is now modelled correctly: it can only be done once, and doing so removes all remaining tails. As far as the model is concerned, this means that not all tails need to be filled if tails have been skipped.
2021-06-13 17:37:15 +00:00
model.Add(fins == cp_model.LinearExpr.ScalProd(actions.values(), [action.value.fins for action in actions.keys()]))
Initial commit
2021-06-08 22:28:15 +00:00
# Tentacles calculation
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
tentacles = model.NewIntVar('tentacles', lb = 0)
Remove data model Rather than having a single action list, actions are now added to the model enumeration-by-enumeration. This allows for more flexibility and clarity when introducing exceptions to the norm. Skipping tails is now modelled correctly: it can only be done once, and doing so removes all remaining tails. As far as the model is concerned, this means that not all tails need to be filled if tails have been skipped.
2021-06-13 17:37:15 +00:00
model.Add(tentacles == cp_model.LinearExpr.ScalProd(actions.values(), [action.value.tentacles for action in actions.keys()]))
Initial commit
2021-06-08 22:28:15 +00:00
# Amalgamy calculation
Clamp attributes to zero or more Amalgamy, antiquity, menace, and implausibility are now clamped to be non-negative. This simplifies a number of calculations, eliminates a few insiduous calculation errors, and reflects the actual game. This change impacts the output of the program, which previously showed negative values even though they weren't actually possible.
2021-10-15 22:12:20 +00:00
amalgamy = model.NewIntVar('amalgamy', lb = 0)
unbound_amalgamy = model.NewIntVar('unbound amalgamy')
model.Add(unbound_amalgamy == cp_model.LinearExpr.ScalProd(actions.values(), [action.value.amalgamy for action in actions.keys()]))
model.AddMaxEquality(amalgamy, (unbound_amalgamy, 0))
del unbound_amalgamy
Initial commit
2021-06-08 22:28:15 +00:00
# Antiquity calculation
Clamp attributes to zero or more Amalgamy, antiquity, menace, and implausibility are now clamped to be non-negative. This simplifies a number of calculations, eliminates a few insiduous calculation errors, and reflects the actual game. This change impacts the output of the program, which previously showed negative values even though they weren't actually possible.
2021-10-15 22:12:20 +00:00
antiquity = model.NewIntVar('antiquity', lb = 0)
unbound_antiquity = model.NewIntVar('unbound antiquity')
model.Add(unbound_antiquity == cp_model.LinearExpr.ScalProd(actions.values(), [action.value.antiquity for action in actions.keys()]))
model.AddMaxEquality(antiquity, (unbound_antiquity, 0))
del unbound_antiquity
Initial commit
2021-06-08 22:28:15 +00:00
Implement menace scaling for Vake skulls Vake skulls now have diminishing returns beyond the first skull. Menace calculation has been reorganized to accomodate the change. Vake skulls are no longer capped, as the new scaling has been fully implemented.
2021-09-01 19:04:18 +00:00
Initial commit
2021-06-08 22:28:15 +00:00
# Menace calculation
Clamp attributes to zero or more Amalgamy, antiquity, menace, and implausibility are now clamped to be non-negative. This simplifies a number of calculations, eliminates a few insiduous calculation errors, and reflects the actual game. This change impacts the output of the program, which previously showed negative values even though they weren't actually possible.
2021-10-15 22:12:20 +00:00
menace = model.NewIntVar('menace', lb = 0)
unbound_menace = model.NewIntVar('unbound menace')
Implement menace scaling for Vake skulls Vake skulls now have diminishing returns beyond the first skull. Menace calculation has been reorganized to accomodate the change. Vake skulls are no longer capped, as the new scaling has been fully implemented.
2021-09-01 19:04:18 +00:00
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
constant_base_menace = model.NewIntVar('constant base menace')
Implement menace scaling for Vake skulls Vake skulls now have diminishing returns beyond the first skull. Menace calculation has been reorganized to accomodate the change. Vake skulls are no longer capped, as the new scaling has been fully implemented.
2021-09-01 19:04:18 +00:00
model.Add(constant_base_menace == cp_model.LinearExpr.ScalProd(actions.values(), [action.value.menace for action in actions.keys()]))
# Calculate menace from Vake skulls
vake_skull_bonus_menace = model.NewIntVarFromDomain(cp_model.Domain.FromValues([0, 2, 3]), 'vake skull bonus menace')
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
vake_skulls_times_two = model.NewIntVar('vake skulls times two', lb = 0)
model.AddMultiplicationEquality(vake_skulls_times_two, (2, actions[Skull.VAKE_SKULL]))
Implement menace scaling for Vake skulls Vake skulls now have diminishing returns beyond the first skull. Menace calculation has been reorganized to accomodate the change. Vake skulls are no longer capped, as the new scaling has been fully implemented.
2021-09-01 19:04:18 +00:00
model.AddMinEquality(vake_skull_bonus_menace, [vake_skulls_times_two, 3])
del vake_skulls_times_two
Clamp attributes to zero or more Amalgamy, antiquity, menace, and implausibility are now clamped to be non-negative. This simplifies a number of calculations, eliminates a few insiduous calculation errors, and reflects the actual game. This change impacts the output of the program, which previously showed negative values even though they weren't actually possible.
2021-10-15 22:12:20 +00:00
model.Add(unbound_menace == constant_base_menace + vake_skull_bonus_menace)
model.AddMaxEquality(menace, (unbound_menace, 0))
del unbound_menace, constant_base_menace, vake_skull_bonus_menace
Initial commit
2021-06-08 22:28:15 +00:00
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.
2021-09-01 18:21:47 +00:00
Initial commit
2021-06-08 22:28:15 +00:00
# Implausibility calculation
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
implausibility = model.NewIntVar('implausibility')
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.
2021-09-01 18:21:47 +00:00
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
constant_base_implausibility = model.NewIntVar('implausibility')
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.
2021-09-01 18:21:47 +00:00
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.
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
vake_skull_implausibility = model.NewIntVar('vake skull implausibility', lb = 0)
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.
2021-09-01 18:21:47 +00:00
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
vake_skull_implausibility_numerator = model.NewIntVar('vake skull implausibility numerator', lb = 0)
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.
2021-09-01 18:21:47 +00:00
vake_skulls = actions[Skull.VAKE_SKULL]
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
vake_skull_implausibility_numerator_second_term = model.NewIntVar('vake skull implausibility numerator second term', lb = 0)
model.AddMultiplicationEquality(vake_skull_implausibility_numerator_second_term, (vake_skulls, vake_skulls))
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.
2021-09-01 18:21:47 +00:00
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
vake_skull_implausibility_numerator_third_term = model.NewIntVar('vake skull implausibility numerator third term', lb = 0, ub = 1)
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.
2021-09-01 18:21:47 +00:00
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
Initial commit
2021-06-08 22:28:15 +00:00
Centralize exhaustion calculation Exhaustion from actions is now calculated without regard to the buyer. Exhaustion from the buyer is stored in an intermediary "Added Exhaustion" variable, which is added to produce the final exhaustion value. This change substantially reduces the complexity of buyer-specific logic, which will help future improvements.
2021-06-13 18:23:23 +00:00
Initial commit
2021-06-08 22:28:15 +00:00
# Counter-church calculation
# Calculate amount of Counter-church from Holy Relics of the Thigh of Saint Fiacre
Remove data model Rather than having a single action list, actions are now added to the model enumeration-by-enumeration. This allows for more flexibility and clarity when introducing exceptions to the norm. Skipping tails is now modelled correctly: it can only be done once, and doing so removes all remaining tails. As far as the model is concerned, this means that not all tails need to be filled if tails have been skipped.
2021-06-13 17:37:15 +00:00
holy_relic = actions[Appendage.FIACRE_THIGH]
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
torso_style_divided_by_ten = model.NewIntVar('torso style divided by ten', lb = 0)
Initial commit
2021-06-08 22:28:15 +00:00
model.AddDivisionEquality(torso_style_divided_by_ten, torso_style, 10)
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
holy_relic_counter_church = model.NewIntVar('holy relic counter-church', lb = 0)
model.AddMultiplicationEquality(holy_relic_counter_church, (holy_relic, torso_style_divided_by_ten))
Initial commit
2021-06-08 22:28:15 +00:00
Clamp attributes to zero or more Amalgamy, antiquity, menace, and implausibility are now clamped to be non-negative. This simplifies a number of calculations, eliminates a few insiduous calculation errors, and reflects the actual game. This change impacts the output of the program, which previously showed negative values even though they weren't actually possible.
2021-10-15 22:12:20 +00:00
counter_church = model.NewIntVar('counter-church', lb = 0)
Remove data model Rather than having a single action list, actions are now added to the model enumeration-by-enumeration. This allows for more flexibility and clarity when introducing exceptions to the norm. Skipping tails is now modelled correctly: it can only be done once, and doing so removes all remaining tails. As far as the model is concerned, this means that not all tails need to be filled if tails have been skipped.
2021-06-13 17:37:15 +00:00
model.Add(counter_church == cp_model.LinearExpr.ScalProd(actions.values(), [action.value.counter_church for action in actions.keys()]) + holy_relic_counter_church)
Initial commit
2021-06-08 22:28:15 +00:00
del holy_relic, torso_style_divided_by_ten, holy_relic_counter_church
Centralize exhaustion calculation Exhaustion from actions is now calculated without regard to the buyer. Exhaustion from the buyer is stored in an intermediary "Added Exhaustion" variable, which is added to produce the final exhaustion value. This change substantially reduces the complexity of buyer-specific logic, which will help future improvements.
2021-06-13 18:23:23 +00:00
Initial commit
2021-06-08 22:28:15 +00:00
# Exhaustion calculation
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
exhaustion = model.NewIntVar('exhaustion', lb = 0, ub = maximum_exhaustion)
Initial commit
2021-06-08 22:28:15 +00:00
Centralize exhaustion calculation Exhaustion from actions is now calculated without regard to the buyer. Exhaustion from the buyer is stored in an intermediary "Added Exhaustion" variable, which is added to produce the final exhaustion value. This change substantially reduces the complexity of buyer-specific logic, which will help future improvements.
2021-06-13 18:23:23 +00:00
# Exhaustion added by certain buyers
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
added_exhaustion = model.NewIntVar('added exhaustion', lb = 0, ub = maximum_exhaustion)
Centralize exhaustion calculation Exhaustion from actions is now calculated without regard to the buyer. Exhaustion from the buyer is stored in an intermediary "Added Exhaustion" variable, which is added to produce the final exhaustion value. This change substantially reduces the complexity of buyer-specific logic, which will help future improvements.
2021-06-13 18:23:23 +00:00
model.Add(exhaustion == cp_model.LinearExpr.ScalProd(actions.values(), [action.value.exhaustion for action in actions.keys()]) + added_exhaustion)
Initial commit
2021-06-08 22:28:15 +00:00
# Profit intermediate variables
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
primary_revenue = model.NewIntVar('primary revenue', lb = 0)
secondary_revenue = model.NewIntVar('secondary revenue', lb = 0)
total_revenue = model.NewIntVar('total revenue', lb = 0)
Initial commit
2021-06-08 22:28:15 +00:00
model.Add(total_revenue == cp_model.LinearExpr.Sum([primary_revenue, secondary_revenue]))
# Cost
# Calculate value of actions needed to sell the skeleton.
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
difficulty_level = model.NewIntVar('difficulty level')
Initial commit
2021-06-08 22:28:15 +00:00
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
non_zero_difficulty_level = model.NewIntVar('non-zero difficulty level', lb = 1)
Initial commit
2021-06-08 22:28:15 +00:00
model.AddMaxEquality(non_zero_difficulty_level, [difficulty_level, 1])
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
sale_actions_times_action_value = model.NewIntVar('sale actions times action value', lb = 0)
Add command-line parameter for Shadowy level This argument determines how difficult selling to a buyer is, which influences how much Implausibility the solver produces.
2021-06-19 12:32:19 +00:00
model.AddDivisionEquality(sale_actions_times_action_value, model.NewConstant(round(DIFFICULTY_SCALER*shadowy_level*Cost.ACTION.value)), non_zero_difficulty_level)
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
abstract_sale_cost = model.NewIntVar('abstract sale cost', lb = 0)
Rename Value enumeration to Cost This change better reflects the meaning of this enumeration: the cost of acquiring something is usually greater than the value that can be extracted from it.
2021-06-13 17:43:52 +00:00
model.AddDivisionEquality(abstract_sale_cost, Cost.ACTION.value**2, sale_actions_times_action_value)
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
sale_cost = model.NewIntVar('sale cost', lb = 0)
Rename Value enumeration to Cost This change better reflects the meaning of this enumeration: the cost of acquiring something is usually greater than the value that can be extracted from it.
2021-06-13 17:43:52 +00:00
model.AddMaxEquality(sale_cost, [abstract_sale_cost, Cost.ACTION.value])
Initial commit
2021-06-08 22:28:15 +00:00
del non_zero_difficulty_level, sale_actions_times_action_value, abstract_sale_cost
# Calculate cost of adding joints
# This is a partial sum formula.
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
add_joints_amber_cost = model.NewIntVar('add joints amber cost', lb = 0)
Initial commit
2021-06-08 22:28:15 +00:00
Remove data model Rather than having a single action list, actions are now added to the model enumeration-by-enumeration. This allows for more flexibility and clarity when introducing exceptions to the norm. Skipping tails is now modelled correctly: it can only be done once, and doing so removes all remaining tails. As far as the model is concerned, this means that not all tails need to be filled if tails have been skipped.
2021-06-13 17:37:15 +00:00
add_joints = actions[Appendage.ADD_JOINTS]
Initial commit
2021-06-08 22:28:15 +00:00
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
base_joints = model.NewIntVar('base joints', lb = 0)
Count starting limbs in cost of adding joints Some torsos, notably the Headless Skeleton, come with pre-filled limbs that must be factored into the calculation.
2021-06-17 16:26:24 +00:00
model.Add(base_joints == cp_model.LinearExpr.ScalProd([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]))
Initial commit
2021-06-08 22:28:15 +00:00
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
add_joints_amber_cost_multiple = model.NewIntVar('add joints amber cost multiple', lb = 0)
Initial commit
2021-06-08 22:28:15 +00:00
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
add_joints_amber_cost_multiple_first_term = model.NewIntVar('add joints amber cost multiple first term', lb = 0)
model.AddMultiplicationEquality(add_joints_amber_cost_multiple_first_term, (25, base_joints, base_joints, add_joints))
Initial commit
2021-06-08 22:28:15 +00:00
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
add_joints_amber_cost_multiple_second_term = model.NewIntVar('add joints amber cost multiple second term', lb = 0)
model.AddMultiplicationEquality(add_joints_amber_cost_multiple_second_term, (100, base_joints, add_joints, add_joints))
Initial commit
2021-06-08 22:28:15 +00:00
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
add_joints_amber_cost_multiple_third_term = model.NewIntVar('add joints amber cost multiple third term', lb = 0)
model.AddMultiplicationEquality(add_joints_amber_cost_multiple_third_term, (100, base_joints, add_joints))
Initial commit
2021-06-08 22:28:15 +00:00
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
add_joints_amber_cost_multiple_fourth_term = model.NewIntVar('add joints amber cost multiple fourth term', lb = 0)
add_joints_amber_cost_multiple_fourth_term_numerator = model.NewIntVar('add joints amber cost multiple fourth term numerator', lb = 0)
add_joints_amber_cost_multiple_fourth_term_numerator_first_term = model.NewIntVar('add joints amber cost multiple fourth term numerator first term', lb = 0)
model.AddMultiplicationEquality(add_joints_amber_cost_multiple_fourth_term_numerator_first_term, (400, add_joints, add_joints, add_joints))
Move joint-adding to Appendage Adding joints is allowed at the same time adding appendages is, so it belongs in the Appendage enumeration. In addition to having its constant cost expressed in terms of Value members, adding joints now expresses the dynamic cost in terms of Warm Amber. This particular action should be kept above other actions in the enumeration, as it must be performed before the extra appendages can be added.
2021-06-11 23:04:21 +00:00
model.Add(add_joints_amber_cost_multiple_fourth_term_numerator == add_joints_amber_cost_multiple_fourth_term_numerator_first_term + 200*add_joints)
Initial commit
2021-06-08 22:28:15 +00:00
model.AddDivisionEquality(add_joints_amber_cost_multiple_fourth_term, add_joints_amber_cost_multiple_fourth_term_numerator, 3)
del add_joints_amber_cost_multiple_fourth_term_numerator, add_joints_amber_cost_multiple_fourth_term_numerator_first_term
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
add_joints_amber_cost_multiple_fifth_term = model.NewIntVar('add joints amber cost multiple fifth term', lb = 0)
model.AddMultiplicationEquality(add_joints_amber_cost_multiple_fifth_term, (200, add_joints, add_joints))
Initial commit
2021-06-08 22:28:15 +00:00
model.Add(add_joints_amber_cost_multiple == add_joints_amber_cost_multiple_first_term + add_joints_amber_cost_multiple_second_term - add_joints_amber_cost_multiple_third_term + add_joints_amber_cost_multiple_fourth_term - add_joints_amber_cost_multiple_fifth_term)
del add_joints_amber_cost_multiple_first_term, add_joints_amber_cost_multiple_second_term, add_joints_amber_cost_multiple_third_term, add_joints_amber_cost_multiple_fourth_term, add_joints_amber_cost_multiple_fifth_term
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
model.AddMultiplicationEquality(add_joints_amber_cost, (add_joints_amber_cost_multiple, Cost.WARM_AMBER.value))
Initial commit
2021-06-08 22:28:15 +00:00
del add_joints, add_joints_amber_cost_multiple
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
cost = model.NewIntVar('cost', lb = 0, ub = maximum_cost)
Remove data model Rather than having a single action list, actions are now added to the model enumeration-by-enumeration. This allows for more flexibility and clarity when introducing exceptions to the norm. Skipping tails is now modelled correctly: it can only be done once, and doing so removes all remaining tails. As far as the model is concerned, this means that not all tails need to be filled if tails have been skipped.
2021-06-13 17:37:15 +00:00
model.Add(cost == cp_model.LinearExpr.ScalProd(actions.values(), [int(action.value.cost) for action in actions.keys()]) + add_joints_amber_cost + sale_cost)
Initial commit
2021-06-08 22:28:15 +00:00
del sale_cost, add_joints_amber_cost
# Type of skeleton
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
skeleton_in_progress = model.NewIntVar('skeleton in progress', lb = 0)
Initial commit
2021-06-08 22:28:15 +00:00
# Chimera
model.Add(skeleton_in_progress == 100) \
Remove data model Rather than having a single action list, actions are now added to the model enumeration-by-enumeration. This allows for more flexibility and clarity when introducing exceptions to the norm. Skipping tails is now modelled correctly: it can only be done once, and doing so removes all remaining tails. As far as the model is concerned, this means that not all tails need to be filled if tails have been skipped.
2021-06-13 17:37:15 +00:00
.OnlyEnforceIf(actions[Declaration.CHIMERA])
Initial commit
2021-06-08 22:28:15 +00:00
# Humanoid
model.Add(skeleton_in_progress == 110) \
Remove data model Rather than having a single action list, actions are now added to the model enumeration-by-enumeration. This allows for more flexibility and clarity when introducing exceptions to the norm. Skipping tails is now modelled correctly: it can only be done once, and doing so removes all remaining tails. As far as the model is concerned, this means that not all tails need to be filled if tails have been skipped.
2021-06-13 17:37:15 +00:00
.OnlyEnforceIf(actions[Declaration.HUMANOID]) \
Clamp attributes to zero or more Amalgamy, antiquity, menace, and implausibility are now clamped to be non-negative. This simplifies a number of calculations, eliminates a few insiduous calculation errors, and reflects the actual game. This change impacts the output of the program, which previously showed negative values even though they weren't actually possible.
2021-10-15 22:12:20 +00:00
.OnlyEnforceIf(model.BoolExpression(antiquity == 0))
Initial commit
2021-06-08 22:28:15 +00:00
# Ancient Humanoid (UNCERTAIN)
model.Add(skeleton_in_progress == 111) \
Remove data model Rather than having a single action list, actions are now added to the model enumeration-by-enumeration. This allows for more flexibility and clarity when introducing exceptions to the norm. Skipping tails is now modelled correctly: it can only be done once, and doing so removes all remaining tails. As far as the model is concerned, this means that not all tails need to be filled if tails have been skipped.
2021-06-13 17:37:15 +00:00
.OnlyEnforceIf(actions[Declaration.HUMANOID]) \
Replace BoneMarketModel.NewIntermediateBoolVar The replacement method, BoolExpression, accepts a BoundedLinearExpression directly, and uses memoization to reuse Boolean variables. This technique is unsuitable for other methods, as constraints need to be applied separately, but in this case it is fine. The new method is much easier to understand, and far easier to read at call sites. Variable names are generated from the expression, rather than being explicitly specified.
2021-09-25 03:04:54 +00:00
.OnlyEnforceIf(model.BoolExpression(cp_model.BoundedLinearExpression(antiquity, (1, 5))))
Initial commit
2021-06-08 22:28:15 +00:00
# Neanderthal
model.Add(skeleton_in_progress == 112) \
Remove data model Rather than having a single action list, actions are now added to the model enumeration-by-enumeration. This allows for more flexibility and clarity when introducing exceptions to the norm. Skipping tails is now modelled correctly: it can only be done once, and doing so removes all remaining tails. As far as the model is concerned, this means that not all tails need to be filled if tails have been skipped.
2021-06-13 17:37:15 +00:00
.OnlyEnforceIf(actions[Declaration.HUMANOID]) \
Replace BoneMarketModel.NewIntermediateBoolVar The replacement method, BoolExpression, accepts a BoundedLinearExpression directly, and uses memoization to reuse Boolean variables. This technique is unsuitable for other methods, as constraints need to be applied separately, but in this case it is fine. The new method is much easier to understand, and far easier to read at call sites. Variable names are generated from the expression, rather than being explicitly specified.
2021-09-25 03:04:54 +00:00
.OnlyEnforceIf(model.BoolExpression(antiquity >= 6))
Initial commit
2021-06-08 22:28:15 +00:00
# Ape (UNCERTAIN)
model.Add(skeleton_in_progress == 120) \
Remove data model Rather than having a single action list, actions are now added to the model enumeration-by-enumeration. This allows for more flexibility and clarity when introducing exceptions to the norm. Skipping tails is now modelled correctly: it can only be done once, and doing so removes all remaining tails. As far as the model is concerned, this means that not all tails need to be filled if tails have been skipped.
2021-06-13 17:37:15 +00:00
.OnlyEnforceIf(actions[Declaration.APE]) \
Replace BoneMarketModel.NewIntermediateBoolVar The replacement method, BoolExpression, accepts a BoundedLinearExpression directly, and uses memoization to reuse Boolean variables. This technique is unsuitable for other methods, as constraints need to be applied separately, but in this case it is fine. The new method is much easier to understand, and far easier to read at call sites. Variable names are generated from the expression, rather than being explicitly specified.
2021-09-25 03:04:54 +00:00
.OnlyEnforceIf(model.BoolExpression(antiquity <= 1))
Initial commit
2021-06-08 22:28:15 +00:00
# Primordial Ape (UNCERTAIN)
model.Add(skeleton_in_progress == 121) \
Remove data model Rather than having a single action list, actions are now added to the model enumeration-by-enumeration. This allows for more flexibility and clarity when introducing exceptions to the norm. Skipping tails is now modelled correctly: it can only be done once, and doing so removes all remaining tails. As far as the model is concerned, this means that not all tails need to be filled if tails have been skipped.
2021-06-13 17:37:15 +00:00
.OnlyEnforceIf(actions[Declaration.APE]) \
Replace BoneMarketModel.NewIntermediateBoolVar The replacement method, BoolExpression, accepts a BoundedLinearExpression directly, and uses memoization to reuse Boolean variables. This technique is unsuitable for other methods, as constraints need to be applied separately, but in this case it is fine. The new method is much easier to understand, and far easier to read at call sites. Variable names are generated from the expression, rather than being explicitly specified.
2021-09-25 03:04:54 +00:00
.OnlyEnforceIf(model.BoolExpression(antiquity >= 2))
Initial commit
2021-06-08 22:28:15 +00:00
# Monkey
model.Add(skeleton_in_progress == 125) \
Remove data model Rather than having a single action list, actions are now added to the model enumeration-by-enumeration. This allows for more flexibility and clarity when introducing exceptions to the norm. Skipping tails is now modelled correctly: it can only be done once, and doing so removes all remaining tails. As far as the model is concerned, this means that not all tails need to be filled if tails have been skipped.
2021-06-13 17:37:15 +00:00
.OnlyEnforceIf(actions[Declaration.MONKEY]) \
Clamp attributes to zero or more Amalgamy, antiquity, menace, and implausibility are now clamped to be non-negative. This simplifies a number of calculations, eliminates a few insiduous calculation errors, and reflects the actual game. This change impacts the output of the program, which previously showed negative values even though they weren't actually possible.
2021-10-15 22:12:20 +00:00
.OnlyEnforceIf(model.BoolExpression(antiquity == 0))
Initial commit
2021-06-08 22:28:15 +00:00
# Catarrhine Monkey (UNCERTAIN)
model.Add(skeleton_in_progress == 126) \
Remove data model Rather than having a single action list, actions are now added to the model enumeration-by-enumeration. This allows for more flexibility and clarity when introducing exceptions to the norm. Skipping tails is now modelled correctly: it can only be done once, and doing so removes all remaining tails. As far as the model is concerned, this means that not all tails need to be filled if tails have been skipped.
2021-06-13 17:37:15 +00:00
.OnlyEnforceIf(actions[Declaration.MONKEY]) \
Replace BoneMarketModel.NewIntermediateBoolVar The replacement method, BoolExpression, accepts a BoundedLinearExpression directly, and uses memoization to reuse Boolean variables. This technique is unsuitable for other methods, as constraints need to be applied separately, but in this case it is fine. The new method is much easier to understand, and far easier to read at call sites. Variable names are generated from the expression, rather than being explicitly specified.
2021-09-25 03:04:54 +00:00
.OnlyEnforceIf(model.BoolExpression(cp_model.BoundedLinearExpression(antiquity, (1, 8))))
Initial commit
2021-06-08 22:28:15 +00:00
# Catarrhine Monkey
model.Add(skeleton_in_progress == 128) \
Remove data model Rather than having a single action list, actions are now added to the model enumeration-by-enumeration. This allows for more flexibility and clarity when introducing exceptions to the norm. Skipping tails is now modelled correctly: it can only be done once, and doing so removes all remaining tails. As far as the model is concerned, this means that not all tails need to be filled if tails have been skipped.
2021-06-13 17:37:15 +00:00
.OnlyEnforceIf(actions[Declaration.MONKEY]) \
Replace BoneMarketModel.NewIntermediateBoolVar The replacement method, BoolExpression, accepts a BoundedLinearExpression directly, and uses memoization to reuse Boolean variables. This technique is unsuitable for other methods, as constraints need to be applied separately, but in this case it is fine. The new method is much easier to understand, and far easier to read at call sites. Variable names are generated from the expression, rather than being explicitly specified.
2021-09-25 03:04:54 +00:00
.OnlyEnforceIf(model.BoolExpression(antiquity >= 9))
Initial commit
2021-06-08 22:28:15 +00:00
# Crocodile
model.Add(skeleton_in_progress == 160) \
Remove data model Rather than having a single action list, actions are now added to the model enumeration-by-enumeration. This allows for more flexibility and clarity when introducing exceptions to the norm. Skipping tails is now modelled correctly: it can only be done once, and doing so removes all remaining tails. As far as the model is concerned, this means that not all tails need to be filled if tails have been skipped.
2021-06-13 17:37:15 +00:00
.OnlyEnforceIf(actions[Declaration.REPTILE]) \
Replace BoneMarketModel.NewIntermediateBoolVar The replacement method, BoolExpression, accepts a BoundedLinearExpression directly, and uses memoization to reuse Boolean variables. This technique is unsuitable for other methods, as constraints need to be applied separately, but in this case it is fine. The new method is much easier to understand, and far easier to read at call sites. Variable names are generated from the expression, rather than being explicitly specified.
2021-09-25 03:04:54 +00:00
.OnlyEnforceIf(model.BoolExpression(antiquity <= 1))
Initial commit
2021-06-08 22:28:15 +00:00
# Dinosaur
model.Add(skeleton_in_progress == 161) \
Remove data model Rather than having a single action list, actions are now added to the model enumeration-by-enumeration. This allows for more flexibility and clarity when introducing exceptions to the norm. Skipping tails is now modelled correctly: it can only be done once, and doing so removes all remaining tails. As far as the model is concerned, this means that not all tails need to be filled if tails have been skipped.
2021-06-13 17:37:15 +00:00
.OnlyEnforceIf(actions[Declaration.REPTILE]) \
Replace BoneMarketModel.NewIntermediateBoolVar The replacement method, BoolExpression, accepts a BoundedLinearExpression directly, and uses memoization to reuse Boolean variables. This technique is unsuitable for other methods, as constraints need to be applied separately, but in this case it is fine. The new method is much easier to understand, and far easier to read at call sites. Variable names are generated from the expression, rather than being explicitly specified.
2021-09-25 03:04:54 +00:00
.OnlyEnforceIf(model.BoolExpression(cp_model.BoundedLinearExpression(antiquity, (2, 4))))
Initial commit
2021-06-08 22:28:15 +00:00
# Mesosaur (UNCERTAIN)
model.Add(skeleton_in_progress == 162) \
Remove data model Rather than having a single action list, actions are now added to the model enumeration-by-enumeration. This allows for more flexibility and clarity when introducing exceptions to the norm. Skipping tails is now modelled correctly: it can only be done once, and doing so removes all remaining tails. As far as the model is concerned, this means that not all tails need to be filled if tails have been skipped.
2021-06-13 17:37:15 +00:00
.OnlyEnforceIf(actions[Declaration.REPTILE]) \
Replace BoneMarketModel.NewIntermediateBoolVar The replacement method, BoolExpression, accepts a BoundedLinearExpression directly, and uses memoization to reuse Boolean variables. This technique is unsuitable for other methods, as constraints need to be applied separately, but in this case it is fine. The new method is much easier to understand, and far easier to read at call sites. Variable names are generated from the expression, rather than being explicitly specified.
2021-09-25 03:04:54 +00:00
.OnlyEnforceIf(model.BoolExpression(antiquity >= 5))
Initial commit
2021-06-08 22:28:15 +00:00
# Toad
model.Add(skeleton_in_progress == 170) \
Remove data model Rather than having a single action list, actions are now added to the model enumeration-by-enumeration. This allows for more flexibility and clarity when introducing exceptions to the norm. Skipping tails is now modelled correctly: it can only be done once, and doing so removes all remaining tails. As far as the model is concerned, this means that not all tails need to be filled if tails have been skipped.
2021-06-13 17:37:15 +00:00
.OnlyEnforceIf(actions[Declaration.AMPHIBIAN]) \
Replace BoneMarketModel.NewIntermediateBoolVar The replacement method, BoolExpression, accepts a BoundedLinearExpression directly, and uses memoization to reuse Boolean variables. This technique is unsuitable for other methods, as constraints need to be applied separately, but in this case it is fine. The new method is much easier to understand, and far easier to read at call sites. Variable names are generated from the expression, rather than being explicitly specified.
2021-09-25 03:04:54 +00:00
.OnlyEnforceIf(model.BoolExpression(antiquity <= 1))
Initial commit
2021-06-08 22:28:15 +00:00
# Primordial Amphibian
model.Add(skeleton_in_progress == 171) \
Remove data model Rather than having a single action list, actions are now added to the model enumeration-by-enumeration. This allows for more flexibility and clarity when introducing exceptions to the norm. Skipping tails is now modelled correctly: it can only be done once, and doing so removes all remaining tails. As far as the model is concerned, this means that not all tails need to be filled if tails have been skipped.
2021-06-13 17:37:15 +00:00
.OnlyEnforceIf(actions[Declaration.AMPHIBIAN]) \
Replace BoneMarketModel.NewIntermediateBoolVar The replacement method, BoolExpression, accepts a BoundedLinearExpression directly, and uses memoization to reuse Boolean variables. This technique is unsuitable for other methods, as constraints need to be applied separately, but in this case it is fine. The new method is much easier to understand, and far easier to read at call sites. Variable names are generated from the expression, rather than being explicitly specified.
2021-09-25 03:04:54 +00:00
.OnlyEnforceIf(model.BoolExpression(cp_model.BoundedLinearExpression(antiquity, (2, 4))))
Initial commit
2021-06-08 22:28:15 +00:00
# Temnospondyl
model.Add(skeleton_in_progress == 172) \
Remove data model Rather than having a single action list, actions are now added to the model enumeration-by-enumeration. This allows for more flexibility and clarity when introducing exceptions to the norm. Skipping tails is now modelled correctly: it can only be done once, and doing so removes all remaining tails. As far as the model is concerned, this means that not all tails need to be filled if tails have been skipped.
2021-06-13 17:37:15 +00:00
.OnlyEnforceIf(actions[Declaration.AMPHIBIAN]) \
Replace BoneMarketModel.NewIntermediateBoolVar The replacement method, BoolExpression, accepts a BoundedLinearExpression directly, and uses memoization to reuse Boolean variables. This technique is unsuitable for other methods, as constraints need to be applied separately, but in this case it is fine. The new method is much easier to understand, and far easier to read at call sites. Variable names are generated from the expression, rather than being explicitly specified.
2021-09-25 03:04:54 +00:00
.OnlyEnforceIf(model.BoolExpression(antiquity >= 5))
Initial commit
2021-06-08 22:28:15 +00:00
# Owl
model.Add(skeleton_in_progress == 180) \
Remove data model Rather than having a single action list, actions are now added to the model enumeration-by-enumeration. This allows for more flexibility and clarity when introducing exceptions to the norm. Skipping tails is now modelled correctly: it can only be done once, and doing so removes all remaining tails. As far as the model is concerned, this means that not all tails need to be filled if tails have been skipped.
2021-06-13 17:37:15 +00:00
.OnlyEnforceIf(actions[Declaration.BIRD]) \
Replace BoneMarketModel.NewIntermediateBoolVar The replacement method, BoolExpression, accepts a BoundedLinearExpression directly, and uses memoization to reuse Boolean variables. This technique is unsuitable for other methods, as constraints need to be applied separately, but in this case it is fine. The new method is much easier to understand, and far easier to read at call sites. Variable names are generated from the expression, rather than being explicitly specified.
2021-09-25 03:04:54 +00:00
.OnlyEnforceIf(model.BoolExpression(antiquity <= 1))
Initial commit
2021-06-08 22:28:15 +00:00
# Archaeopteryx
model.Add(skeleton_in_progress == 181) \
Remove data model Rather than having a single action list, actions are now added to the model enumeration-by-enumeration. This allows for more flexibility and clarity when introducing exceptions to the norm. Skipping tails is now modelled correctly: it can only be done once, and doing so removes all remaining tails. As far as the model is concerned, this means that not all tails need to be filled if tails have been skipped.
2021-06-13 17:37:15 +00:00
.OnlyEnforceIf(actions[Declaration.BIRD]) \
Replace BoneMarketModel.NewIntermediateBoolVar The replacement method, BoolExpression, accepts a BoundedLinearExpression directly, and uses memoization to reuse Boolean variables. This technique is unsuitable for other methods, as constraints need to be applied separately, but in this case it is fine. The new method is much easier to understand, and far easier to read at call sites. Variable names are generated from the expression, rather than being explicitly specified.
2021-09-25 03:04:54 +00:00
.OnlyEnforceIf(model.BoolExpression(cp_model.BoundedLinearExpression(antiquity, (2, 4))))
Initial commit
2021-06-08 22:28:15 +00:00
# Ornithomimosaur (UNCERTAIN)
model.Add(skeleton_in_progress == 182) \
Remove data model Rather than having a single action list, actions are now added to the model enumeration-by-enumeration. This allows for more flexibility and clarity when introducing exceptions to the norm. Skipping tails is now modelled correctly: it can only be done once, and doing so removes all remaining tails. As far as the model is concerned, this means that not all tails need to be filled if tails have been skipped.
2021-06-13 17:37:15 +00:00
.OnlyEnforceIf(actions[Declaration.BIRD]) \
Replace BoneMarketModel.NewIntermediateBoolVar The replacement method, BoolExpression, accepts a BoundedLinearExpression directly, and uses memoization to reuse Boolean variables. This technique is unsuitable for other methods, as constraints need to be applied separately, but in this case it is fine. The new method is much easier to understand, and far easier to read at call sites. Variable names are generated from the expression, rather than being explicitly specified.
2021-09-25 03:04:54 +00:00
.OnlyEnforceIf(model.BoolExpression(antiquity >= 5))
Initial commit
2021-06-08 22:28:15 +00:00
# Lamprey
model.Add(skeleton_in_progress == 190) \
Remove data model Rather than having a single action list, actions are now added to the model enumeration-by-enumeration. This allows for more flexibility and clarity when introducing exceptions to the norm. Skipping tails is now modelled correctly: it can only be done once, and doing so removes all remaining tails. As far as the model is concerned, this means that not all tails need to be filled if tails have been skipped.
2021-06-13 17:37:15 +00:00
.OnlyEnforceIf(actions[Declaration.FISH]) \
Clamp attributes to zero or more Amalgamy, antiquity, menace, and implausibility are now clamped to be non-negative. This simplifies a number of calculations, eliminates a few insiduous calculation errors, and reflects the actual game. This change impacts the output of the program, which previously showed negative values even though they weren't actually possible.
2021-10-15 22:12:20 +00:00
.OnlyEnforceIf(model.BoolExpression(antiquity == 0))
Initial commit
2021-06-08 22:28:15 +00:00
# Coelacanth (UNCERTAIN)
model.Add(skeleton_in_progress == 191) \
Remove data model Rather than having a single action list, actions are now added to the model enumeration-by-enumeration. This allows for more flexibility and clarity when introducing exceptions to the norm. Skipping tails is now modelled correctly: it can only be done once, and doing so removes all remaining tails. As far as the model is concerned, this means that not all tails need to be filled if tails have been skipped.
2021-06-13 17:37:15 +00:00
.OnlyEnforceIf(actions[Declaration.FISH]) \
Replace BoneMarketModel.NewIntermediateBoolVar The replacement method, BoolExpression, accepts a BoundedLinearExpression directly, and uses memoization to reuse Boolean variables. This technique is unsuitable for other methods, as constraints need to be applied separately, but in this case it is fine. The new method is much easier to understand, and far easier to read at call sites. Variable names are generated from the expression, rather than being explicitly specified.
2021-09-25 03:04:54 +00:00
.OnlyEnforceIf(model.BoolExpression(antiquity >= 1))
Initial commit
2021-06-08 22:28:15 +00:00
# Spider (UNCERTAIN)
model.Add(skeleton_in_progress == 200) \
Remove data model Rather than having a single action list, actions are now added to the model enumeration-by-enumeration. This allows for more flexibility and clarity when introducing exceptions to the norm. Skipping tails is now modelled correctly: it can only be done once, and doing so removes all remaining tails. As far as the model is concerned, this means that not all tails need to be filled if tails have been skipped.
2021-06-13 17:37:15 +00:00
.OnlyEnforceIf(actions[Declaration.SPIDER]) \
Replace BoneMarketModel.NewIntermediateBoolVar The replacement method, BoolExpression, accepts a BoundedLinearExpression directly, and uses memoization to reuse Boolean variables. This technique is unsuitable for other methods, as constraints need to be applied separately, but in this case it is fine. The new method is much easier to understand, and far easier to read at call sites. Variable names are generated from the expression, rather than being explicitly specified.
2021-09-25 03:04:54 +00:00
.OnlyEnforceIf(model.BoolExpression(antiquity <= 1))
Initial commit
2021-06-08 22:28:15 +00:00
# Primordial Orb-Weaver (UNCERTAIN)
model.Add(skeleton_in_progress == 201) \
Remove data model Rather than having a single action list, actions are now added to the model enumeration-by-enumeration. This allows for more flexibility and clarity when introducing exceptions to the norm. Skipping tails is now modelled correctly: it can only be done once, and doing so removes all remaining tails. As far as the model is concerned, this means that not all tails need to be filled if tails have been skipped.
2021-06-13 17:37:15 +00:00
.OnlyEnforceIf(actions[Declaration.SPIDER]) \
Replace BoneMarketModel.NewIntermediateBoolVar The replacement method, BoolExpression, accepts a BoundedLinearExpression directly, and uses memoization to reuse Boolean variables. This technique is unsuitable for other methods, as constraints need to be applied separately, but in this case it is fine. The new method is much easier to understand, and far easier to read at call sites. Variable names are generated from the expression, rather than being explicitly specified.
2021-09-25 03:04:54 +00:00
.OnlyEnforceIf(model.BoolExpression(cp_model.BoundedLinearExpression(antiquity, (2, 7))))
Initial commit
2021-06-08 22:28:15 +00:00
# Trigonotarbid
model.Add(skeleton_in_progress == 203) \
Remove data model Rather than having a single action list, actions are now added to the model enumeration-by-enumeration. This allows for more flexibility and clarity when introducing exceptions to the norm. Skipping tails is now modelled correctly: it can only be done once, and doing so removes all remaining tails. As far as the model is concerned, this means that not all tails need to be filled if tails have been skipped.
2021-06-13 17:37:15 +00:00
.OnlyEnforceIf(actions[Declaration.SPIDER]) \
Replace BoneMarketModel.NewIntermediateBoolVar The replacement method, BoolExpression, accepts a BoundedLinearExpression directly, and uses memoization to reuse Boolean variables. This technique is unsuitable for other methods, as constraints need to be applied separately, but in this case it is fine. The new method is much easier to understand, and far easier to read at call sites. Variable names are generated from the expression, rather than being explicitly specified.
2021-09-25 03:04:54 +00:00
.OnlyEnforceIf(model.BoolExpression(antiquity >= 8))
Initial commit
2021-06-08 22:28:15 +00:00
# Beetle (UNCERTAIN)
model.Add(skeleton_in_progress == 210) \
Remove data model Rather than having a single action list, actions are now added to the model enumeration-by-enumeration. This allows for more flexibility and clarity when introducing exceptions to the norm. Skipping tails is now modelled correctly: it can only be done once, and doing so removes all remaining tails. As far as the model is concerned, this means that not all tails need to be filled if tails have been skipped.
2021-06-13 17:37:15 +00:00
.OnlyEnforceIf(actions[Declaration.INSECT]) \
Replace BoneMarketModel.NewIntermediateBoolVar The replacement method, BoolExpression, accepts a BoundedLinearExpression directly, and uses memoization to reuse Boolean variables. This technique is unsuitable for other methods, as constraints need to be applied separately, but in this case it is fine. The new method is much easier to understand, and far easier to read at call sites. Variable names are generated from the expression, rather than being explicitly specified.
2021-09-25 03:04:54 +00:00
.OnlyEnforceIf(model.BoolExpression(antiquity <= 1))
Initial commit
2021-06-08 22:28:15 +00:00
# Primordial Beetle (UNCERTAIN)
model.Add(skeleton_in_progress == 211) \
Remove data model Rather than having a single action list, actions are now added to the model enumeration-by-enumeration. This allows for more flexibility and clarity when introducing exceptions to the norm. Skipping tails is now modelled correctly: it can only be done once, and doing so removes all remaining tails. As far as the model is concerned, this means that not all tails need to be filled if tails have been skipped.
2021-06-13 17:37:15 +00:00
.OnlyEnforceIf(actions[Declaration.INSECT]) \
Replace BoneMarketModel.NewIntermediateBoolVar The replacement method, BoolExpression, accepts a BoundedLinearExpression directly, and uses memoization to reuse Boolean variables. This technique is unsuitable for other methods, as constraints need to be applied separately, but in this case it is fine. The new method is much easier to understand, and far easier to read at call sites. Variable names are generated from the expression, rather than being explicitly specified.
2021-09-25 03:04:54 +00:00
.OnlyEnforceIf(model.BoolExpression(cp_model.BoundedLinearExpression(antiquity, (2, 6))))
Initial commit
2021-06-08 22:28:15 +00:00
# Rhyniognatha
model.Add(skeleton_in_progress == 212) \
Remove data model Rather than having a single action list, actions are now added to the model enumeration-by-enumeration. This allows for more flexibility and clarity when introducing exceptions to the norm. Skipping tails is now modelled correctly: it can only be done once, and doing so removes all remaining tails. As far as the model is concerned, this means that not all tails need to be filled if tails have been skipped.
2021-06-13 17:37:15 +00:00
.OnlyEnforceIf(actions[Declaration.INSECT]) \
Replace BoneMarketModel.NewIntermediateBoolVar The replacement method, BoolExpression, accepts a BoundedLinearExpression directly, and uses memoization to reuse Boolean variables. This technique is unsuitable for other methods, as constraints need to be applied separately, but in this case it is fine. The new method is much easier to understand, and far easier to read at call sites. Variable names are generated from the expression, rather than being explicitly specified.
2021-09-25 03:04:54 +00:00
.OnlyEnforceIf(model.BoolExpression(antiquity >= 7))
Initial commit
2021-06-08 22:28:15 +00:00
# Curator
model.Add(skeleton_in_progress == 300) \
Remove data model Rather than having a single action list, actions are now added to the model enumeration-by-enumeration. This allows for more flexibility and clarity when introducing exceptions to the norm. Skipping tails is now modelled correctly: it can only be done once, and doing so removes all remaining tails. As far as the model is concerned, this means that not all tails need to be filled if tails have been skipped.
2021-06-13 17:37:15 +00:00
.OnlyEnforceIf(actions[Declaration.CURATOR])
Initial commit
2021-06-08 22:28:15 +00:00
Refactor declaration requirements Declaration requirements now use helper methods and generator expressions to increase readability and compactness. Requirements are ordered and grouped by quantity. The comments on declaration requirements have been removed, as the new pattern is far easier to read.
2021-09-27 21:01:41 +00:00
# Declaration requirements
model.AddIf(actions[Declaration.HUMANOID],
(part == 0 for part in (tails, fins, wings)),
skulls == 1,
(part == 2 for part in (legs, arms)),
cp_model.BoundedLinearExpression(torso_style, (10, 20)),
)
model.AddIf(actions[Declaration.APE],
(part == 0 for part in (legs, tails, fins, wings)),
skulls == 1,
arms == 4,
cp_model.BoundedLinearExpression(torso_style, (10, 20)),
)
model.AddIf(actions[Declaration.MONKEY],
(part == 0 for part in (legs, fins, wings)),
(part == 1 for part in (skulls, tails)),
arms == 4,
cp_model.BoundedLinearExpression(torso_style, (10, 20)),
)
model.AddIf(actions[Declaration.BIRD],
(part == 0 for part in (arms, fins)),
tails < 2,
(part == 2 for part in (legs, wings)),
torso_style >= 20,
)
model.AddIf(actions[Declaration.CURATOR],
(part == 0 for part in (fins, tails)),
skulls == 1,
(part == 2 for part in (arms, legs, wings)),
)
model.AddIf(actions[Declaration.REPTILE],
(part == 0 for part in (fins, wings, arms)),
(part == 1 for part in (tails, skulls)),
legs < 5,
torso_style >= 20,
)
model.AddIf(actions[Declaration.AMPHIBIAN],
(part == 0 for part in (tails, fins, wings, arms)),
skulls == 1,
legs == 4,
torso_style >= 20,
)
model.AddIf(actions[Declaration.FISH],
(part == 0 for part in (arms, legs, wings)),
tails <= 1,
skulls == 1,
fins >= 2,
torso_style >= 20,
)
model.AddIf(actions[Declaration.INSECT],
(part == 0 for part in (arms, fins, tails)),
skulls == 1,
wings < 5,
legs == 6,
torso_style >= 20,
)
model.AddIf(actions[Declaration.SPIDER],
(part == 0 for part in (skulls, arms, wings, fins)),
tails <= 1,
legs == 8,
torso_style >= 20,
)
Remove data model Rather than having a single action list, actions are now added to the model enumeration-by-enumeration. This allows for more flexibility and clarity when introducing exceptions to the norm. Skipping tails is now modelled correctly: it can only be done once, and doing so removes all remaining tails. As far as the model is concerned, this means that not all tails need to be filled if tails have been skipped.
2021-06-13 17:37:15 +00:00
# Skeleton must have no unfilled skulls
model.Add(cp_model.LinearExpr.ScalProd(actions.values(), [action.value.skulls_needed for action in actions.keys()]) == 0)
# Skeleton must have no unfilled limbs
model.Add(cp_model.LinearExpr.ScalProd(actions.values(), [action.value.limbs_needed for action in actions.keys()]) == 0)
Initial commit
2021-06-08 22:28:15 +00:00
Remove data model Rather than having a single action list, actions are now added to the model enumeration-by-enumeration. This allows for more flexibility and clarity when introducing exceptions to the norm. Skipping tails is now modelled correctly: it can only be done once, and doing so removes all remaining tails. As far as the model is concerned, this means that not all tails need to be filled if tails have been skipped.
2021-06-13 17:37:15 +00:00
# Skeleton must have no unfilled tails, unless they were skipped
model.Add(cp_model.LinearExpr.ScalProd(actions.values(), [action.value.tails_needed for action in actions.keys()]) == 0).OnlyEnforceIf(actions[Appendage.SKIP_TAILS].Not())
Clean up requirements Declarations that require a specific range of torso style now use one constraint to model that, rather than two. Inconsistent whitespace has been cleaned up. Skipping tails is only possible if there are tails to skip.
2021-07-07 20:12:03 +00:00
model.Add(cp_model.LinearExpr.ScalProd(actions.values(), [action.value.tails_needed for action in actions.keys()]) > 0).OnlyEnforceIf(actions[Appendage.SKIP_TAILS])
Initial commit
2021-06-08 22:28:15 +00:00
Refactor simpler buyers Buyer requirements now use helper methods and control flow to increase readability and compactness. The main benefit of this is no longer having to declare intermediate variables directly. This is a work-in-progress, as some buyers have complex formulae that necessitate more work or additional helper methods to refactor.
2021-10-15 22:46:13 +00:00
model.AddIf(actions[Buyer.A_PALAEONTOLOGIST_WITH_HOARDING_PROPENSITIES],
skeleton_in_progress >= 100,
primary_revenue == value + zoological_mania_bonus + 5,
secondary_revenue == 500,
difficulty_level == 40*implausibility,
added_exhaustion == 0,
)
Make buyers part of model Buyers are now part of the model, rather than being fixed. This means that the model can choose from among all buyers and determine the most profitable option. Accomplishing this meant replacing the if-else control flow with a large quantity of half-reified constraints.
2021-06-13 22:37:39 +00:00
Refactor simpler buyers Buyer requirements now use helper methods and control flow to increase readability and compactness. The main benefit of this is no longer having to declare intermediate variables directly. This is a work-in-progress, as some buyers have complex formulae that necessitate more work or additional helper methods to refactor.
2021-10-15 22:46:13 +00:00
model.AddIf(actions[Buyer.A_NAIVE_COLLECTOR],
skeleton_in_progress >= 100,
partialmethod(BoneMarketModel.AddDivisionMultiplicationEquality, primary_revenue, value + zoological_mania_bonus, 250),
secondary_revenue == 0,
difficulty_level == 25*implausibility,
added_exhaustion == 0,
)
Make buyers part of model Buyers are now part of the model, rather than being fixed. This means that the model can choose from among all buyers and determine the most profitable option. Accomplishing this meant replacing the if-else control flow with a large quantity of half-reified constraints.
2021-06-13 22:37:39 +00:00
Refactor simpler buyers Buyer requirements now use helper methods and control flow to increase readability and compactness. The main benefit of this is no longer having to declare intermediate variables directly. This is a work-in-progress, as some buyers have complex formulae that necessitate more work or additional helper methods to refactor.
2021-10-15 22:46:13 +00:00
model.AddIf(actions[Buyer.A_FAMILIAR_BOHEMIAN_SCULPTRESS],
skeleton_in_progress >= 100,
antiquity == 0,
partialmethod(BoneMarketModel.AddDivisionMultiplicationEquality, primary_revenue - 1000, value + zoological_mania_bonus, 250),
secondary_revenue == 250*counter_church,
difficulty_level == 50*implausibility,
added_exhaustion == 0,
)
Decouple Zoological Mania's bonus from value Zoological Mania's bonus is now saved upon skeleton declaration, and used when calculating results rather than being added to value directly. Not all buyers benefit from the bonus, so this change better reflects the actual game. A crash caused by failing to specify Zoological Mania has been fixed.
2021-09-10 19:58:56 +00:00
Refactor simpler buyers Buyer requirements now use helper methods and control flow to increase readability and compactness. The main benefit of this is no longer having to declare intermediate variables directly. This is a work-in-progress, as some buyers have complex formulae that necessitate more work or additional helper methods to refactor.
2021-10-15 22:46:13 +00:00
model.AddIf(actions[Buyer.A_PEDAGOGICALLY_INCLINED_GRANDMOTHER],
skeleton_in_progress >= 100,
menace == 0,
partialmethod(BoneMarketModel.AddDivisionMultiplicationEquality, primary_revenue - 1000, value + zoological_mania_bonus, 50),
secondary_revenue == 0,
difficulty_level == 50*implausibility,
added_exhaustion == 0,
)
Initial commit
2021-06-08 22:28:15 +00:00
Refactor simpler buyers Buyer requirements now use helper methods and control flow to increase readability and compactness. The main benefit of this is no longer having to declare intermediate variables directly. This is a work-in-progress, as some buyers have complex formulae that necessitate more work or additional helper methods to refactor.
2021-10-15 22:46:13 +00:00
model.AddIf(actions[Buyer.A_THEOLOGIAN_OF_THE_OLD_SCHOOL],
skeleton_in_progress >= 100,
amalgamy == 0,
partialmethod(BoneMarketModel.AddDivisionMultiplicationEquality, primary_revenue - 1000, value + zoological_mania_bonus, 250),
secondary_revenue == 0,
difficulty_level == 50*implausibility,
added_exhaustion == 0,
)
Initial commit
2021-06-08 22:28:15 +00:00
Refactor simpler buyers Buyer requirements now use helper methods and control flow to increase readability and compactness. The main benefit of this is no longer having to declare intermediate variables directly. This is a work-in-progress, as some buyers have complex formulae that necessitate more work or additional helper methods to refactor.
2021-10-15 22:46:13 +00:00
model.AddIf(actions[Buyer.AN_ENTHUSIAST_OF_THE_ANCIENT_WORLD],
skeleton_in_progress >= 100,
antiquity > 0,
partialmethod(BoneMarketModel.AddDivisionMultiplicationEquality, primary_revenue, value + zoological_mania_bonus, 50),
secondary_revenue == 250*(antiquity + (1 if bone_market_fluctuations == Fluctuation.ANTIQUITY else 0)),
difficulty_level == 45*implausibility,
added_exhaustion == 0,
)
Initial commit
2021-06-08 22:28:15 +00:00
Refactor simpler buyers Buyer requirements now use helper methods and control flow to increase readability and compactness. The main benefit of this is no longer having to declare intermediate variables directly. This is a work-in-progress, as some buyers have complex formulae that necessitate more work or additional helper methods to refactor.
2021-10-15 22:46:13 +00:00
model.AddIf(actions[Buyer.MRS_PLENTY],
skeleton_in_progress >= 100,
menace > 0,
partialmethod(BoneMarketModel.AddDivisionMultiplicationEquality, primary_revenue, value + zoological_mania_bonus, 50),
secondary_revenue == 250*menace,
difficulty_level == 45*implausibility,
added_exhaustion == 0,
)
Initial commit
2021-06-08 22:28:15 +00:00
Refactor simpler buyers Buyer requirements now use helper methods and control flow to increase readability and compactness. The main benefit of this is no longer having to declare intermediate variables directly. This is a work-in-progress, as some buyers have complex formulae that necessitate more work or additional helper methods to refactor.
2021-10-15 22:46:13 +00:00
model.AddIf(actions[Buyer.A_TENTACLED_SERVANT],
skeleton_in_progress >= 100,
amalgamy > 0,
partialmethod(BoneMarketModel.AddDivisionMultiplicationEquality, primary_revenue - 250, value + zoological_mania_bonus, 50),
secondary_revenue == 250*(amalgamy + (1 if bone_market_fluctuations == Fluctuation.AMALGAMY else 0)),
difficulty_level == 45*implausibility,
added_exhaustion == 0,
)
Initial commit
2021-06-08 22:28:15 +00:00
Make buyers part of model Buyers are now part of the model, rather than being fixed. This means that the model can choose from among all buyers and determine the most profitable option. Accomplishing this meant replacing the if-else control flow with a large quantity of half-reified constraints.
2021-06-13 22:37:39 +00:00
# An Investment-Minded Ambassador
model.Add(skeleton_in_progress >= 100).OnlyEnforceIf(actions[Buyer.AN_INVESTMENT_MINDED_AMBASSADOR])
model.Add(antiquity > 0).OnlyEnforceIf(actions[Buyer.AN_INVESTMENT_MINDED_AMBASSADOR])
Initial commit
2021-06-08 22:28:15 +00:00
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
antiquity_squared_times_four_fifths = model.NewIntVar(f'{Buyer.AN_INVESTMENT_MINDED_AMBASSADOR.name}: antiquity squared times four-fifths', lb = 0)
antiquity_squared_times_four = model.NewIntVar(f'{Buyer.AN_INVESTMENT_MINDED_AMBASSADOR.name}: antiquity squared times four', lb = 0)
model.AddMultiplicationEquality(antiquity_squared_times_four, (antiquity, antiquity, 4))
Update Investment-Minded Ambassador The Ambassador now pays four-fifths of their previous secondary revenue.
2021-09-11 01:55:41 +00:00
model.AddDivisionEquality(antiquity_squared_times_four_fifths, antiquity_squared_times_four, 5)
del antiquity_squared_times_four
Initial commit
2021-06-08 22:28:15 +00:00
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
tailfeathers = model.NewIntVar(f'{Buyer.AN_INVESTMENT_MINDED_AMBASSADOR.name}: tailfeathers')
Add CLI Instead of using hardcoded parameters, this script now uses argparse to offer a command-line interface. This includes help text, short and long option specifiers, and control over everything from verbosity to the current world qualities. Occasional Buyer hasn't been implemented yet, but will eventually be a required parameter.
2021-06-14 00:40:11 +00:00
if bone_market_fluctuations == Fluctuation.ANTIQUITY:
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
boosted_antiquity = model.NewIntVar(f'{Buyer.AN_INVESTMENT_MINDED_AMBASSADOR.name}: boosted antiquity', lb = 0)
Update Investment-Minded Ambassador The Ambassador now pays four-fifths of their previous secondary revenue.
2021-09-11 01:55:41 +00:00
model.AddApproximateExponentiationEquality(boosted_antiquity, antiquity, 2.1, MAXIMUM_ATTRIBUTE)
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
boosted_antiquity_times_four = model.NewIntVar(f'{Buyer.AN_INVESTMENT_MINDED_AMBASSADOR.name}: boosted antiquity times four', lb = 0)
model.AddMultiplicationEquality(boosted_antiquity_times_four, (boosted_antiquity, 4))
boosted_antiquity_times_four_fifths = model.NewIntVar(f'{Buyer.AN_INVESTMENT_MINDED_AMBASSADOR.name}: boosted antiquity times four-fifths', lb = 0)
Update Investment-Minded Ambassador The Ambassador now pays four-fifths of their previous secondary revenue.
2021-09-11 01:55:41 +00:00
model.AddDivisionEquality(boosted_antiquity_times_four_fifths, boosted_antiquity_times_four, 5)
model.Add(tailfeathers == boosted_antiquity_times_four_fifths).OnlyEnforceIf(actions[Buyer.AN_INVESTMENT_MINDED_AMBASSADOR])
del boosted_antiquity, boosted_antiquity_times_four, boosted_antiquity_times_four_fifths
Make buyers part of model Buyers are now part of the model, rather than being fixed. This means that the model can choose from among all buyers and determine the most profitable option. Accomplishing this meant replacing the if-else control flow with a large quantity of half-reified constraints.
2021-06-13 22:37:39 +00:00
else:
Update Investment-Minded Ambassador The Ambassador now pays four-fifths of their previous secondary revenue.
2021-09-11 01:55:41 +00:00
model.Add(tailfeathers == antiquity_squared_times_four_fifths).OnlyEnforceIf(actions[Buyer.AN_INVESTMENT_MINDED_AMBASSADOR])
Initial commit
2021-06-08 22:28:15 +00:00
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
total_value = model.NewIntVar(f'{Buyer.AN_INVESTMENT_MINDED_AMBASSADOR.name}: total value', lb = 0)
Decouple Zoological Mania's bonus from value Zoological Mania's bonus is now saved upon skeleton declaration, and used when calculating results rather than being added to value directly. Not all buyers benefit from the bonus, so this change better reflects the actual game. A crash caused by failing to specify Zoological Mania has been fixed.
2021-09-10 19:58:56 +00:00
model.Add(total_value == value + zoological_mania_bonus)
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
total_value_remainder = model.NewIntVar(f'{Buyer.AN_INVESTMENT_MINDED_AMBASSADOR.name}: total value remainder', lb = 0, ub = 49)
Decouple Zoological Mania's bonus from value Zoological Mania's bonus is now saved upon skeleton declaration, and used when calculating results rather than being added to value directly. Not all buyers benefit from the bonus, so this change better reflects the actual game. A crash caused by failing to specify Zoological Mania has been fixed.
2021-09-10 19:58:56 +00:00
model.AddModuloEquality(total_value_remainder, total_value, 50)
Replace BoneMarketModel.NewIntermediateBoolVar The replacement method, BoolExpression, accepts a BoundedLinearExpression directly, and uses memoization to reuse Boolean variables. This technique is unsuitable for other methods, as constraints need to be applied separately, but in this case it is fine. The new method is much easier to understand, and far easier to read at call sites. Variable names are generated from the expression, rather than being explicitly specified.
2021-09-25 03:04:54 +00:00
extra_value = model.BoolExpression(total_value_remainder >= 0)
Initial commit
2021-06-08 22:28:15 +00:00
Decouple Zoological Mania's bonus from value Zoological Mania's bonus is now saved upon skeleton declaration, and used when calculating results rather than being added to value directly. Not all buyers benefit from the bonus, so this change better reflects the actual game. A crash caused by failing to specify Zoological Mania has been fixed.
2021-09-10 19:58:56 +00:00
model.Add(primary_revenue == total_value + 50*extra_value + 250).OnlyEnforceIf(actions[Buyer.AN_INVESTMENT_MINDED_AMBASSADOR])
Make buyers part of model Buyers are now part of the model, rather than being fixed. This means that the model can choose from among all buyers and determine the most profitable option. Accomplishing this meant replacing the if-else control flow with a large quantity of half-reified constraints.
2021-06-13 22:37:39 +00:00
model.Add(secondary_revenue == 250*tailfeathers).OnlyEnforceIf(actions[Buyer.AN_INVESTMENT_MINDED_AMBASSADOR])
Initial commit
2021-06-08 22:28:15 +00:00
Make buyers part of model Buyers are now part of the model, rather than being fixed. This means that the model can choose from among all buyers and determine the most profitable option. Accomplishing this meant replacing the if-else control flow with a large quantity of half-reified constraints.
2021-06-13 22:37:39 +00:00
model.Add(difficulty_level == 75*implausibility).OnlyEnforceIf(actions[Buyer.AN_INVESTMENT_MINDED_AMBASSADOR])
Initial commit
2021-06-08 22:28:15 +00:00
Make buyers part of model Buyers are now part of the model, rather than being fixed. This means that the model can choose from among all buyers and determine the most profitable option. Accomplishing this meant replacing the if-else control flow with a large quantity of half-reified constraints.
2021-06-13 22:37:39 +00:00
# The indirection is necessary for applying an enforcement literal
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
derived_exhaustion = model.NewIntVar(f'{Buyer.AN_INVESTMENT_MINDED_AMBASSADOR.name}: derived exhaustion', lb = 0)
Update Investment-Minded Ambassador The Ambassador now pays four-fifths of their previous secondary revenue.
2021-09-11 01:55:41 +00:00
model.AddDivisionEquality(derived_exhaustion, antiquity_squared_times_four_fifths, 20)
Make buyers part of model Buyers are now part of the model, rather than being fixed. This means that the model can choose from among all buyers and determine the most profitable option. Accomplishing this meant replacing the if-else control flow with a large quantity of half-reified constraints.
2021-06-13 22:37:39 +00:00
model.Add(added_exhaustion == derived_exhaustion).OnlyEnforceIf(actions[Buyer.AN_INVESTMENT_MINDED_AMBASSADOR])
Initial commit
2021-06-08 22:28:15 +00:00
Update quadratic buyers to reflect balance changes The Investment-Minded Ambassador yields 80% of their former secondary revenue, while the Tentacled Entrepreneur and Teller of Terrors yield 400% of theirs.
2021-09-11 20:11:01 +00:00
del antiquity_squared_times_four_fifths, tailfeathers, total_value, total_value_remainder, extra_value, derived_exhaustion
Initial commit
2021-06-08 22:28:15 +00:00
Make buyers part of model Buyers are now part of the model, rather than being fixed. This means that the model can choose from among all buyers and determine the most profitable option. Accomplishing this meant replacing the if-else control flow with a large quantity of half-reified constraints.
2021-06-13 22:37:39 +00:00
# A Teller of Terrors
model.Add(skeleton_in_progress >= 100).OnlyEnforceIf(actions[Buyer.A_TELLER_OF_TERRORS])
model.Add(menace > 0).OnlyEnforceIf(actions[Buyer.A_TELLER_OF_TERRORS])
Initial commit
2021-06-08 22:28:15 +00:00
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
menace_squared = model.NewIntVar(f'{Buyer.A_TELLER_OF_TERRORS.name}: menace squared', lb = 0)
model.AddMultiplicationEquality(menace_squared, (menace, menace))
Initial commit
2021-06-08 22:28:15 +00:00
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
feathers = model.NewIntVar(f'{Buyer.A_TELLER_OF_TERRORS.name}: feathers')
Add Menace fluctuation This fluctuation affects buyers similarly to the existing fluctuations, and uses a similar implementation as a result.
2021-07-06 18:19:29 +00:00
if bone_market_fluctuations == Fluctuation.MENACE:
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
boosted_menace = model.NewIntVar(f'{Buyer.A_TELLER_OF_TERRORS.name}: boosted menace')
Update Teller of Terrors The Teller now pays quadruple their previous secondary revenue.
2021-09-11 18:03:05 +00:00
model.AddApproximateExponentiationEquality(boosted_menace, menace, 2.1, MAXIMUM_ATTRIBUTE)
model.Add(feathers == 4*boosted_menace).OnlyEnforceIf(actions[Buyer.A_TELLER_OF_TERRORS])
del boosted_menace
Add Menace fluctuation This fluctuation affects buyers similarly to the existing fluctuations, and uses a similar implementation as a result.
2021-07-06 18:19:29 +00:00
else:
Update Teller of Terrors The Teller now pays quadruple their previous secondary revenue.
2021-09-11 18:03:05 +00:00
model.Add(feathers == 4*menace_squared).OnlyEnforceIf(actions[Buyer.A_TELLER_OF_TERRORS])
Add Menace fluctuation This fluctuation affects buyers similarly to the existing fluctuations, and uses a similar implementation as a result.
2021-07-06 18:19:29 +00:00
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
total_value = model.NewIntVar(f'{Buyer.A_TELLER_OF_TERRORS.name}: total value', lb = 0)
Decouple Zoological Mania's bonus from value Zoological Mania's bonus is now saved upon skeleton declaration, and used when calculating results rather than being added to value directly. Not all buyers benefit from the bonus, so this change better reflects the actual game. A crash caused by failing to specify Zoological Mania has been fixed.
2021-09-10 19:58:56 +00:00
model.Add(total_value == value + zoological_mania_bonus)
Initial commit
2021-06-08 22:28:15 +00:00
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
total_value_remainder = model.NewIntVar(f'{Buyer.A_TELLER_OF_TERRORS.name}: total value remainder', lb = 0, ub = 9)
Decouple Zoological Mania's bonus from value Zoological Mania's bonus is now saved upon skeleton declaration, and used when calculating results rather than being added to value directly. Not all buyers benefit from the bonus, so this change better reflects the actual game. A crash caused by failing to specify Zoological Mania has been fixed.
2021-09-10 19:58:56 +00:00
model.AddModuloEquality(total_value_remainder, total_value, 10)
model.Add(primary_revenue == total_value - total_value_remainder + 50).OnlyEnforceIf(actions[Buyer.A_TELLER_OF_TERRORS])
Add Menace fluctuation This fluctuation affects buyers similarly to the existing fluctuations, and uses a similar implementation as a result.
2021-07-06 18:19:29 +00:00
model.Add(secondary_revenue == 50*feathers).OnlyEnforceIf(actions[Buyer.A_TELLER_OF_TERRORS])
Initial commit
2021-06-08 22:28:15 +00:00
Make buyers part of model Buyers are now part of the model, rather than being fixed. This means that the model can choose from among all buyers and determine the most profitable option. Accomplishing this meant replacing the if-else control flow with a large quantity of half-reified constraints.
2021-06-13 22:37:39 +00:00
model.Add(difficulty_level == 75*implausibility).OnlyEnforceIf(actions[Buyer.A_TELLER_OF_TERRORS])
Initial commit
2021-06-08 22:28:15 +00:00
Make buyers part of model Buyers are now part of the model, rather than being fixed. This means that the model can choose from among all buyers and determine the most profitable option. Accomplishing this meant replacing the if-else control flow with a large quantity of half-reified constraints.
2021-06-13 22:37:39 +00:00
# The indirection is necessary for applying an enforcement literal
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
derived_exhaustion = model.NewIntVar(f'{Buyer.A_TELLER_OF_TERRORS.name}: derived exhaustion', lb = 0)
Update Teller of Terrors The Teller now pays quadruple their previous secondary revenue.
2021-09-11 18:03:05 +00:00
model.AddDivisionEquality(derived_exhaustion, menace_squared, 25)
Make buyers part of model Buyers are now part of the model, rather than being fixed. This means that the model can choose from among all buyers and determine the most profitable option. Accomplishing this meant replacing the if-else control flow with a large quantity of half-reified constraints.
2021-06-13 22:37:39 +00:00
model.Add(added_exhaustion == derived_exhaustion).OnlyEnforceIf(actions[Buyer.A_TELLER_OF_TERRORS])
Initial commit
2021-06-08 22:28:15 +00:00
Decouple Zoological Mania's bonus from value Zoological Mania's bonus is now saved upon skeleton declaration, and used when calculating results rather than being added to value directly. Not all buyers benefit from the bonus, so this change better reflects the actual game. A crash caused by failing to specify Zoological Mania has been fixed.
2021-09-10 19:58:56 +00:00
del menace_squared, feathers, total_value, total_value_remainder, derived_exhaustion
Initial commit
2021-06-08 22:28:15 +00:00
Make buyers part of model Buyers are now part of the model, rather than being fixed. This means that the model can choose from among all buyers and determine the most profitable option. Accomplishing this meant replacing the if-else control flow with a large quantity of half-reified constraints.
2021-06-13 22:37:39 +00:00
# A Tentacled Entrepreneur
model.Add(skeleton_in_progress >= 100).OnlyEnforceIf(actions[Buyer.A_TENTACLED_ENTREPRENEUR])
model.Add(amalgamy > 0).OnlyEnforceIf(actions[Buyer.A_TENTACLED_ENTREPRENEUR])
Initial commit
2021-06-08 22:28:15 +00:00
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
amalgamy_squared = model.NewIntVar(f'{Buyer.A_TENTACLED_ENTREPRENEUR.name}: amalgamy squared', lb = 0)
model.AddMultiplicationEquality(amalgamy_squared, (amalgamy, amalgamy))
Initial commit
2021-06-08 22:28:15 +00:00
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
final_breaths = model.NewIntVar(f'{Buyer.A_TENTACLED_ENTREPRENEUR.name}: final breaths')
Add CLI Instead of using hardcoded parameters, this script now uses argparse to offer a command-line interface. This includes help text, short and long option specifiers, and control over everything from verbosity to the current world qualities. Occasional Buyer hasn't been implemented yet, but will eventually be a required parameter.
2021-06-14 00:40:11 +00:00
if bone_market_fluctuations == Fluctuation.AMALGAMY:
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
boosted_amalgamy = model.NewIntVar(f'{Buyer.A_TENTACLED_ENTREPRENEUR.name}: boosted amalgamy')
Update Tentacled Entrepreneur The Entrepreneur now pays quadruple their previous secondary revenue.
2021-09-11 17:08:29 +00:00
model.AddApproximateExponentiationEquality(boosted_amalgamy, amalgamy, 2.1, MAXIMUM_ATTRIBUTE)
model.Add(final_breaths == 4*boosted_amalgamy).OnlyEnforceIf(actions[Buyer.A_TENTACLED_ENTREPRENEUR])
del boosted_amalgamy
Make buyers part of model Buyers are now part of the model, rather than being fixed. This means that the model can choose from among all buyers and determine the most profitable option. Accomplishing this meant replacing the if-else control flow with a large quantity of half-reified constraints.
2021-06-13 22:37:39 +00:00
else:
Update Tentacled Entrepreneur The Entrepreneur now pays quadruple their previous secondary revenue.
2021-09-11 17:08:29 +00:00
model.Add(final_breaths == 4*amalgamy_squared).OnlyEnforceIf(actions[Buyer.A_TENTACLED_ENTREPRENEUR])
Initial commit
2021-06-08 22:28:15 +00:00
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
total_value = model.NewIntVar(f'{Buyer.A_TENTACLED_ENTREPRENEUR.name}: total value', lb = 0)
Decouple Zoological Mania's bonus from value Zoological Mania's bonus is now saved upon skeleton declaration, and used when calculating results rather than being added to value directly. Not all buyers benefit from the bonus, so this change better reflects the actual game. A crash caused by failing to specify Zoological Mania has been fixed.
2021-09-10 19:58:56 +00:00
model.Add(total_value == value + zoological_mania_bonus)
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
total_value_remainder = model.NewIntVar(f'{Buyer.A_TENTACLED_ENTREPRENEUR.name}: total value remainder', lb = 0, ub = 49)
Decouple Zoological Mania's bonus from value Zoological Mania's bonus is now saved upon skeleton declaration, and used when calculating results rather than being added to value directly. Not all buyers benefit from the bonus, so this change better reflects the actual game. A crash caused by failing to specify Zoological Mania has been fixed.
2021-09-10 19:58:56 +00:00
model.AddModuloEquality(total_value_remainder, total_value, 50)
Centralize value remainder declaration Many buyers use a value remainder to round revenue down. Declaring it outside of buyer-specific logic simplifies almost all of them.
2021-06-13 18:46:45 +00:00
Decouple Zoological Mania's bonus from value Zoological Mania's bonus is now saved upon skeleton declaration, and used when calculating results rather than being added to value directly. Not all buyers benefit from the bonus, so this change better reflects the actual game. A crash caused by failing to specify Zoological Mania has been fixed.
2021-09-10 19:58:56 +00:00
model.Add(primary_revenue == total_value - total_value_remainder + 250).OnlyEnforceIf(actions[Buyer.A_TENTACLED_ENTREPRENEUR])
Make buyers part of model Buyers are now part of the model, rather than being fixed. This means that the model can choose from among all buyers and determine the most profitable option. Accomplishing this meant replacing the if-else control flow with a large quantity of half-reified constraints.
2021-06-13 22:37:39 +00:00
model.Add(secondary_revenue == 50*final_breaths).OnlyEnforceIf(actions[Buyer.A_TENTACLED_ENTREPRENEUR])
Initial commit
2021-06-08 22:28:15 +00:00
Make buyers part of model Buyers are now part of the model, rather than being fixed. This means that the model can choose from among all buyers and determine the most profitable option. Accomplishing this meant replacing the if-else control flow with a large quantity of half-reified constraints.
2021-06-13 22:37:39 +00:00
model.Add(difficulty_level == 75*implausibility).OnlyEnforceIf(actions[Buyer.A_TENTACLED_ENTREPRENEUR])
Initial commit
2021-06-08 22:28:15 +00:00
Make buyers part of model Buyers are now part of the model, rather than being fixed. This means that the model can choose from among all buyers and determine the most profitable option. Accomplishing this meant replacing the if-else control flow with a large quantity of half-reified constraints.
2021-06-13 22:37:39 +00:00
# The indirection is necessary for applying an enforcement literal
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
derived_exhaustion = model.NewIntVar(f'{Buyer.A_TENTACLED_ENTREPRENEUR.name}: derived exhaustion', lb = 0)
Update Tentacled Entrepreneur The Entrepreneur now pays quadruple their previous secondary revenue.
2021-09-11 17:08:29 +00:00
model.AddDivisionEquality(derived_exhaustion, amalgamy_squared, 25)
Make buyers part of model Buyers are now part of the model, rather than being fixed. This means that the model can choose from among all buyers and determine the most profitable option. Accomplishing this meant replacing the if-else control flow with a large quantity of half-reified constraints.
2021-06-13 22:37:39 +00:00
model.Add(added_exhaustion == derived_exhaustion).OnlyEnforceIf(actions[Buyer.A_TENTACLED_ENTREPRENEUR])
Initial commit
2021-06-08 22:28:15 +00:00
Decouple Zoological Mania's bonus from value Zoological Mania's bonus is now saved upon skeleton declaration, and used when calculating results rather than being added to value directly. Not all buyers benefit from the bonus, so this change better reflects the actual game. A crash caused by failing to specify Zoological Mania has been fixed.
2021-09-10 19:58:56 +00:00
del amalgamy_squared, final_breaths, total_value, total_value_remainder, derived_exhaustion
Make buyers part of model Buyers are now part of the model, rather than being fixed. This means that the model can choose from among all buyers and determine the most profitable option. Accomplishing this meant replacing the if-else control flow with a large quantity of half-reified constraints.
2021-06-13 22:37:39 +00:00
# An Author of Gothic Tales
model.Add(skeleton_in_progress >= 100).OnlyEnforceIf(actions[Buyer.AN_AUTHOR_OF_GOTHIC_TALES])
model.Add(antiquity > 0).OnlyEnforceIf(actions[Buyer.AN_AUTHOR_OF_GOTHIC_TALES])
model.Add(menace > 0).OnlyEnforceIf(actions[Buyer.AN_AUTHOR_OF_GOTHIC_TALES])
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
antiquity_times_menace = model.NewIntVar(f'{Buyer.AN_AUTHOR_OF_GOTHIC_TALES.name}: antiquity times menace')
model.AddMultiplicationEquality(antiquity_times_menace, (antiquity, menace))
Make buyers part of model Buyers are now part of the model, rather than being fixed. This means that the model can choose from among all buyers and determine the most profitable option. Accomplishing this meant replacing the if-else control flow with a large quantity of half-reified constraints.
2021-06-13 22:37:39 +00:00
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
antiquity_fluctuation_bonus = model.NewIntVar(f'{Buyer.AN_AUTHOR_OF_GOTHIC_TALES.name}: antiquity fluctuation bonus')
Update fluctuation bonuses for hybrid buyers The multiplier is now 1/2 instead of 4/5. This means that is no longer necessary to multiply before dividing.
2021-07-07 19:17:55 +00:00
model.AddDivisionEquality(antiquity_fluctuation_bonus, antiquity, 2)
Update fluctuation effects on hybrid buyers The formula for hybrid buyers has been changed to make the fluctuation bonus scale with the corresponding attribute.
2021-06-22 14:04:41 +00:00
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
menace_fluctuation_bonus = model.NewIntVar(f'{Buyer.AN_AUTHOR_OF_GOTHIC_TALES.name}: menace fluctuation bonus')
Update fluctuation bonuses for hybrid buyers The multiplier is now 1/2 instead of 4/5. This means that is no longer necessary to multiply before dividing.
2021-07-07 19:17:55 +00:00
model.AddDivisionEquality(menace_fluctuation_bonus, menace, 2)
Add Menace fluctuation This fluctuation affects buyers similarly to the existing fluctuations, and uses a similar implementation as a result.
2021-07-06 18:19:29 +00:00
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
total_value = model.NewIntVar(f'{Buyer.AN_AUTHOR_OF_GOTHIC_TALES.name}: total value', lb = 0)
Decouple Zoological Mania's bonus from value Zoological Mania's bonus is now saved upon skeleton declaration, and used when calculating results rather than being added to value directly. Not all buyers benefit from the bonus, so this change better reflects the actual game. A crash caused by failing to specify Zoological Mania has been fixed.
2021-09-10 19:58:56 +00:00
model.Add(total_value == value + zoological_mania_bonus)
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
total_value_remainder = model.NewIntVar(f'{Buyer.AN_AUTHOR_OF_GOTHIC_TALES.name}: total value remainder', lb = 0, ub = 49)
Decouple Zoological Mania's bonus from value Zoological Mania's bonus is now saved upon skeleton declaration, and used when calculating results rather than being added to value directly. Not all buyers benefit from the bonus, so this change better reflects the actual game. A crash caused by failing to specify Zoological Mania has been fixed.
2021-09-10 19:58:56 +00:00
model.AddModuloEquality(total_value_remainder, total_value, 50)
Make buyers part of model Buyers are now part of the model, rather than being fixed. This means that the model can choose from among all buyers and determine the most profitable option. Accomplishing this meant replacing the if-else control flow with a large quantity of half-reified constraints.
2021-06-13 22:37:39 +00:00
Decouple Zoological Mania's bonus from value Zoological Mania's bonus is now saved upon skeleton declaration, and used when calculating results rather than being added to value directly. Not all buyers benefit from the bonus, so this change better reflects the actual game. A crash caused by failing to specify Zoological Mania has been fixed.
2021-09-10 19:58:56 +00:00
model.Add(primary_revenue == total_value - total_value_remainder + 250).OnlyEnforceIf(actions[Buyer.AN_AUTHOR_OF_GOTHIC_TALES])
Add Menace fluctuation This fluctuation affects buyers similarly to the existing fluctuations, and uses a similar implementation as a result.
2021-07-06 18:19:29 +00:00
model.Add(secondary_revenue == 250*antiquity_times_menace + 250*(antiquity_fluctuation_bonus if bone_market_fluctuations == Fluctuation.ANTIQUITY else menace_fluctuation_bonus if bone_market_fluctuations == Fluctuation.MENACE else 0)).OnlyEnforceIf(actions[Buyer.AN_AUTHOR_OF_GOTHIC_TALES])
Make buyers part of model Buyers are now part of the model, rather than being fixed. This means that the model can choose from among all buyers and determine the most profitable option. Accomplishing this meant replacing the if-else control flow with a large quantity of half-reified constraints.
2021-06-13 22:37:39 +00:00
model.Add(difficulty_level == 75*implausibility).OnlyEnforceIf(actions[Buyer.AN_AUTHOR_OF_GOTHIC_TALES])
# The indirection is necessary for applying an enforcement literal
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
derived_exhaustion = model.NewIntVar(f'{Buyer.AN_AUTHOR_OF_GOTHIC_TALES.name}: derived exhaustion')
Make buyers part of model Buyers are now part of the model, rather than being fixed. This means that the model can choose from among all buyers and determine the most profitable option. Accomplishing this meant replacing the if-else control flow with a large quantity of half-reified constraints.
2021-06-13 22:37:39 +00:00
model.AddDivisionEquality(derived_exhaustion, antiquity_times_menace, 20)
model.Add(added_exhaustion == derived_exhaustion).OnlyEnforceIf(actions[Buyer.AN_AUTHOR_OF_GOTHIC_TALES])
Decouple Zoological Mania's bonus from value Zoological Mania's bonus is now saved upon skeleton declaration, and used when calculating results rather than being added to value directly. Not all buyers benefit from the bonus, so this change better reflects the actual game. A crash caused by failing to specify Zoological Mania has been fixed.
2021-09-10 19:58:56 +00:00
del antiquity_times_menace, antiquity_fluctuation_bonus, menace_fluctuation_bonus, total_value, total_value_remainder, derived_exhaustion
Make buyers part of model Buyers are now part of the model, rather than being fixed. This means that the model can choose from among all buyers and determine the most profitable option. Accomplishing this meant replacing the if-else control flow with a large quantity of half-reified constraints.
2021-06-13 22:37:39 +00:00
# A Zailor with Particular Interests
model.Add(skeleton_in_progress >= 100).OnlyEnforceIf(actions[Buyer.A_ZAILOR_WITH_PARTICULAR_INTERESTS])
model.Add(antiquity > 0).OnlyEnforceIf(actions[Buyer.A_ZAILOR_WITH_PARTICULAR_INTERESTS])
model.Add(amalgamy > 0).OnlyEnforceIf(actions[Buyer.A_ZAILOR_WITH_PARTICULAR_INTERESTS])
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
amalgamy_times_antiquity = model.NewIntVar(f'{Buyer.A_ZAILOR_WITH_PARTICULAR_INTERESTS.name}: amalgamy times antiquity')
model.AddMultiplicationEquality(amalgamy_times_antiquity, (amalgamy, antiquity))
Make buyers part of model Buyers are now part of the model, rather than being fixed. This means that the model can choose from among all buyers and determine the most profitable option. Accomplishing this meant replacing the if-else control flow with a large quantity of half-reified constraints.
2021-06-13 22:37:39 +00:00
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
amalgamy_fluctuation_bonus = model.NewIntVar(f'{Buyer.A_ZAILOR_WITH_PARTICULAR_INTERESTS.name}: amalgamy fluctuation bonus')
Update fluctuation bonuses for hybrid buyers The multiplier is now 1/2 instead of 4/5. This means that is no longer necessary to multiply before dividing.
2021-07-07 19:17:55 +00:00
model.AddDivisionEquality(amalgamy_fluctuation_bonus, amalgamy, 2)
Update fluctuation effects on hybrid buyers The formula for hybrid buyers has been changed to make the fluctuation bonus scale with the corresponding attribute.
2021-06-22 14:04:41 +00:00
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
antiquity_fluctuation_bonus = model.NewIntVar(f'{Buyer.A_ZAILOR_WITH_PARTICULAR_INTERESTS.name}: antiquity fluctuation bonus')
Update fluctuation bonuses for hybrid buyers The multiplier is now 1/2 instead of 4/5. This means that is no longer necessary to multiply before dividing.
2021-07-07 19:17:55 +00:00
model.AddDivisionEquality(antiquity_fluctuation_bonus, antiquity, 2)
Update fluctuation effects on hybrid buyers The formula for hybrid buyers has been changed to make the fluctuation bonus scale with the corresponding attribute.
2021-06-22 14:04:41 +00:00
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
total_value = model.NewIntVar(f'{Buyer.A_ZAILOR_WITH_PARTICULAR_INTERESTS.name}: total value', lb = 0)
Decouple Zoological Mania's bonus from value Zoological Mania's bonus is now saved upon skeleton declaration, and used when calculating results rather than being added to value directly. Not all buyers benefit from the bonus, so this change better reflects the actual game. A crash caused by failing to specify Zoological Mania has been fixed.
2021-09-10 19:58:56 +00:00
model.Add(total_value == value + zoological_mania_bonus)
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
total_value_remainder = model.NewIntVar(f'{Buyer.A_ZAILOR_WITH_PARTICULAR_INTERESTS.name}: total value remainder', lb = 0, ub = 9)
Decouple Zoological Mania's bonus from value Zoological Mania's bonus is now saved upon skeleton declaration, and used when calculating results rather than being added to value directly. Not all buyers benefit from the bonus, so this change better reflects the actual game. A crash caused by failing to specify Zoological Mania has been fixed.
2021-09-10 19:58:56 +00:00
model.AddModuloEquality(total_value_remainder, total_value, 10)
Make buyers part of model Buyers are now part of the model, rather than being fixed. This means that the model can choose from among all buyers and determine the most profitable option. Accomplishing this meant replacing the if-else control flow with a large quantity of half-reified constraints.
2021-06-13 22:37:39 +00:00
Decouple Zoological Mania's bonus from value Zoological Mania's bonus is now saved upon skeleton declaration, and used when calculating results rather than being added to value directly. Not all buyers benefit from the bonus, so this change better reflects the actual game. A crash caused by failing to specify Zoological Mania has been fixed.
2021-09-10 19:58:56 +00:00
model.Add(primary_revenue == total_value - total_value_remainder + 250).OnlyEnforceIf(actions[Buyer.A_ZAILOR_WITH_PARTICULAR_INTERESTS])
Update fluctuation effects on hybrid buyers The formula for hybrid buyers has been changed to make the fluctuation bonus scale with the corresponding attribute.
2021-06-22 14:04:41 +00:00
model.Add(secondary_revenue == 250*amalgamy_times_antiquity + 250*(amalgamy_fluctuation_bonus if bone_market_fluctuations == Fluctuation.AMALGAMY else antiquity_fluctuation_bonus if bone_market_fluctuations == Fluctuation.ANTIQUITY else 0)).OnlyEnforceIf(actions[Buyer.A_ZAILOR_WITH_PARTICULAR_INTERESTS])
Make buyers part of model Buyers are now part of the model, rather than being fixed. This means that the model can choose from among all buyers and determine the most profitable option. Accomplishing this meant replacing the if-else control flow with a large quantity of half-reified constraints.
2021-06-13 22:37:39 +00:00
model.Add(difficulty_level == 75*implausibility).OnlyEnforceIf(actions[Buyer.A_ZAILOR_WITH_PARTICULAR_INTERESTS])
# The indirection is necessary for applying an enforcement literal
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
derived_exhaustion = model.NewIntVar(f'{Buyer.A_ZAILOR_WITH_PARTICULAR_INTERESTS.name}: derived exhaustion')
Make buyers part of model Buyers are now part of the model, rather than being fixed. This means that the model can choose from among all buyers and determine the most profitable option. Accomplishing this meant replacing the if-else control flow with a large quantity of half-reified constraints.
2021-06-13 22:37:39 +00:00
model.AddDivisionEquality(derived_exhaustion, amalgamy_times_antiquity, 20)
model.Add(added_exhaustion == derived_exhaustion).OnlyEnforceIf(actions[Buyer.A_ZAILOR_WITH_PARTICULAR_INTERESTS])
Decouple Zoological Mania's bonus from value Zoological Mania's bonus is now saved upon skeleton declaration, and used when calculating results rather than being added to value directly. Not all buyers benefit from the bonus, so this change better reflects the actual game. A crash caused by failing to specify Zoological Mania has been fixed.
2021-09-10 19:58:56 +00:00
del amalgamy_times_antiquity, amalgamy_fluctuation_bonus, antiquity_fluctuation_bonus, total_value, total_value_remainder, derived_exhaustion
Make buyers part of model Buyers are now part of the model, rather than being fixed. This means that the model can choose from among all buyers and determine the most profitable option. Accomplishing this meant replacing the if-else control flow with a large quantity of half-reified constraints.
2021-06-13 22:37:39 +00:00
# A Rubbery Collector
model.Add(skeleton_in_progress >= 100).OnlyEnforceIf(actions[Buyer.A_RUBBERY_COLLECTOR])
model.Add(amalgamy > 0).OnlyEnforceIf(actions[Buyer.A_RUBBERY_COLLECTOR])
model.Add(menace > 0).OnlyEnforceIf(actions[Buyer.A_RUBBERY_COLLECTOR])
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
amalgamy_times_menace = model.NewIntVar(f'{Buyer.A_RUBBERY_COLLECTOR.name}: amalgamy times menace')
model.AddMultiplicationEquality(amalgamy_times_menace, (amalgamy, menace))
Make buyers part of model Buyers are now part of the model, rather than being fixed. This means that the model can choose from among all buyers and determine the most profitable option. Accomplishing this meant replacing the if-else control flow with a large quantity of half-reified constraints.
2021-06-13 22:37:39 +00:00
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
amalgamy_fluctuation_bonus = model.NewIntVar(f'{Buyer.A_RUBBERY_COLLECTOR.name}: amalgamy fluctuation bonus')
Update fluctuation bonuses for hybrid buyers The multiplier is now 1/2 instead of 4/5. This means that is no longer necessary to multiply before dividing.
2021-07-07 19:17:55 +00:00
model.AddDivisionEquality(amalgamy_fluctuation_bonus, amalgamy, 2)
Update fluctuation effects on hybrid buyers The formula for hybrid buyers has been changed to make the fluctuation bonus scale with the corresponding attribute.
2021-06-22 14:04:41 +00:00
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
menace_fluctuation_bonus = model.NewIntVar(f'{Buyer.A_RUBBERY_COLLECTOR.name}: menace fluctuation bonus')
Update fluctuation bonuses for hybrid buyers The multiplier is now 1/2 instead of 4/5. This means that is no longer necessary to multiply before dividing.
2021-07-07 19:17:55 +00:00
model.AddDivisionEquality(menace_fluctuation_bonus, menace, 2)
Add Menace fluctuation This fluctuation affects buyers similarly to the existing fluctuations, and uses a similar implementation as a result.
2021-07-06 18:19:29 +00:00
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
total_value = model.NewIntVar(f'{Buyer.A_RUBBERY_COLLECTOR.name}: total value', lb = 0)
Decouple Zoological Mania's bonus from value Zoological Mania's bonus is now saved upon skeleton declaration, and used when calculating results rather than being added to value directly. Not all buyers benefit from the bonus, so this change better reflects the actual game. A crash caused by failing to specify Zoological Mania has been fixed.
2021-09-10 19:58:56 +00:00
model.Add(total_value == value + zoological_mania_bonus)
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
total_value_remainder = model.NewIntVar(f'{Buyer.A_RUBBERY_COLLECTOR.name}: total value remainder', lb = 0, ub = 49)
Decouple Zoological Mania's bonus from value Zoological Mania's bonus is now saved upon skeleton declaration, and used when calculating results rather than being added to value directly. Not all buyers benefit from the bonus, so this change better reflects the actual game. A crash caused by failing to specify Zoological Mania has been fixed.
2021-09-10 19:58:56 +00:00
model.AddModuloEquality(total_value_remainder, total_value, 50)
Make buyers part of model Buyers are now part of the model, rather than being fixed. This means that the model can choose from among all buyers and determine the most profitable option. Accomplishing this meant replacing the if-else control flow with a large quantity of half-reified constraints.
2021-06-13 22:37:39 +00:00
Decouple Zoological Mania's bonus from value Zoological Mania's bonus is now saved upon skeleton declaration, and used when calculating results rather than being added to value directly. Not all buyers benefit from the bonus, so this change better reflects the actual game. A crash caused by failing to specify Zoological Mania has been fixed.
2021-09-10 19:58:56 +00:00
model.Add(primary_revenue == total_value - total_value_remainder + 250).OnlyEnforceIf(actions[Buyer.A_RUBBERY_COLLECTOR])
Add Menace fluctuation This fluctuation affects buyers similarly to the existing fluctuations, and uses a similar implementation as a result.
2021-07-06 18:19:29 +00:00
model.Add(secondary_revenue == 250*amalgamy_times_menace + 250*(amalgamy_fluctuation_bonus if bone_market_fluctuations == Fluctuation.AMALGAMY else menace_fluctuation_bonus if bone_market_fluctuations == Fluctuation.MENACE else 0)).OnlyEnforceIf(actions[Buyer.A_RUBBERY_COLLECTOR])
Make buyers part of model Buyers are now part of the model, rather than being fixed. This means that the model can choose from among all buyers and determine the most profitable option. Accomplishing this meant replacing the if-else control flow with a large quantity of half-reified constraints.
2021-06-13 22:37:39 +00:00
model.Add(difficulty_level == 75*implausibility).OnlyEnforceIf(actions[Buyer.A_RUBBERY_COLLECTOR])
# The indirection is necessary for applying an enforcement literal
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
derived_exhaustion = model.NewIntVar(f'{Buyer.A_RUBBERY_COLLECTOR.name}: derived exhaustion')
Make buyers part of model Buyers are now part of the model, rather than being fixed. This means that the model can choose from among all buyers and determine the most profitable option. Accomplishing this meant replacing the if-else control flow with a large quantity of half-reified constraints.
2021-06-13 22:37:39 +00:00
model.AddDivisionEquality(derived_exhaustion, amalgamy_times_menace, 20)
model.Add(added_exhaustion == derived_exhaustion).OnlyEnforceIf(actions[Buyer.A_RUBBERY_COLLECTOR])
Decouple Zoological Mania's bonus from value Zoological Mania's bonus is now saved upon skeleton declaration, and used when calculating results rather than being added to value directly. Not all buyers benefit from the bonus, so this change better reflects the actual game. A crash caused by failing to specify Zoological Mania has been fixed.
2021-09-10 19:58:56 +00:00
del amalgamy_times_menace, amalgamy_fluctuation_bonus, menace_fluctuation_bonus, total_value, total_value_remainder, derived_exhaustion
Make buyers part of model Buyers are now part of the model, rather than being fixed. This means that the model can choose from among all buyers and determine the most profitable option. Accomplishing this meant replacing the if-else control flow with a large quantity of half-reified constraints.
2021-06-13 22:37:39 +00:00
Refactor simpler buyers Buyer requirements now use helper methods and control flow to increase readability and compactness. The main benefit of this is no longer having to declare intermediate variables directly. This is a work-in-progress, as some buyers have complex formulae that necessitate more work or additional helper methods to refactor.
2021-10-15 22:46:13 +00:00
model.AddIf(actions[Buyer.A_CONSTABLE],
cp_model.BoundedLinearExpression(skeleton_in_progress, (110, 119)),
partialmethod(BoneMarketModel.AddDivisionMultiplicationEquality, primary_revenue - 1000, value, 50),
secondary_revenue == 0,
difficulty_level == 50*implausibility,
added_exhaustion == 0,
)
Make buyers part of model Buyers are now part of the model, rather than being fixed. This means that the model can choose from among all buyers and determine the most profitable option. Accomplishing this meant replacing the if-else control flow with a large quantity of half-reified constraints.
2021-06-13 22:37:39 +00:00
# An Enthusiast in Skulls
model.Add(skeleton_in_progress >= 100).OnlyEnforceIf(actions[Buyer.AN_ENTHUSIAST_IN_SKULLS])
model.Add(skulls >= 2).OnlyEnforceIf(actions[Buyer.AN_ENTHUSIAST_IN_SKULLS])
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
extra_skulls = model.NewIntVar(f'{Buyer.AN_ENTHUSIAST_IN_SKULLS.name}: extra skulls', lb = 0)
Make buyers part of model Buyers are now part of the model, rather than being fixed. This means that the model can choose from among all buyers and determine the most profitable option. Accomplishing this meant replacing the if-else control flow with a large quantity of half-reified constraints.
2021-06-13 22:37:39 +00:00
model.Add(extra_skulls == skulls - 1).OnlyEnforceIf(actions[Buyer.AN_ENTHUSIAST_IN_SKULLS])
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
vital_intelligence = model.NewIntVar(f'{Buyer.AN_ENTHUSIAST_IN_SKULLS.name}: vital intelligence')
Make buyers part of model Buyers are now part of the model, rather than being fixed. This means that the model can choose from among all buyers and determine the most profitable option. Accomplishing this meant replacing the if-else control flow with a large quantity of half-reified constraints.
2021-06-13 22:37:39 +00:00
model.AddApproximateExponentiationEquality(vital_intelligence, extra_skulls, 1.8, MAXIMUM_ATTRIBUTE)
Decouple Zoological Mania's bonus from value Zoological Mania's bonus is now saved upon skeleton declaration, and used when calculating results rather than being added to value directly. Not all buyers benefit from the bonus, so this change better reflects the actual game. A crash caused by failing to specify Zoological Mania has been fixed.
2021-09-10 19:58:56 +00:00
model.Add(primary_revenue == value + zoological_mania_bonus).OnlyEnforceIf(actions[Buyer.AN_ENTHUSIAST_IN_SKULLS])
Make buyers part of model Buyers are now part of the model, rather than being fixed. This means that the model can choose from among all buyers and determine the most profitable option. Accomplishing this meant replacing the if-else control flow with a large quantity of half-reified constraints.
2021-06-13 22:37:39 +00:00
model.Add(secondary_revenue == 1250*vital_intelligence).OnlyEnforceIf(actions[Buyer.AN_ENTHUSIAST_IN_SKULLS])
model.Add(difficulty_level == 60*implausibility).OnlyEnforceIf(actions[Buyer.AN_ENTHUSIAST_IN_SKULLS])
# The indirection is necessary for applying an enforcement literal
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
derived_exhaustion = model.NewIntVar(f'{Buyer.AN_ENTHUSIAST_IN_SKULLS.name}: derived exhaustion', lb = 0)
Make buyers part of model Buyers are now part of the model, rather than being fixed. This means that the model can choose from among all buyers and determine the most profitable option. Accomplishing this meant replacing the if-else control flow with a large quantity of half-reified constraints.
2021-06-13 22:37:39 +00:00
model.AddDivisionEquality(derived_exhaustion, vital_intelligence, 4)
model.Add(added_exhaustion == derived_exhaustion).OnlyEnforceIf(actions[Buyer.AN_ENTHUSIAST_IN_SKULLS])
del extra_skulls, vital_intelligence, derived_exhaustion
Refactor simpler buyers Buyer requirements now use helper methods and control flow to increase readability and compactness. The main benefit of this is no longer having to declare intermediate variables directly. This is a work-in-progress, as some buyers have complex formulae that necessitate more work or additional helper methods to refactor.
2021-10-15 22:46:13 +00:00
model.AddIf(actions[Buyer.A_DREARY_MIDNIGHTER],
cp_model.BoundedLinearExpression(skeleton_in_progress, (110, 299)),
amalgamy == 0,
counter_church == 0,
partialmethod(BoneMarketModel.AddDivisionMultiplicationEquality, primary_revenue - 300, value + zoological_mania_bonus, 3),
secondary_revenue == 250,
difficulty_level == 100*implausibility,
added_exhaustion == 0,
)
Add Celestial option of Colourful Phantasist This buyer scales with the product of implausibility and antiquity.
2021-06-15 12:10:20 +00:00
Refactor simpler buyers Buyer requirements now use helper methods and control flow to increase readability and compactness. The main benefit of this is no longer having to declare intermediate variables directly. This is a work-in-progress, as some buyers have complex formulae that necessitate more work or additional helper methods to refactor.
2021-10-15 22:46:13 +00:00
{
model.AddIf(actions[getattr(Buyer, 'A_COLOURFUL_PHANTASIST_' + style)],
skeleton_in_progress >= 100,
implausibility >= 2,
attribute >= 4,
partialmethod(BoneMarketModel.AddDivisionMultiplicationEquality, primary_revenue - 100, value + zoological_mania_bonus, 50),
partialmethod(BoneMarketModel.AddMultiplicationEquality, secondary_revenue - 250, (250, attribute, implausibility)),
difficulty_level == 0,
partialmethod(BoneMarketModel.AddDivisionEquality, added_exhaustion, secondary_revenue, 5000),
) for style, attribute in (
('BAZAARINE', amalgamy),
('NOCTURNAL', menace),
('CELESTIAL', antiquity),
)
}
Add Celestial option of Colourful Phantasist This buyer scales with the product of implausibility and antiquity.
2021-06-15 12:10:20 +00:00
Add the Ingenuous Malacologist This buyer scales with the number of tentacles on the skeleton.
2021-06-22 13:25:12 +00:00
# An Ingenuous Malacologist
model.Add(tentacles >= 4).OnlyEnforceIf(actions[Buyer.AN_INGENUOUS_MALACOLOGIST])
model.Add(skeleton_in_progress >= 100).OnlyEnforceIf(actions[Buyer.AN_INGENUOUS_MALACOLOGIST])
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
exponentiated_tentacles = model.NewIntVar(f'{Buyer.AN_INGENUOUS_MALACOLOGIST.name}: exponentiated tentacles', lb = 0)
Add the Ingenuous Malacologist This buyer scales with the number of tentacles on the skeleton.
2021-06-22 13:25:12 +00:00
model.AddApproximateExponentiationEquality(exponentiated_tentacles, tentacles, 2.2, MAXIMUM_ATTRIBUTE)
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
collated_research = model.NewIntVar(f'{Buyer.AN_INGENUOUS_MALACOLOGIST.name}: collated research')
Add the Ingenuous Malacologist This buyer scales with the number of tentacles on the skeleton.
2021-06-22 13:25:12 +00:00
model.AddDivisionEquality(collated_research, exponentiated_tentacles, 5)
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
value_remainder = model.NewIntVar(f'{Buyer.AN_INGENUOUS_MALACOLOGIST.name}: value remainder', lb = 0, ub = 249)
Add the Ingenuous Malacologist This buyer scales with the number of tentacles on the skeleton.
2021-06-22 13:25:12 +00:00
model.AddModuloEquality(value_remainder, value, 250)
model.Add(primary_revenue == value - value_remainder + 250).OnlyEnforceIf(actions[Buyer.AN_INGENUOUS_MALACOLOGIST])
model.Add(secondary_revenue == 250*collated_research).OnlyEnforceIf(actions[Buyer.AN_INGENUOUS_MALACOLOGIST])
model.Add(difficulty_level == 60*implausibility).OnlyEnforceIf(actions[Buyer.AN_INGENUOUS_MALACOLOGIST])
# The indirection is necessary for applying an enforcement literal
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
derived_exhaustion = model.NewIntVar(f'{Buyer.AN_INGENUOUS_MALACOLOGIST.name}: derived exhaustion')
Add the Ingenuous Malacologist This buyer scales with the number of tentacles on the skeleton.
2021-06-22 13:25:12 +00:00
model.AddDivisionEquality(derived_exhaustion, exponentiated_tentacles, 100)
model.Add(added_exhaustion == derived_exhaustion).OnlyEnforceIf(actions[Buyer.AN_INGENUOUS_MALACOLOGIST])
del exponentiated_tentacles, collated_research, value_remainder, derived_exhaustion
Add the Enterprising Boot Salesman This buyer scales with the number of legs on the skeleton.
2021-07-06 19:18:07 +00:00
# An Enterprising Boot Salesman
Clamp attributes to zero or more Amalgamy, antiquity, menace, and implausibility are now clamped to be non-negative. This simplifies a number of calculations, eliminates a few insiduous calculation errors, and reflects the actual game. This change impacts the output of the program, which previously showed negative values even though they weren't actually possible.
2021-10-15 22:12:20 +00:00
model.Add(menace == 0).OnlyEnforceIf(actions[Buyer.AN_ENTERPRISING_BOOT_SALESMAN])
model.Add(amalgamy == 0).OnlyEnforceIf(actions[Buyer.AN_ENTERPRISING_BOOT_SALESMAN])
Add the Enterprising Boot Salesman This buyer scales with the number of legs on the skeleton.
2021-07-06 19:18:07 +00:00
model.Add(skeleton_in_progress >= 100).OnlyEnforceIf(actions[Buyer.AN_ENTERPRISING_BOOT_SALESMAN])
model.Add(legs >= 4).OnlyEnforceIf(actions[Buyer.AN_ENTERPRISING_BOOT_SALESMAN])
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
diamonds = model.NewIntVar(f'{Buyer.AN_ENTERPRISING_BOOT_SALESMAN.name}: diamonds', lb = 0)
Add the Enterprising Boot Salesman This buyer scales with the number of legs on the skeleton.
2021-07-06 19:18:07 +00:00
model.AddApproximateExponentiationEquality(diamonds, legs, 2.2, MAXIMUM_ATTRIBUTE)
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
total_value = model.NewIntVar(f'{Buyer.AN_ENTERPRISING_BOOT_SALESMAN.name}: total value', lb = 0)
Decouple Zoological Mania's bonus from value Zoological Mania's bonus is now saved upon skeleton declaration, and used when calculating results rather than being added to value directly. Not all buyers benefit from the bonus, so this change better reflects the actual game. A crash caused by failing to specify Zoological Mania has been fixed.
2021-09-10 19:58:56 +00:00
model.Add(total_value == value + zoological_mania_bonus)
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
total_value_remainder = model.NewIntVar(f'{Buyer.AN_ENTERPRISING_BOOT_SALESMAN.name}: total value remainder', lb = 0, ub = 49)
Decouple Zoological Mania's bonus from value Zoological Mania's bonus is now saved upon skeleton declaration, and used when calculating results rather than being added to value directly. Not all buyers benefit from the bonus, so this change better reflects the actual game. A crash caused by failing to specify Zoological Mania has been fixed.
2021-09-10 19:58:56 +00:00
model.AddModuloEquality(total_value_remainder, total_value, 50)
Add the Enterprising Boot Salesman This buyer scales with the number of legs on the skeleton.
2021-07-06 19:18:07 +00:00
Decouple Zoological Mania's bonus from value Zoological Mania's bonus is now saved upon skeleton declaration, and used when calculating results rather than being added to value directly. Not all buyers benefit from the bonus, so this change better reflects the actual game. A crash caused by failing to specify Zoological Mania has been fixed.
2021-09-10 19:58:56 +00:00
model.Add(primary_revenue == total_value - total_value_remainder).OnlyEnforceIf(actions[Buyer.AN_ENTERPRISING_BOOT_SALESMAN])
Add the Enterprising Boot Salesman This buyer scales with the number of legs on the skeleton.
2021-07-06 19:18:07 +00:00
model.Add(secondary_revenue == 50*diamonds).OnlyEnforceIf(actions[Buyer.AN_ENTERPRISING_BOOT_SALESMAN])
model.Add(difficulty_level == 0).OnlyEnforceIf(actions[Buyer.AN_ENTERPRISING_BOOT_SALESMAN])
# The indirection is necessary for applying an enforcement literal
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
derived_exhaustion = model.NewIntVar(f'{Buyer.AN_ENTERPRISING_BOOT_SALESMAN.name}: derived exhaustion')
Add the Enterprising Boot Salesman This buyer scales with the number of legs on the skeleton.
2021-07-06 19:18:07 +00:00
model.AddDivisionEquality(derived_exhaustion, diamonds, 100)
model.Add(added_exhaustion == derived_exhaustion).OnlyEnforceIf(actions[Buyer.AN_ENTERPRISING_BOOT_SALESMAN])
Decouple Zoological Mania's bonus from value Zoological Mania's bonus is now saved upon skeleton declaration, and used when calculating results rather than being added to value directly. Not all buyers benefit from the bonus, so this change better reflects the actual game. A crash caused by failing to specify Zoological Mania has been fixed.
2021-09-10 19:58:56 +00:00
del diamonds, total_value, total_value_remainder, derived_exhaustion
Add the Enterprising Boot Salesman This buyer scales with the number of legs on the skeleton.
2021-07-06 19:18:07 +00:00
Refactor simpler buyers Buyer requirements now use helper methods and control flow to increase readability and compactness. The main benefit of this is no longer having to declare intermediate variables directly. This is a work-in-progress, as some buyers have complex formulae that necessitate more work or additional helper methods to refactor.
2021-10-15 22:46:13 +00:00
model.AddIf(actions[Buyer.THE_DUMBWAITER_OF_BALMORAL],
cp_model.BoundedLinearExpression(skeleton_in_progress, (180, 189)),
value >= 250,
partialmethod(BoneMarketModel.AddDivisionMultiplicationEquality, primary_revenue, value, 250),
secondary_revenue == 0,
difficulty_level == 200,
added_exhaustion == 0,
)
Add the Trifling Diplomat This buyer actually changes based on a world quality. As such, it has been implemented in a similar fashion to Occasional Buyer. The scaling for this buyer's difficulty level has not been established at the time of this writing, so it is being treated as 0.
2021-06-25 23:37:41 +00:00
Refactor simpler buyers Buyer requirements now use helper methods and control flow to increase readability and compactness. The main benefit of this is no longer having to declare intermediate variables directly. This is a work-in-progress, as some buyers have complex formulae that necessitate more work or additional helper methods to refactor.
2021-10-15 22:46:13 +00:00
model.AddIf(actions[Buyer.THE_CARPENTERS_GRANDDAUGHTER],
skeleton_in_progress >= 100,
value + zoological_mania_bonus >= 30000,
primary_revenue == 31250,
secondary_revenue == 0,
difficulty_level == 100*implausibility,
added_exhaustion == 0,
)
Add the Trifling Diplomat This buyer actually changes based on a world quality. As such, it has been implemented in a similar fashion to Occasional Buyer. The scaling for this buyer's difficulty level has not been established at the time of this writing, so it is being treated as 0.
2021-06-25 23:37:41 +00:00
Update Trifling Diplomat to use new formulae The Trifling Diplomat fascinations that previously exhibited quasi-cubic scaling have a new formula using the mean of amalgamy, antiquity, and menace. To eliminate unnecessary reptition, all fascinations have been completely refactored and combined using the new helper methods and design patterns. A comment has been added to mark The Trifling Diplomat's code, since it is noticeably less readable than that of other refactored buyers.
2021-10-16 15:28:07 +00:00
# The Trifling Diplomat
Refactor simpler buyers Buyer requirements now use helper methods and control flow to increase readability and compactness. The main benefit of this is no longer having to declare intermediate variables directly. This is a work-in-progress, as some buyers have complex formulae that necessitate more work or additional helper methods to refactor.
2021-10-15 22:46:13 +00:00
{
Update Trifling Diplomat to use new formulae The Trifling Diplomat fascinations that previously exhibited quasi-cubic scaling have a new formula using the mean of amalgamy, antiquity, and menace. To eliminate unnecessary reptition, all fascinations have been completely refactored and combined using the new helper methods and design patterns. A comment has been added to mark The Trifling Diplomat's code, since it is noticeably less readable than that of other refactored buyers.
2021-10-16 15:28:07 +00:00
model.AddIf(actions[getattr(DiplomatFascination, str(attribute).upper()).value],
Refactor simpler buyers Buyer requirements now use helper methods and control flow to increase readability and compactness. The main benefit of this is no longer having to declare intermediate variables directly. This is a work-in-progress, as some buyers have complex formulae that necessitate more work or additional helper methods to refactor.
2021-10-15 22:46:13 +00:00
skeleton_in_progress >= 100,
attribute >= 5,
partialmethod(BoneMarketModel.AddDivisionMultiplicationEquality, primary_revenue - 50, value, 50),
partialmethod(BoneMarketModel.AddMultiplicationEquality, secondary_revenue, (50, attribute, attribute)),
difficulty_level == 0,
partialmethod(BoneMarketModel.AddDivisionEquality, added_exhaustion, secondary_revenue, 5000),
) for attribute in (
amalgamy,
antiquity,
Add menace fascination for Diplomat This fascination scales quadratically with menace.
2021-10-16 02:39:41 +00:00
menace,
Refactor simpler buyers Buyer requirements now use helper methods and control flow to increase readability and compactness. The main benefit of this is no longer having to declare intermediate variables directly. This is a work-in-progress, as some buyers have complex formulae that necessitate more work or additional helper methods to refactor.
2021-10-15 22:46:13 +00:00
)
}
Update Trifling Diplomat to use new formulae The Trifling Diplomat fascinations that previously exhibited quasi-cubic scaling have a new formula using the mean of amalgamy, antiquity, and menace. To eliminate unnecessary reptition, all fascinations have been completely refactored and combined using the new helper methods and design patterns. A comment has been added to mark The Trifling Diplomat's code, since it is noticeably less readable than that of other refactored buyers.
2021-10-16 15:28:07 +00:00
for fascination, criteria in (
('BIRD', (cp_model.BoundedLinearExpression(skeleton_in_progress, (180, 189)),)),
('FISH', (cp_model.BoundedLinearExpression(skeleton_in_progress, (190, 199)),)),
('INSECT', (cp_model.BoundedLinearExpression(skeleton_in_progress, (210, 219)),)),
('REPTILE', (cp_model.BoundedLinearExpression(skeleton_in_progress, (160, 169)),)),
('SKULLS', (skeleton_in_progress >= 100, skulls >= 5)),
):
compromising_documents = model.NewIntVar(f'{getattr(DiplomatFascination, fascination).name}: compromising documents')
compromising_documents_constraints = model.AddDivisionApproximateExponentiationEquality(compromising_documents, cp_model.LinearExpr.Sum((amalgamy, antiquity, menace)), 3, 2.2, MAXIMUM_ATTRIBUTE)
model.AddIf(actions[getattr(DiplomatFascination, fascination).value],
*criteria,
partialmethod(BoneMarketModel.AddDivisionMultiplicationEquality, primary_revenue - 50, value, 50),
secondary_revenue == 50*compromising_documents,
compromising_documents_constraints, # Applies enforcement literal to intermediate calculations
difficulty_level == 0,
partialmethod(BoneMarketModel.AddDivisionEquality, added_exhaustion, secondary_revenue, 5000),
)
else:
del fascination, criteria, compromising_documents, compromising_documents_constraints
Add skulls fascination for Diplomat This fascination scales with all three skeleton attributes multiplied together.
2021-08-11 23:35:15 +00:00
Initial commit
2021-06-08 22:28:15 +00:00
# Maximize profit margin
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
net_profit = model.NewIntVar('net profit')
Initial commit
2021-06-08 22:28:15 +00:00
model.Add(net_profit == total_revenue - cost)
# This is necessary to preserve some degree of precision after dividing
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
multiplied_net_profit = model.NewIntVar('multiplied net profit', lb = cp_model.INT32_MIN*PROFIT_MARGIN_MULTIPLIER, ub = cp_model.INT32_MAX*PROFIT_MARGIN_MULTIPLIER)
model.AddMultiplicationEquality(multiplied_net_profit, (net_profit, PROFIT_MARGIN_MULTIPLIER))
Initial commit
2021-06-08 22:28:15 +00:00
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
absolute_multiplied_net_profit = model.NewIntVar('absolute multiplied net profit', lb = 0, ub = cp_model.INT32_MAX*PROFIT_MARGIN_MULTIPLIER)
Initial commit
2021-06-08 22:28:15 +00:00
model.AddAbsEquality(absolute_multiplied_net_profit, multiplied_net_profit)
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
absolute_profit_margin = model.NewIntVar('absolute profit margin', lb = cp_model.INT32_MIN*PROFIT_MARGIN_MULTIPLIER, ub = cp_model.INT32_MAX*PROFIT_MARGIN_MULTIPLIER)
Initial commit
2021-06-08 22:28:15 +00:00
model.AddDivisionEquality(absolute_profit_margin, absolute_multiplied_net_profit, total_revenue)
Replace helper functions with subclass The new subclass, BoneMarketModel, overrides CpModel's methods with improvements such as default parameters and support for enforcement literals. This should allow substantial improvements to the readability of the solver in the future. In addition, various lists have been replaced with tuples where appropriate.
2021-09-22 22:06:44 +00:00
profit_margin = model.NewIntVar('profit margin', lb = cp_model.INT32_MIN*PROFIT_MARGIN_MULTIPLIER, ub = cp_model.INT32_MAX*PROFIT_MARGIN_MULTIPLIER)
Initial commit
2021-06-08 22:28:15 +00:00
Replace BoneMarketModel.NewIntermediateBoolVar The replacement method, BoolExpression, accepts a BoundedLinearExpression directly, and uses memoization to reuse Boolean variables. This technique is unsuitable for other methods, as constraints need to be applied separately, but in this case it is fine. The new method is much easier to understand, and far easier to read at call sites. Variable names are generated from the expression, rather than being explicitly specified.
2021-09-25 03:04:54 +00:00
positive_net_profit = model.BoolExpression(net_profit >= 0)
Initial commit
2021-06-08 22:28:15 +00:00
model.Add(profit_margin == absolute_profit_margin).OnlyEnforceIf(positive_net_profit)
model.Add(profit_margin == absolute_profit_margin*-1).OnlyEnforceIf(positive_net_profit.Not())
del multiplied_net_profit, absolute_multiplied_net_profit, absolute_profit_margin, positive_net_profit
Make buyers part of model Buyers are now part of the model, rather than being fixed. This means that the model can choose from among all buyers and determine the most profitable option. Accomplishing this meant replacing the if-else control flow with a large quantity of half-reified constraints.
2021-06-13 22:37:39 +00:00
Initial commit
2021-06-08 22:28:15 +00:00
model.Maximize(profit_margin)
Move solution printing to special class This class has the advantage of being usable as a solution printer, which can print each solution as they are generated. This tends to be extremely verbose, but may prove useful for debugging.
2021-06-15 19:13:07 +00:00
class SkeletonPrinter(cp_model.CpSolverSolutionCallback):
Use docstrings instead of comments if appropriate Unlike comments, docstrings support runtime introspection and other features. The docstrings are arguably a bit sparse, but this is sufficient for the time being.
2021-06-18 19:44:30 +00:00
"""A class that prints the steps that comprise a skeleton as well as relevant attributes."""
Add __slots__ to internal printer class This slightly reduces memory usage.
2021-09-19 00:09:13 +00:00
__slots__ = 'this', '__solution_count'
Move solution printing to special class This class has the advantage of being usable as a solution printer, which can print each solution as they are generated. This tends to be extremely verbose, but may prove useful for debugging.
2021-06-15 19:13:07 +00:00
def __init__(self):
cp_model.CpSolverSolutionCallback.__init__(self)
self.__solution_count = 0
def PrintableSolution(self, solver = None):
Use docstrings instead of comments if appropriate Unlike comments, docstrings support runtime introspection and other features. The docstrings are arguably a bit sparse, but this is sufficient for the time being.
2021-06-18 19:44:30 +00:00
"""Print the latest solution of a provided solver."""
Move solution printing to special class This class has the advantage of being usable as a solution printer, which can print each solution as they are generated. This tends to be extremely verbose, but may prove useful for debugging.
2021-06-15 19:13:07 +00:00
output = ""
# Allows use as a callback
if solver is None:
solver = self
for action in actions.keys():
for _ in range(int(solver.Value(actions[action]))):
output += str(action) + "\n"
Use f-strings and multiline strings Inline string expressions are far easier to read, particularly for complicated strings like the skeleton printer's output. Care has been taken to ensure that no behavior has been changed in the process.
2021-09-19 00:55:22 +00:00
output += f"""
Profit: £{solver.Value(net_profit)/100:,.2f}
Profit Margin: {solver.Value(profit_margin)/PROFIT_MARGIN_MULTIPLIER:+,.2%}
Move solution printing to special class This class has the advantage of being usable as a solution printer, which can print each solution as they are generated. This tends to be extremely verbose, but may prove useful for debugging.
2021-06-15 19:13:07 +00:00
Use f-strings and multiline strings Inline string expressions are far easier to read, particularly for complicated strings like the skeleton printer's output. Care has been taken to ensure that no behavior has been changed in the process.
2021-09-19 00:55:22 +00:00
Total Revenue: £{solver.Value(total_revenue)/100:,.2f}
Primary Revenue: £{solver.Value(primary_revenue)/100:,.2f}
Secondary Revenue: £{solver.Value(secondary_revenue)/100:,.2f}
Move solution printing to special class This class has the advantage of being usable as a solution printer, which can print each solution as they are generated. This tends to be extremely verbose, but may prove useful for debugging.
2021-06-15 19:13:07 +00:00
Use f-strings and multiline strings Inline string expressions are far easier to read, particularly for complicated strings like the skeleton printer's output. Care has been taken to ensure that no behavior has been changed in the process.
2021-09-19 00:55:22 +00:00
Cost: £{solver.Value(cost)/100:,.2f}
Move solution printing to special class This class has the advantage of being usable as a solution printer, which can print each solution as they are generated. This tends to be extremely verbose, but may prove useful for debugging.
2021-06-15 19:13:07 +00:00
Use f-strings and multiline strings Inline string expressions are far easier to read, particularly for complicated strings like the skeleton printer's output. Care has been taken to ensure that no behavior has been changed in the process.
2021-09-19 00:55:22 +00:00
Value: £{solver.Value(value)/100:,.2f}
Amalgamy: {solver.Value(amalgamy):n}
Antiquity: {solver.Value(antiquity):n}
Menace: {solver.Value(menace):n}
Counter-Church: {solver.Value(counter_church):n}
Implausibility: {solver.Value(implausibility):n}
Move solution printing to special class This class has the advantage of being usable as a solution printer, which can print each solution as they are generated. This tends to be extremely verbose, but may prove useful for debugging.
2021-06-15 19:13:07 +00:00
Use f-strings and multiline strings Inline string expressions are far easier to read, particularly for complicated strings like the skeleton printer's output. Care has been taken to ensure that no behavior has been changed in the process.
2021-09-19 00:55:22 +00:00
Exhaustion: {solver.Value(exhaustion):n}"""
Move solution printing to special class This class has the advantage of being usable as a solution printer, which can print each solution as they are generated. This tends to be extremely verbose, but may prove useful for debugging.
2021-06-15 19:13:07 +00:00
return output
def OnSolutionCallback(self):
self.__solution_count += 1
Show current best skeleton while calculating So long as verbose mode is not active, the script will now display the current skeleton as it tries to search for more solutions. This feature uses the curses module to create an alternate screen, so intermediate solutions are not sent to standard output.
2021-06-15 21:50:28 +00:00
# Prints current solution to window
stdscr.clear()
stdscr.addstr(self.PrintableSolution())
Use f-strings and multiline strings Inline string expressions are far easier to read, particularly for complicated strings like the skeleton printer's output. Care has been taken to ensure that no behavior has been changed in the process.
2021-09-19 00:55:22 +00:00
stdscr.addstr(stdscr.getmaxyx()[0] - 1, 0, f"Skeleton #{self.__solution_count:n}")
Show current best skeleton while calculating So long as verbose mode is not active, the script will now display the current skeleton as it tries to search for more solutions. This feature uses the curses module to create an alternate screen, so intermediate solutions are not sent to standard output.
2021-06-15 21:50:28 +00:00
stdscr.refresh()
Move solution printing to special class This class has the advantage of being usable as a solution printer, which can print each solution as they are generated. This tends to be extremely verbose, but may prove useful for debugging.
2021-06-15 19:13:07 +00:00
def SolutionCount(self):
return self.__solution_count
printer = SkeletonPrinter()
Initial commit
2021-06-08 22:28:15 +00:00
solver = cp_model.CpSolver()
Update OR-Tools to v9.1 This update, despite ostensibly being a minor version, includes breaking changes that must be accounted for. Overflow is much more strictly checked, so the magnitude of certain constants has been decreased. CP-SAT's default number of workers has been changed to reflect the default of this script. As such, the script no longer needs to change that parameter unless a specific number of workers has been specified. In light of the breaking changes, the OR-Tools version is now pinned at 9.1 instead of being permitted to use future minor versions.
2021-10-16 02:32:55 +00:00
if workers:
solver.parameters.num_search_workers = workers
Add command-line parameter for time limit You can now pass an optional time limit to the script, which causes the solver to return the best solution it has once the duration has elapsed.
2021-06-16 16:32:05 +00:00
solver.parameters.max_time_in_seconds = time_limit
Initial commit
2021-06-08 22:28:15 +00:00
Show current best skeleton while calculating So long as verbose mode is not active, the script will now display the current skeleton as it tries to search for more solutions. This feature uses the curses module to create an alternate screen, so intermediate solutions are not sent to standard output.
2021-06-15 21:50:28 +00:00
# There's no window in verbose mode
if stdscr is None:
solver.parameters.log_search_progress = True
solver.Solve(model)
else:
Update OR-Tools to v9.1 This update, despite ostensibly being a minor version, includes breaking changes that must be accounted for. Overflow is much more strictly checked, so the magnitude of certain constants has been decreased. CP-SAT's default number of workers has been changed to reflect the default of this script. As such, the script no longer needs to change that parameter unless a specific number of workers has been specified. In light of the breaking changes, the OR-Tools version is now pinned at 9.1 instead of being permitted to use future minor versions.
2021-10-16 02:32:55 +00:00
solver.Solve(model, printer)
Show current best skeleton while calculating So long as verbose mode is not active, the script will now display the current skeleton as it tries to search for more solutions. This feature uses the curses module to create an alternate screen, so intermediate solutions are not sent to standard output.
2021-06-15 21:50:28 +00:00
status = solver.StatusName()
Standardize quotes across script Single quotes are used for identifiers. Double quotes are used for strings that are meant to be read by users.
2021-06-18 18:48:20 +00:00
if status == 'INFEASIBLE':
Initial commit
2021-06-08 22:28:15 +00:00
raise RuntimeError("There is no satisfactory skeleton.")
Standardize quotes across script Single quotes are used for identifiers. Double quotes are used for strings that are meant to be read by users.
2021-06-18 18:48:20 +00:00
elif status == 'FEASIBLE':
Initial commit
2021-06-08 22:28:15 +00:00
print("WARNING: skeleton may be suboptimal.")
Standardize quotes across script Single quotes are used for identifiers. Double quotes are used for strings that are meant to be read by users.
2021-06-18 18:48:20 +00:00
elif status != 'OPTIMAL':
Use f-strings and multiline strings Inline string expressions are far easier to read, particularly for complicated strings like the skeleton printer's output. Care has been taken to ensure that no behavior has been changed in the process.
2021-09-19 00:55:22 +00:00
raise RuntimeError(f"Unknown status returned: {status}.")
Initial commit
2021-06-08 22:28:15 +00:00
Show current best skeleton while calculating So long as verbose mode is not active, the script will now display the current skeleton as it tries to search for more solutions. This feature uses the curses module to create an alternate screen, so intermediate solutions are not sent to standard output.
2021-06-15 21:50:28 +00:00
return printer.PrintableSolution(solver)