diff --git a/pooltool/objects/cue/datatypes.py b/pooltool/objects/cue/datatypes.py index 00aa6808..64c4bf5f 100755 --- a/pooltool/objects/cue/datatypes.py +++ b/pooltool/objects/cue/datatypes.py @@ -27,28 +27,42 @@ class CueSpecs: end_mass: The mass of the of the cue's end. This controls the amount of deflection (squirt) that occurs when using sidespin. Lower means less deflection. It is - defined here: - https://billiards.colostate.edu/technical_proofs/new/TP_A-31.pdf. + defined here: https://drdavepoolinfo.com/technical_proofs/new/TP_A-31.pdf. """ - brand: str = field(default="Predator") - M: float = field(default=0.567) - length: float = field(default=1.4732) - tip_radius: float = field(default=0.0106045) # nickel radius - shaft_radius_at_tip: float = field( - default=0.0065 - ) # 13 mm shaft diameter at the tip - shaft_radius_at_butt: float = field(default=0.02) - end_mass: float = field(default=0.170097 / 30) + brand: str = field() + M: float = field() + length: float = field() + tip_radius: float = field() + shaft_radius_at_tip: float = field() + shaft_radius_at_butt: float = field() + end_mass: float = field() @staticmethod def default() -> CueSpecs: """Construct a default cue spec""" - return CueSpecs() + return CueSpecs( + brand="Pooltool", + M=0.567, + length=1.4732, + tip_radius=0.0106045, + shaft_radius_at_tip=0.0065, + shaft_radius_at_butt=0.02, + end_mass=0.170097 / 30, + ) @staticmethod def snooker() -> CueSpecs: - raise NotImplementedError() + # FIXME: this is just a copy paste of the pool cue specs + return CueSpecs( + brand="Pooltool", + M=0.567, + length=1.4732, + tip_radius=0.0106045, + shaft_radius_at_tip=0.0065, + shaft_radius_at_butt=0.02, + end_mass=0.170097 / 30, + ) @define diff --git a/tests/events/example_system.msgpack b/tests/events/example_system.msgpack index 36ad1082..8856fd95 100644 Binary files a/tests/events/example_system.msgpack and b/tests/events/example_system.msgpack differ diff --git a/tests/evolution/event_based/test_data/case1.msgpack b/tests/evolution/event_based/test_data/case1.msgpack index b493d40a..ef8f1e28 100644 Binary files a/tests/evolution/event_based/test_data/case1.msgpack and b/tests/evolution/event_based/test_data/case1.msgpack differ diff --git a/tests/evolution/event_based/test_data/case2.msgpack b/tests/evolution/event_based/test_data/case2.msgpack index 65e0e17d..9612ad01 100644 Binary files a/tests/evolution/event_based/test_data/case2.msgpack and b/tests/evolution/event_based/test_data/case2.msgpack differ diff --git a/tests/evolution/event_based/test_data/case3.msgpack b/tests/evolution/event_based/test_data/case3.msgpack index 0a0c61f5..806ee0f3 100644 Binary files a/tests/evolution/event_based/test_data/case3.msgpack and b/tests/evolution/event_based/test_data/case3.msgpack differ diff --git a/tests/evolution/event_based/test_data/case4.msgpack b/tests/evolution/event_based/test_data/case4.msgpack index 43c4eed9..285568bc 100644 Binary files a/tests/evolution/event_based/test_data/case4.msgpack and b/tests/evolution/event_based/test_data/case4.msgpack differ diff --git a/tests/ruleset/test_shots/01_test_shot_no_point.msgpack b/tests/ruleset/test_shots/01_test_shot_no_point.msgpack index 915cad11..e7a49835 100644 Binary files a/tests/ruleset/test_shots/01_test_shot_no_point.msgpack and b/tests/ruleset/test_shots/01_test_shot_no_point.msgpack differ diff --git a/tests/ruleset/test_shots/01a_test_shot_no_point.msgpack b/tests/ruleset/test_shots/01a_test_shot_no_point.msgpack index 0c4aab28..942d7306 100644 Binary files a/tests/ruleset/test_shots/01a_test_shot_no_point.msgpack and b/tests/ruleset/test_shots/01a_test_shot_no_point.msgpack differ diff --git a/tests/ruleset/test_shots/02_test_shot_ispoint.msgpack b/tests/ruleset/test_shots/02_test_shot_ispoint.msgpack index 0e7ac238..ddac4a41 100644 Binary files a/tests/ruleset/test_shots/02_test_shot_ispoint.msgpack and b/tests/ruleset/test_shots/02_test_shot_ispoint.msgpack differ diff --git a/tests/ruleset/test_shots/02a_test_shot_ispoint.msgpack b/tests/ruleset/test_shots/02a_test_shot_ispoint.msgpack index 7f5c3cef..50561aee 100644 Binary files a/tests/ruleset/test_shots/02a_test_shot_ispoint.msgpack and b/tests/ruleset/test_shots/02a_test_shot_ispoint.msgpack differ diff --git a/tests/ruleset/test_shots/03_test_shot_ispoint.msgpack b/tests/ruleset/test_shots/03_test_shot_ispoint.msgpack index 2b005135..c67f5b90 100644 Binary files a/tests/ruleset/test_shots/03_test_shot_ispoint.msgpack and b/tests/ruleset/test_shots/03_test_shot_ispoint.msgpack differ diff --git a/tests/ruleset/test_shots/03a_test_shot_ispoint.msgpack b/tests/ruleset/test_shots/03a_test_shot_ispoint.msgpack index b1cbec3e..984fd9b0 100644 Binary files a/tests/ruleset/test_shots/03a_test_shot_ispoint.msgpack and b/tests/ruleset/test_shots/03a_test_shot_ispoint.msgpack differ diff --git a/tests/ruleset/test_shots/04_test_shot_no_point.msgpack b/tests/ruleset/test_shots/04_test_shot_no_point.msgpack index cdc7e03b..9b086cf3 100644 Binary files a/tests/ruleset/test_shots/04_test_shot_no_point.msgpack and b/tests/ruleset/test_shots/04_test_shot_no_point.msgpack differ diff --git a/tests/ruleset/test_shots/04a_test_shot_no_point.msgpack b/tests/ruleset/test_shots/04a_test_shot_no_point.msgpack index 74475770..c344bc84 100644 Binary files a/tests/ruleset/test_shots/04a_test_shot_no_point.msgpack and b/tests/ruleset/test_shots/04a_test_shot_no_point.msgpack differ diff --git a/tests/ruleset/test_shots/05_test_shot_ispoint.msgpack b/tests/ruleset/test_shots/05_test_shot_ispoint.msgpack index ac886a69..d3267dd1 100644 Binary files a/tests/ruleset/test_shots/05_test_shot_ispoint.msgpack and b/tests/ruleset/test_shots/05_test_shot_ispoint.msgpack differ diff --git a/tests/ruleset/test_shots/05a_test_shot_ispoint.msgpack b/tests/ruleset/test_shots/05a_test_shot_ispoint.msgpack index 7e65d65f..19600a5d 100644 Binary files a/tests/ruleset/test_shots/05a_test_shot_ispoint.msgpack and b/tests/ruleset/test_shots/05a_test_shot_ispoint.msgpack differ