From c7d5fc9917e3cb01abc8bb4610dbacdf9002c72c Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Fri, 20 Nov 2026 04:56:59 +0100 Subject: [PATCH] Drive: every DriveParameters value is validated at construction A NaN or negative rate (a NaN DrainTrait made Resolve NaN and Tick threw from PoseBehaviour.Write after the drive had half-stepped) is now a construction error. DriveParameters.Validate owns the checks, WillMendsAt and WillCurve included. Addresses finding nan-drive-throws-after-step. Co-Authored-By: Claude Sonnet 5.5 --- src/Lodur.Core/Actor.cs | 10 +--------- src/Lodur.Core/DriveState.cs | 30 +++++++++++++++++++++++++++++ tests/Lodur.Core.Tests/WillTests.cs | 22 +++++++++++++++++++++ 3 files changed, 53 insertions(+), 9 deletions(-) diff --git a/src/Lodur.Core/Actor.cs b/src/Lodur.Core/Actor.cs index 9d04ca5..5e68554 100644 --- a/src/Lodur.Core/Actor.cs +++ b/src/Lodur.Core/Actor.cs @@ -43,15 +43,7 @@ namespace Lodur NerveParameters? senses = null, int senseRegion = 0) { brain.Validate(); - if (!(drive.WillMendsAt > 0.0 && drive.WillMendsAt <= 1.0)) - { - throw new ArgumentException("WillMendsAt must be in (0, 1]."); - } - - if (!(drive.WillCurve > 0.0 && double.IsFinite(drive.WillCurve))) - { - throw new ArgumentException("WillCurve must be finite and above 0."); - } + drive.Validate(); _dt = tickSeconds; _driveP = drive; diff --git a/src/Lodur.Core/DriveState.cs b/src/Lodur.Core/DriveState.cs index 8d0c985..5b59a66 100644 --- a/src/Lodur.Core/DriveState.cs +++ b/src/Lodur.Core/DriveState.cs @@ -36,6 +36,36 @@ namespace Lodur /// holds most of its strength until the will is nearly gone; above 1 it fades as soon as the will drops. /// public double WillCurve { get; init; } = 0.25; + + /// Refuses a value the drive cannot run on, at construction rather than as a NaN several ticks in: every rate, trait and threshold is finite and not negative; WillMendsAt is in (0, 1]; WillCurve is above 0. + internal void Validate() + { + var rates = new[] + { + (PainRise, nameof(PainRise)), (PainDecay, nameof(PainDecay)), (StrainRecover, nameof(StrainRecover)), + (ResolveDrainPain, nameof(ResolveDrainPain)), (ResolveDrainStrain, nameof(ResolveDrainStrain)), + (ResolveRecovery, nameof(ResolveRecovery)), (ResolveRecoversBelowPain, nameof(ResolveRecoversBelowPain)), + (DrainTrait, nameof(DrainTrait)), (ArousalRise, nameof(ArousalRise)), (ArousalDecay, nameof(ArousalDecay)), + (ResolveDrainArousal, nameof(ResolveDrainArousal)), (ResolveRecoversBelowArousal, nameof(ResolveRecoversBelowArousal)), + }; + foreach (var (value, name) in rates) + { + if (!(value >= 0.0 && double.IsFinite(value))) + { + throw new ArgumentException($"{name} must be finite and not negative."); + } + } + + if (!(WillMendsAt > 0.0 && WillMendsAt <= 1.0)) + { + throw new ArgumentException("WillMendsAt must be in (0, 1]."); + } + + if (!(WillCurve > 0.0 && double.IsFinite(WillCurve))) + { + throw new ArgumentException("WillCurve must be finite and above 0."); + } + } } /// diff --git a/tests/Lodur.Core.Tests/WillTests.cs b/tests/Lodur.Core.Tests/WillTests.cs index 129bb93..33be0e7 100644 --- a/tests/Lodur.Core.Tests/WillTests.cs +++ b/tests/Lodur.Core.Tests/WillTests.cs @@ -341,4 +341,26 @@ public sealed class WillTests [InlineData(double.PositiveInfinity)] public void A_WillCurve_that_is_not_finite_and_above_zero_is_refused(double curve) => Assert.Throws(() => new PainBoxReplay(1, drive: new DriveParameters { WillCurve = curve })); + + public static IEnumerable BadDrives() => new[] + { + new object[] { new DriveParameters { DrainTrait = double.NaN } }, + new object[] { new DriveParameters { DrainTrait = -1.0 } }, + new object[] { new DriveParameters { PainRise = double.PositiveInfinity } }, + new object[] { new DriveParameters { PainDecay = double.NaN } }, + new object[] { new DriveParameters { StrainRecover = -0.1 } }, + new object[] { new DriveParameters { ResolveDrainPain = double.NaN } }, + new object[] { new DriveParameters { ResolveDrainStrain = double.NegativeInfinity } }, + new object[] { new DriveParameters { ResolveRecovery = double.NaN } }, + new object[] { new DriveParameters { ResolveRecoversBelowPain = double.NaN } }, + new object[] { new DriveParameters { ArousalRise = -1.0 } }, + new object[] { new DriveParameters { ArousalDecay = double.NaN } }, + new object[] { new DriveParameters { ResolveDrainArousal = double.PositiveInfinity } }, + new object[] { new DriveParameters { ResolveRecoversBelowArousal = double.NaN } }, + }; + + [Theory] + [MemberData(nameof(BadDrives))] + public void A_drive_value_the_drive_cannot_run_on_is_refused_at_construction_before_any_tick(DriveParameters bad) => + Assert.Throws(() => new Actor(0.01, 1, new NerveParameters(), new WithdrawalParameters(), bad, PainBoxBrain.Make(0.5))); }