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

1133 lines
48 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
fix: Restore default number of workers OR-Tools 9.3 no longer seems to use more than one worker by default, so this parameter is once again set by the script. The parameter has also been changed from num_search_workers to num_workers internally, though the former is mapped to the latter.
2022-04-19 15:02:03 +00:00
from os import cpu_count
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
fix: Restore default number of workers OR-Tools 9.3 no longer seems to use more than one worker by default, so this parameter is once again set by the script. The parameter has also been changed from num_search_workers to num_workers internally, though the former is mapped to the latter.
2022-04-19 15:02:03 +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 = cpu_count(), 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)
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 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)
Update OR-Tools to 9.3 Despite being a minor version, OR-Tools 9.3 has breaking changes to CP-SAT in the form of renamed methods.
2022-04-11 18:38:25 +00:00
model.Add(base_value == cp_model.LinearExpr.WeightedSum(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)
Update OR-Tools to 9.3 Despite being a minor version, OR-Tools 9.3 has breaking changes to CP-SAT in the form of renamed methods.
2022-04-11 18:38:25 +00:00
model.Add(skulls == cp_model.LinearExpr.WeightedSum(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)
Update OR-Tools to 9.3 Despite being a minor version, OR-Tools 9.3 has breaking changes to CP-SAT in the form of renamed methods.
2022-04-11 18:38:25 +00:00
model.Add(arms == cp_model.LinearExpr.WeightedSum(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)
Update OR-Tools to 9.3 Despite being a minor version, OR-Tools 9.3 has breaking changes to CP-SAT in the form of renamed methods.
2022-04-11 18:38:25 +00:00
model.Add(legs == cp_model.LinearExpr.WeightedSum(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)
Update OR-Tools to 9.3 Despite being a minor version, OR-Tools 9.3 has breaking changes to CP-SAT in the form of renamed methods.
2022-04-11 18:38:25 +00:00
model.Add(tails == cp_model.LinearExpr.WeightedSum(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)
Update OR-Tools to 9.3 Despite being a minor version, OR-Tools 9.3 has breaking changes to CP-SAT in the form of renamed methods.
2022-04-11 18:38:25 +00:00
model.Add(wings == cp_model.LinearExpr.WeightedSum(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)
Update OR-Tools to 9.3 Despite being a minor version, OR-Tools 9.3 has breaking changes to CP-SAT in the form of renamed methods.
2022-04-11 18:38:25 +00:00
model.Add(fins == cp_model.LinearExpr.WeightedSum(actions.values(), [action.value.fins for action in actions.keys()]))
Initial commit
2021-06-08 22:28:15 +00:00
feat: Add segment property to actions This is used to track the number of segments in a skeleton, which is affected by a new bone.
2022-05-26 12:45:36 +00:00
# Segments calculation
segments = model.NewIntVar('segments', lb = 0)
model.Add(segments == cp_model.LinearExpr.WeightedSum(actions.values(), [action.value.segments 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)
Update OR-Tools to 9.3 Despite being a minor version, OR-Tools 9.3 has breaking changes to CP-SAT in the form of renamed methods.
2022-04-11 18:38:25 +00:00
model.Add(tentacles == cp_model.LinearExpr.WeightedSum(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')
Update OR-Tools to 9.3 Despite being a minor version, OR-Tools 9.3 has breaking changes to CP-SAT in the form of renamed methods.
2022-04-11 18:38:25 +00:00
model.Add(unbound_amalgamy == cp_model.LinearExpr.WeightedSum(actions.values(), [action.value.amalgamy for action in actions.keys()]))
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.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')
Update OR-Tools to 9.3 Despite being a minor version, OR-Tools 9.3 has breaking changes to CP-SAT in the form of renamed methods.
2022-04-11 18:38:25 +00:00
model.Add(unbound_antiquity == cp_model.LinearExpr.WeightedSum(actions.values(), [action.value.antiquity for action in actions.keys()]))
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.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')
Update OR-Tools to 9.3 Despite being a minor version, OR-Tools 9.3 has breaking changes to CP-SAT in the form of renamed methods.
2022-04-11 18:38:25 +00:00
model.Add(constant_base_menace == cp_model.LinearExpr.WeightedSum(actions.values(), [action.value.menace for action in actions.keys()]))
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
# 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')
Update OR-Tools to 9.3 Despite being a minor version, OR-Tools 9.3 has breaking changes to CP-SAT in the form of renamed methods.
2022-04-11 18:38:25 +00:00
model.Add(constant_base_implausibility == cp_model.LinearExpr.WeightedSum(actions.values(), [action.value.implausibility for action in actions.keys()]))
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
# 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)
Update OR-Tools to 9.3 Despite being a minor version, OR-Tools 9.3 has breaking changes to CP-SAT in the form of renamed methods.
2022-04-11 18:38:25 +00:00
model.Add(counter_church == cp_model.LinearExpr.WeightedSum(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)
Update OR-Tools to 9.3 Despite being a minor version, OR-Tools 9.3 has breaking changes to CP-SAT in the form of renamed methods.
2022-04-11 18:38:25 +00:00
model.Add(exhaustion == cp_model.LinearExpr.WeightedSum(actions.values(), [action.value.exhaustion for action in actions.keys()]) + added_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
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)
Update OR-Tools to 9.3 Despite being a minor version, OR-Tools 9.3 has breaking changes to CP-SAT in the form of renamed methods.
2022-04-11 18:38:25 +00:00
model.Add(base_joints == cp_model.LinearExpr.WeightedSum([value for (key, value) in actions.items() if isinstance(key, Torso)], [torso.value.limbs_needed + torso.value.arms + torso.value.legs + torso.value.wings + torso.value.fins + torso.value.tentacles for torso in Torso]))
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)
Update OR-Tools to 9.3 Despite being a minor version, OR-Tools 9.3 has breaking changes to CP-SAT in the form of renamed methods.
2022-04-11 18:38:25 +00:00
model.Add(cost == cp_model.LinearExpr.WeightedSum(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
feat: Add Segmented Ribcage to skulls This skull is unique for requiring a specific torso style, and for adding additional limb slots.
2022-05-26 13:32:04 +00:00
# Skull requirements
model.Add(torso_style == 110) \
.OnlyEnforceIf(model.BoolExpression(actions[Skull.SEGMENTED_RIBCAGE] > 0))
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
Update OR-Tools to 9.3 Despite being a minor version, OR-Tools 9.3 has breaking changes to CP-SAT in the form of renamed methods.
2022-04-11 18:38:25 +00:00
model.Add(cp_model.LinearExpr.WeightedSum(actions.values(), [action.value.skulls_needed for action in actions.keys()]) == 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
# Skeleton must have no unfilled limbs
Update OR-Tools to 9.3 Despite being a minor version, OR-Tools 9.3 has breaking changes to CP-SAT in the form of renamed methods.
2022-04-11 18:38:25 +00:00
model.Add(cp_model.LinearExpr.WeightedSum(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
Update OR-Tools to 9.3 Despite being a minor version, OR-Tools 9.3 has breaking changes to CP-SAT in the form of renamed methods.
2022-04-11 18:38:25 +00:00
model.Add(cp_model.LinearExpr.WeightedSum(actions.values(), [action.value.tails_needed for action in actions.keys()]) == 0).OnlyEnforceIf(actions[Appendage.SKIP_TAILS].Not())
model.Add(cp_model.LinearExpr.WeightedSum(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,
Remove BoneMarketModel.AddDivisionMultiplicationEquality This function has been obsoleted by the ability to pass partial methods as parameters to helper functions. Use of this function has been replaced with partial methods accordingly. In addition, the following code style has been applied: partial methods that contain a nested partial method have the function arguments broken into distinct lines. This means that the bottom partial method is formatted in the same manner as a partial method without any nesting.
2021-10-16 20:11:12 +00:00
partialmethod(BoneMarketModel.AddMultiplicationEquality,
primary_revenue,
(250, partialmethod(BoneMarketModel.AddDivisionEquality, num=value + zoological_mania_bonus, denom=250)),
),
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
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,
Remove BoneMarketModel.AddDivisionMultiplicationEquality This function has been obsoleted by the ability to pass partial methods as parameters to helper functions. Use of this function has been replaced with partial methods accordingly. In addition, the following code style has been applied: partial methods that contain a nested partial method have the function arguments broken into distinct lines. This means that the bottom partial method is formatted in the same manner as a partial method without any nesting.
2021-10-16 20:11:12 +00:00
partialmethod(BoneMarketModel.AddMultiplicationEquality,
primary_revenue - 1000,
(250, partialmethod(BoneMarketModel.AddDivisionEquality, num=value + zoological_mania_bonus, denom=250)),
),
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
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,
Remove BoneMarketModel.AddDivisionMultiplicationEquality This function has been obsoleted by the ability to pass partial methods as parameters to helper functions. Use of this function has been replaced with partial methods accordingly. In addition, the following code style has been applied: partial methods that contain a nested partial method have the function arguments broken into distinct lines. This means that the bottom partial method is formatted in the same manner as a partial method without any nesting.
2021-10-16 20:11:12 +00:00
partialmethod(BoneMarketModel.AddMultiplicationEquality,
primary_revenue - 1000,
(50, partialmethod(BoneMarketModel.AddDivisionEquality, num=value + zoological_mania_bonus, denom=50)),
),
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
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,
Remove BoneMarketModel.AddDivisionMultiplicationEquality This function has been obsoleted by the ability to pass partial methods as parameters to helper functions. Use of this function has been replaced with partial methods accordingly. In addition, the following code style has been applied: partial methods that contain a nested partial method have the function arguments broken into distinct lines. This means that the bottom partial method is formatted in the same manner as a partial method without any nesting.
2021-10-16 20:11:12 +00:00
partialmethod(BoneMarketModel.AddMultiplicationEquality,
primary_revenue - 1000,
(250, partialmethod(BoneMarketModel.AddDivisionEquality, num=value + zoological_mania_bonus, denom=250)),
),
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
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,
Remove BoneMarketModel.AddDivisionMultiplicationEquality This function has been obsoleted by the ability to pass partial methods as parameters to helper functions. Use of this function has been replaced with partial methods accordingly. In addition, the following code style has been applied: partial methods that contain a nested partial method have the function arguments broken into distinct lines. This means that the bottom partial method is formatted in the same manner as a partial method without any nesting.
2021-10-16 20:11:12 +00:00
partialmethod(BoneMarketModel.AddMultiplicationEquality,
primary_revenue,
(50, partialmethod(BoneMarketModel.AddDivisionEquality, num=value + zoological_mania_bonus, denom=50)),
),
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
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,
Remove BoneMarketModel.AddDivisionMultiplicationEquality This function has been obsoleted by the ability to pass partial methods as parameters to helper functions. Use of this function has been replaced with partial methods accordingly. In addition, the following code style has been applied: partial methods that contain a nested partial method have the function arguments broken into distinct lines. This means that the bottom partial method is formatted in the same manner as a partial method without any nesting.
2021-10-16 20:11:12 +00:00
partialmethod(BoneMarketModel.AddMultiplicationEquality,
primary_revenue,
(50, partialmethod(BoneMarketModel.AddDivisionEquality, num=value + zoological_mania_bonus, denom=50)),
),
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
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,
Remove BoneMarketModel.AddDivisionMultiplicationEquality This function has been obsoleted by the ability to pass partial methods as parameters to helper functions. Use of this function has been replaced with partial methods accordingly. In addition, the following code style has been applied: partial methods that contain a nested partial method have the function arguments broken into distinct lines. This means that the bottom partial method is formatted in the same manner as a partial method without any nesting.
2021-10-16 20:11:12 +00:00
partialmethod(BoneMarketModel.AddMultiplicationEquality,
primary_revenue - 250,
(50, partialmethod(BoneMarketModel.AddDivisionEquality, num=value + zoological_mania_bonus, denom=50)),
),
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
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
Refactor complex 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.
2021-10-20 03:20:02 +00:00
model.AddIf(actions[Buyer.AN_INVESTMENT_MINDED_AMBASSADOR],
skeleton_in_progress >= 100,
antiquity > 0,
partialmethod(BoneMarketModel.AddMultiplicationEquality,
primary_revenue - 250,
(50, partialmethod(BoneMarketModel.AddDivisionEquality, num = value+zoological_mania_bonus, denom=50)),
),
partialmethod(BoneMarketModel.AddMultiplicationEquality,
secondary_revenue,
(
250,
partialmethod(BoneMarketModel.AddDivisionEquality,
num=partialmethod(BoneMarketModel.AddMultiplicationEquality,
variables = (
4,
partialmethod(BoneMarketModel.AddApproximateExponentiationEquality,
var=antiquity,
exp=2.1,
upto=MAXIMUM_ATTRIBUTE,
),
) if bone_market_fluctuations == Fluctuation.ANTIQUITY else
(
4,
antiquity,
antiquity,
),
),
denom=5,
),
),
),
difficulty_level == 75*implausibility,
partialmethod(BoneMarketModel.AddDivisionEquality,
added_exhaustion,
partialmethod(BoneMarketModel.AddMultiplicationEquality, variables=(antiquity, antiquity)),
25,
),
)
Initial commit
2021-06-08 22:28:15 +00:00
Refactor complex 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.
2021-10-20 03:20:02 +00:00
model.AddIf(actions[Buyer.A_TELLER_OF_TERRORS],
skeleton_in_progress >= 100,
menace > 0,
partialmethod(BoneMarketModel.AddMultiplicationEquality,
primary_revenue - 250,
(10, partialmethod(BoneMarketModel.AddDivisionEquality, num = value+zoological_mania_bonus, denom=10)),
),
partialmethod(BoneMarketModel.AddMultiplicationEquality,
secondary_revenue,
(
200,
partialmethod(BoneMarketModel.AddApproximateExponentiationEquality, var=menace, exp=2.1, upto=MAXIMUM_ATTRIBUTE),
) if bone_market_fluctuations == Fluctuation.MENACE else
(
200,
menace,
menace,
),
),
difficulty_level == 75*implausibility,
partialmethod(BoneMarketModel.AddDivisionEquality,
added_exhaustion,
partialmethod(BoneMarketModel.AddMultiplicationEquality, variables=(menace, menace)),
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
Refactor complex 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.
2021-10-20 03:20:02 +00:00
model.AddIf(actions[Buyer.A_TENTACLED_ENTREPRENEUR],
skeleton_in_progress >= 100,
amalgamy > 0,
partialmethod(BoneMarketModel.AddMultiplicationEquality,
primary_revenue - 250,
(50, partialmethod(BoneMarketModel.AddDivisionEquality, num = value+zoological_mania_bonus, denom=50)),
),
partialmethod(BoneMarketModel.AddMultiplicationEquality,
secondary_revenue,
(
200,
partialmethod(BoneMarketModel.AddApproximateExponentiationEquality, var=amalgamy, exp=2.1, upto=MAXIMUM_ATTRIBUTE),
) if bone_market_fluctuations == Fluctuation.AMALGAMY else
(
200,
amalgamy,
amalgamy,
),
),
difficulty_level == 75*implausibility,
partialmethod(BoneMarketModel.AddDivisionEquality,
added_exhaustion,
partialmethod(BoneMarketModel.AddMultiplicationEquality, variables=(amalgamy, amalgamy)),
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
Refactor complex 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.
2021-10-20 03:20:02 +00:00
model.AddIf(actions[Buyer.AN_AUTHOR_OF_GOTHIC_TALES],
skeleton_in_progress >= 100,
antiquity > 0,
menace > 0,
partialmethod(BoneMarketModel.AddMultiplicationEquality,
primary_revenue - 250,
(50, partialmethod(BoneMarketModel.AddDivisionEquality, num = value+zoological_mania_bonus, denom=50)),
),
partialmethod(BoneMarketModel.AddMultiplicationEquality,
secondary_revenue,
(
250,
partialmethod(BoneMarketModel.AddDivisionEquality,
num=partialmethod(BoneMarketModel.AddMultiplicationEquality,
variables=(2*antiquity + 1, menace)
),
denom=2,
),
) if bone_market_fluctuations == Fluctuation.MENACE else
(
250,
partialmethod(BoneMarketModel.AddDivisionEquality,
num=partialmethod(BoneMarketModel.AddMultiplicationEquality,
variables=(antiquity, 2*menace + 1)
),
denom=2,
),
) if bone_market_fluctuations == Fluctuation.ANTIQUITY else
(
250,
antiquity,
menace,
),
),
difficulty_level == 75*implausibility,
partialmethod(BoneMarketModel.AddDivisionEquality,
added_exhaustion,
partialmethod(BoneMarketModel.AddMultiplicationEquality, variables=(antiquity, menace)),
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
Refactor complex 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.
2021-10-20 03:20:02 +00:00
model.AddIf(actions[Buyer.A_ZAILOR_WITH_PARTICULAR_INTERESTS],
skeleton_in_progress >= 100,
antiquity > 0,
amalgamy > 0,
partialmethod(BoneMarketModel.AddMultiplicationEquality,
primary_revenue - 250,
(10, partialmethod(BoneMarketModel.AddDivisionEquality, num = value+zoological_mania_bonus, denom=10)),
),
partialmethod(BoneMarketModel.AddMultiplicationEquality,
secondary_revenue,
(
250,
partialmethod(BoneMarketModel.AddDivisionEquality,
num=partialmethod(BoneMarketModel.AddMultiplicationEquality,
variables=(2*antiquity + 1, amalgamy)
),
denom=2,
),
) if bone_market_fluctuations == Fluctuation.AMALGAMY else
(
250,
partialmethod(BoneMarketModel.AddDivisionEquality,
num=partialmethod(BoneMarketModel.AddMultiplicationEquality,
variables=(antiquity, 2*amalgamy + 1)
),
denom=2,
),
) if bone_market_fluctuations == Fluctuation.ANTIQUITY else
(
250,
antiquity,
amalgamy,
),
),
difficulty_level == 75*implausibility,
partialmethod(BoneMarketModel.AddDivisionEquality,
added_exhaustion,
partialmethod(BoneMarketModel.AddMultiplicationEquality, variables=(antiquity, amalgamy)),
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
Refactor complex 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.
2021-10-20 03:20:02 +00:00
model.AddIf(actions[Buyer.A_RUBBERY_COLLECTOR],
skeleton_in_progress >= 100,
amalgamy > 0,
menace > 0,
partialmethod(BoneMarketModel.AddMultiplicationEquality,
primary_revenue - 250,
(50, partialmethod(BoneMarketModel.AddDivisionEquality, num = value+zoological_mania_bonus, denom=50)),
),
partialmethod(BoneMarketModel.AddMultiplicationEquality,
secondary_revenue,
(
250,
partialmethod(BoneMarketModel.AddDivisionEquality,
num=partialmethod(BoneMarketModel.AddMultiplicationEquality,
variables=(2*amalgamy + 1, menace)
),
denom=2,
),
) if bone_market_fluctuations == Fluctuation.MENACE else
(
250,
partialmethod(BoneMarketModel.AddDivisionEquality,
num=partialmethod(BoneMarketModel.AddMultiplicationEquality,
variables=(amalgamy, 2*menace + 1)
),
denom=2,
),
) if bone_market_fluctuations == Fluctuation.AMALGAMY else
(
250,
amalgamy,
menace,
),
),
difficulty_level == 75*implausibility,
partialmethod(BoneMarketModel.AddDivisionEquality,
added_exhaustion,
partialmethod(BoneMarketModel.AddMultiplicationEquality, variables=(amalgamy, menace)),
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
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)),
Remove BoneMarketModel.AddDivisionMultiplicationEquality This function has been obsoleted by the ability to pass partial methods as parameters to helper functions. Use of this function has been replaced with partial methods accordingly. In addition, the following code style has been applied: partial methods that contain a nested partial method have the function arguments broken into distinct lines. This means that the bottom partial method is formatted in the same manner as a partial method without any nesting.
2021-10-16 20:11:12 +00:00
partialmethod(BoneMarketModel.AddMultiplicationEquality,
primary_revenue - 1000,
(50, partialmethod(BoneMarketModel.AddDivisionEquality, num=value, denom=50)),
),
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
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
Refactor complex 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.
2021-10-20 03:20:02 +00:00
model.AddIf(actions[Buyer.AN_ENTHUSIAST_IN_SKULLS],
skeleton_in_progress >= 100,
skulls >= 2,
primary_revenue == value + zoological_mania_bonus,
partialmethod(BoneMarketModel.AddMultiplicationEquality,
secondary_revenue,
(
1250,
partialmethod(BoneMarketModel.AddApproximateExponentiationEquality, var = skulls-1, exp=1.8, upto=MAXIMUM_ATTRIBUTE),
),
),
difficulty_level == 60*implausibility,
partialmethod(BoneMarketModel.AddDivisionEquality, added_exhaustion, secondary_revenue, 5000),
)
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_DREARY_MIDNIGHTER],
cp_model.BoundedLinearExpression(skeleton_in_progress, (110, 299)),
amalgamy == 0,
counter_church == 0,
Remove BoneMarketModel.AddDivisionMultiplicationEquality This function has been obsoleted by the ability to pass partial methods as parameters to helper functions. Use of this function has been replaced with partial methods accordingly. In addition, the following code style has been applied: partial methods that contain a nested partial method have the function arguments broken into distinct lines. This means that the bottom partial method is formatted in the same manner as a partial method without any nesting.
2021-10-16 20:11:12 +00:00
partialmethod(BoneMarketModel.AddMultiplicationEquality,
primary_revenue - 300,
(3, partialmethod(BoneMarketModel.AddDivisionEquality, num=value + zoological_mania_bonus, denom=3)),
),
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
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,
Remove BoneMarketModel.AddDivisionMultiplicationEquality This function has been obsoleted by the ability to pass partial methods as parameters to helper functions. Use of this function has been replaced with partial methods accordingly. In addition, the following code style has been applied: partial methods that contain a nested partial method have the function arguments broken into distinct lines. This means that the bottom partial method is formatted in the same manner as a partial method without any nesting.
2021-10-16 20:11:12 +00:00
partialmethod(BoneMarketModel.AddMultiplicationEquality,
primary_revenue - 100,
(50, partialmethod(BoneMarketModel.AddDivisionEquality, num=value + zoological_mania_bonus, denom=50)),
),
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
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
Refactor complex 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.
2021-10-20 03:20:02 +00:00
model.AddIf(actions[Buyer.AN_INGENUOUS_MALACOLOGIST],
tentacles >= 4,
skeleton_in_progress >= 100,
partialmethod(BoneMarketModel.AddMultiplicationEquality,
primary_revenue - 250,
(250, partialmethod(BoneMarketModel.AddDivisionEquality, num=value, denom=250)),
),
partialmethod(BoneMarketModel.AddMultiplicationEquality,
secondary_revenue,
(
250,
partialmethod(BoneMarketModel.AddDivisionEquality,
num=partialmethod(BoneMarketModel.AddApproximateExponentiationEquality, var=tentacles, exp=2.2, upto=MAXIMUM_ATTRIBUTE),
denom=5,
),
),
),
difficulty_level == 60*implausibility,
partialmethod(BoneMarketModel.AddDivisionEquality,
added_exhaustion,
partialmethod(BoneMarketModel.AddMultiplicationEquality, variables=(tentacles, tentacles)),
100,
),
)
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 complex 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.
2021-10-20 03:20:02 +00:00
model.AddIf(actions[Buyer.AN_ENTERPRISING_BOOT_SALESMAN],
menace == 0,
amalgamy == 0,
skeleton_in_progress >= 100,
legs >= 4,
partialmethod(BoneMarketModel.AddMultiplicationEquality,
primary_revenue,
(50, partialmethod(BoneMarketModel.AddDivisionEquality, num = value+zoological_mania_bonus, denom=50)),
),
partialmethod(BoneMarketModel.AddMultiplicationEquality,
secondary_revenue,
(50, partialmethod(BoneMarketModel.AddApproximateExponentiationEquality, var=legs, exp=2.2, upto=MAXIMUM_ATTRIBUTE)),
),
difficulty_level == 0,
partialmethod(BoneMarketModel.AddDivisionEquality,
added_exhaustion,
partialmethod(BoneMarketModel.AddMultiplicationEquality, variables=(legs, legs)),
100,
),
)
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,
Remove BoneMarketModel.AddDivisionMultiplicationEquality This function has been obsoleted by the ability to pass partial methods as parameters to helper functions. Use of this function has been replaced with partial methods accordingly. In addition, the following code style has been applied: partial methods that contain a nested partial method have the function arguments broken into distinct lines. This means that the bottom partial method is formatted in the same manner as a partial method without any nesting.
2021-10-16 20:11:12 +00:00
partialmethod(BoneMarketModel.AddMultiplicationEquality,
primary_revenue,
(250, partialmethod(BoneMarketModel.AddDivisionEquality, num=value, denom=250)),
),
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
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,
Remove BoneMarketModel.AddDivisionMultiplicationEquality This function has been obsoleted by the ability to pass partial methods as parameters to helper functions. Use of this function has been replaced with partial methods accordingly. In addition, the following code style has been applied: partial methods that contain a nested partial method have the function arguments broken into distinct lines. This means that the bottom partial method is formatted in the same manner as a partial method without any nesting.
2021-10-16 20:11:12 +00:00
partialmethod(BoneMarketModel.AddMultiplicationEquality,
primary_revenue - 50,
(50, partialmethod(BoneMarketModel.AddDivisionEquality, num=value, denom=50)),
),
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
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
)
}
Remove BoneMarketModel.AddDivisionApproximateExponentiationEquality This function has been obsoleted by the ability to pass partial methods as parameters to helper functions. Use of this function has been replaced with partial methods accordingly. This has allowed some intermediate variables to be removed entirely, allowing for further simplification.
2021-10-16 18:11:51 +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, fascination).value],
*criteria,
Remove BoneMarketModel.AddDivisionMultiplicationEquality This function has been obsoleted by the ability to pass partial methods as parameters to helper functions. Use of this function has been replaced with partial methods accordingly. In addition, the following code style has been applied: partial methods that contain a nested partial method have the function arguments broken into distinct lines. This means that the bottom partial method is formatted in the same manner as a partial method without any nesting.
2021-10-16 20:11:12 +00:00
partialmethod(BoneMarketModel.AddMultiplicationEquality,
primary_revenue - 50,
(50, partialmethod(BoneMarketModel.AddDivisionEquality, num=value, denom=50)),
),
Remove BoneMarketModel.AddDivisionApproximateExponentiationEquality This function has been obsoleted by the ability to pass partial methods as parameters to helper functions. Use of this function has been replaced with partial methods accordingly. This has allowed some intermediate variables to be removed entirely, allowing for further simplification.
2021-10-16 18:11:51 +00:00
partialmethod(BoneMarketModel.AddMultiplicationEquality,
secondary_revenue,
Remove BoneMarketModel.AddDivisionMultiplicationEquality This function has been obsoleted by the ability to pass partial methods as parameters to helper functions. Use of this function has been replaced with partial methods accordingly. In addition, the following code style has been applied: partial methods that contain a nested partial method have the function arguments broken into distinct lines. This means that the bottom partial method is formatted in the same manner as a partial method without any nesting.
2021-10-16 20:11:12 +00:00
(
50,
partialmethod(BoneMarketModel.AddApproximateExponentiationEquality,
var=partialmethod(BoneMarketModel.AddDivisionEquality, num = amalgamy+antiquity+menace, denom=3),
exp=2.2,
upto=MAXIMUM_ATTRIBUTE,
),
),
Remove BoneMarketModel.AddDivisionApproximateExponentiationEquality This function has been obsoleted by the ability to pass partial methods as parameters to helper functions. Use of this function has been replaced with partial methods accordingly. This has allowed some intermediate variables to be removed entirely, allowing for further simplification.
2021-10-16 18:11:51 +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
difficulty_level == 0,
partialmethod(BoneMarketModel.AddDivisionEquality, added_exhaustion, secondary_revenue, 5000),
Remove BoneMarketModel.AddDivisionApproximateExponentiationEquality This function has been obsoleted by the ability to pass partial methods as parameters to helper functions. Use of this function has been replaced with partial methods accordingly. This has allowed some intermediate variables to be removed entirely, allowing for further simplification.
2021-10-16 18:11:51 +00:00
) for fascination, criteria in (
Add amphibian fascination for Diplomat This fascination works similarly to other declaration-based fascinations.
2021-10-28 05:19:39 +00:00
('AMPHIBIAN', (cp_model.BoundedLinearExpression(skeleton_in_progress, (170, 179)),)),
Remove BoneMarketModel.AddDivisionApproximateExponentiationEquality This function has been obsoleted by the ability to pass partial methods as parameters to helper functions. Use of this function has been replaced with partial methods accordingly. This has allowed some intermediate variables to be removed entirely, allowing for further simplification.
2021-10-16 18:11:51 +00:00
('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)),)),
Add leg fascination to Diplomat This fascination works similarly to the skull-based fascination.
2021-11-02 20:26:08 +00:00
('LEGS', (skeleton_in_progress >= 100, legs >= 10)),
Remove BoneMarketModel.AddDivisionApproximateExponentiationEquality This function has been obsoleted by the ability to pass partial methods as parameters to helper functions. Use of this function has been replaced with partial methods accordingly. This has allowed some intermediate variables to be removed entirely, allowing for further simplification.
2021-10-16 18:11:51 +00:00
('REPTILE', (cp_model.BoundedLinearExpression(skeleton_in_progress, (160, 169)),)),
('SKULLS', (skeleton_in_progress >= 100, skulls >= 5)),
)
}
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:
fix: Restore default number of workers OR-Tools 9.3 no longer seems to use more than one worker by default, so this parameter is once again set by the script. The parameter has also been changed from num_search_workers to num_workers internally, though the former is mapped to the latter.
2022-04-19 15:02:03 +00:00
solver.parameters.num_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)