Merge branch 'phase/77-health-conditions'
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
Leonid Pershin
Cursor
@@ -0,0 +1,157 @@
|
||||
namespace HSchool.People.Tests;
|
||||
|
||||
public class HealthConditionTests
|
||||
{
|
||||
[Fact]
|
||||
public void SameSeed_YieldsSameSeverityCurve()
|
||||
{
|
||||
var started = new DateTime(2012, 4, 3, 8, 0, 0, DateTimeKind.Utc);
|
||||
var first = Blank("p1");
|
||||
var second = Blank("p1");
|
||||
HealthConditions.Add(first, Artificial(started, severity: 0.2f));
|
||||
HealthConditions.Add(second, Artificial(started, severity: 0.2f));
|
||||
|
||||
Assert.True(HealthConditions.Tick(first, peopleSeed: 7, dayNumber: 100, gameMinutes: 24 * 60));
|
||||
Assert.True(HealthConditions.Tick(second, peopleSeed: 7, dayNumber: 100, gameMinutes: 24 * 60));
|
||||
|
||||
Assert.Equal(first.Conditions![0].Severity, second.Conditions![0].Severity);
|
||||
Assert.True(first.Conditions[0].Severity > 0.2f);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void DifferentDaySeed_ChangesTheCurve()
|
||||
{
|
||||
var started = new DateTime(2012, 4, 3, 8, 0, 0, DateTimeKind.Utc);
|
||||
var a = Blank("p1");
|
||||
var b = Blank("p1");
|
||||
HealthConditions.Add(a, Artificial(started, severity: 0.2f));
|
||||
HealthConditions.Add(b, Artificial(started, severity: 0.2f));
|
||||
|
||||
HealthConditions.Tick(a, peopleSeed: 7, dayNumber: 100, gameMinutes: 24 * 60);
|
||||
HealthConditions.Tick(b, peopleSeed: 7, dayNumber: 101, gameMinutes: 24 * 60);
|
||||
|
||||
Assert.NotEqual(a.Conditions![0].Severity, b.Conditions![0].Severity);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void RosterJson_RoundTripsConditions_AndOmitsHealthy()
|
||||
{
|
||||
var roster = Fixtures.Generate(Fixtures.Classrooms(4));
|
||||
var pupil = roster.People.First(person => person.IsStudent && !person.IsParent);
|
||||
var started = new DateTime(2012, 4, 3, 9, 0, 0, DateTimeKind.Utc);
|
||||
HealthConditions.Add(pupil, Artificial(started, severity: 0.35f, defName: "TestCold"));
|
||||
HealthConditions.Add(
|
||||
pupil,
|
||||
new HealthCondition
|
||||
{
|
||||
DefName = "TestStomach",
|
||||
Severity = 0.15f,
|
||||
Progress = 0.05f,
|
||||
Source = "idiopathic",
|
||||
StartedAt = started.AddHours(1),
|
||||
SeverityPerDay = 0.05f,
|
||||
ProgressPerDay = 0.02f,
|
||||
});
|
||||
|
||||
var json = RosterJson.Serialize(RosterDocument.From(1, roster));
|
||||
Assert.Contains("\"conditions\"", json, StringComparison.Ordinal);
|
||||
Assert.Contains("\"defName\": \"TestCold\"", json, StringComparison.Ordinal);
|
||||
Assert.Contains("\"defName\": \"TestStomach\"", json, StringComparison.Ordinal);
|
||||
|
||||
var healthy = roster.People.First(person => person.Conditions is null || person.Conditions.Count == 0);
|
||||
var healthySlice = PersonJsonSlice(json, healthy.Id);
|
||||
Assert.DoesNotContain("\"conditions\"", healthySlice, StringComparison.Ordinal);
|
||||
|
||||
var loaded = RosterJson.Parse(json).ToRoster();
|
||||
var loadedPupil = loaded.People.First(person => person.Id.Equals(pupil.Id, StringComparison.Ordinal));
|
||||
Assert.NotNull(loadedPupil.Conditions);
|
||||
Assert.Equal(2, loadedPupil.Conditions!.Count);
|
||||
Assert.Equal("TestCold", loadedPupil.Conditions[0].DefName);
|
||||
Assert.Equal(0.35f, loadedPupil.Conditions[0].Severity);
|
||||
Assert.Equal("cold", loadedPupil.Conditions[0].Source);
|
||||
Assert.Equal(started, loadedPupil.Conditions[0].StartedAt);
|
||||
Assert.Equal("TestStomach", loadedPupil.Conditions[1].DefName);
|
||||
Assert.Equal(0.15f, loadedPupil.Conditions[1].Severity);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void TwoConditions_DoNotOverwriteEachOther()
|
||||
{
|
||||
var person = Blank("p1");
|
||||
var started = new DateTime(2012, 4, 3, 8, 0, 0, DateTimeKind.Utc);
|
||||
HealthConditions.Add(person, Artificial(started, severity: 0.4f, defName: "A"));
|
||||
HealthConditions.Add(person, Artificial(started, severity: 0.1f, defName: "B"));
|
||||
|
||||
Assert.Equal(2, person.Conditions!.Count);
|
||||
Assert.Equal("A", person.Conditions[0].DefName);
|
||||
Assert.Equal(0.4f, person.Conditions[0].Severity);
|
||||
Assert.Equal("B", person.Conditions[1].DefName);
|
||||
Assert.Equal(0.1f, person.Conditions[1].Severity);
|
||||
|
||||
HealthConditions.Tick(person, peopleSeed: 3, dayNumber: 50, gameMinutes: 60);
|
||||
Assert.Equal(2, person.Conditions.Count);
|
||||
Assert.Equal("A", person.Conditions[0].DefName);
|
||||
Assert.Equal("B", person.Conditions[1].DefName);
|
||||
Assert.True(person.Conditions[0].Severity > 0.4f);
|
||||
Assert.True(person.Conditions[1].Severity > 0.1f);
|
||||
}
|
||||
|
||||
private static HealthCondition Artificial(
|
||||
DateTime started,
|
||||
float severity,
|
||||
string defName = "TestCold") =>
|
||||
new()
|
||||
{
|
||||
DefName = defName,
|
||||
Severity = severity,
|
||||
Progress = 0f,
|
||||
Source = "cold",
|
||||
StartedAt = DateTime.SpecifyKind(started, DateTimeKind.Utc),
|
||||
SeverityPerDay = 0.2f,
|
||||
ProgressPerDay = 0.1f,
|
||||
};
|
||||
|
||||
private static string PersonJsonSlice(string json, string personId)
|
||||
{
|
||||
var marker = $"\"id\": \"{personId}\"";
|
||||
var start = json.IndexOf(marker, StringComparison.Ordinal);
|
||||
Assert.True(start >= 0);
|
||||
var end = json.IndexOf("},", start, StringComparison.Ordinal);
|
||||
if (end < 0)
|
||||
{
|
||||
end = json.Length;
|
||||
}
|
||||
|
||||
return json[start..end];
|
||||
}
|
||||
|
||||
private static Person Blank(string id)
|
||||
{
|
||||
var cases = new CaseTable
|
||||
{
|
||||
Nom = id,
|
||||
Gen = id,
|
||||
Dat = id,
|
||||
Acc = id,
|
||||
Ins = id,
|
||||
Pre = id,
|
||||
};
|
||||
return new Person
|
||||
{
|
||||
Id = id,
|
||||
FamilyId = "f",
|
||||
Female = false,
|
||||
BirthDate = new DateTime(2000, 1, 1, 0, 0, 0, DateTimeKind.Utc),
|
||||
Name = new PersonName(id, id, id, cases, cases, cases),
|
||||
IsStudent = true,
|
||||
IsStaff = false,
|
||||
IsParent = false,
|
||||
Numbers = new Dictionary<string, int>(StringComparer.Ordinal),
|
||||
Choices = new Dictionary<string, string>(StringComparer.Ordinal),
|
||||
Skills = new Dictionary<string, int>(StringComparer.Ordinal),
|
||||
Traits = [],
|
||||
Needs = new Dictionary<string, float>(StringComparer.Ordinal),
|
||||
Opinions = new Dictionary<string, int>(StringComparer.Ordinal),
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,144 @@
|
||||
using Arch.Core;
|
||||
using HSchool.Ai;
|
||||
using HSchool.Content;
|
||||
using HSchool.People;
|
||||
using HSchool.Schedule;
|
||||
|
||||
namespace HSchool.Simulation.Tests;
|
||||
|
||||
public class HealthConditionSystemTests
|
||||
{
|
||||
private static readonly DateTime TuesdayLesson = new(2012, 4, 3, 8, 30, 0, DateTimeKind.Utc);
|
||||
|
||||
[Fact]
|
||||
public void SameSeed_SchoolTick_YieldsSameSeverity()
|
||||
{
|
||||
using var first = OpenStaffed();
|
||||
using var second = OpenStaffed();
|
||||
var pupilId = first.Roster!.People.First(person => person.IsStudent && !person.IsParent).Id;
|
||||
HangArtificial(first, pupilId, severity: 0.25f);
|
||||
HangArtificial(second, pupilId, severity: 0.25f);
|
||||
|
||||
TickMinutes(first, 60);
|
||||
TickMinutes(second, 60);
|
||||
|
||||
var a = first.Roster.People.First(person => person.Id == pupilId).Conditions![0].Severity;
|
||||
var b = second.Roster!.People.First(person => person.Id == pupilId).Conditions![0].Severity;
|
||||
Assert.Equal(a, b);
|
||||
Assert.True(a > 0.25f);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Hunger_StillDecaysWhileConditionTicks()
|
||||
{
|
||||
using var school = OpenStaffed();
|
||||
AdvanceTo(school, TuesdayLesson);
|
||||
var onCampus = school.CapturePresence().First(row => row.NodeId is not null);
|
||||
var pupil = school.Roster!.People.First(person => person.Id.Equals(onCampus.PersonId, StringComparison.Ordinal));
|
||||
HangArtificial(school, pupil.Id, severity: 0.2f);
|
||||
|
||||
var hungerBefore = ReadHunger(school, pupil.Id);
|
||||
var severityBefore = pupil.Conditions![0].Severity;
|
||||
|
||||
TickMinutes(school, 60);
|
||||
|
||||
var hungerAfter = ReadHunger(school, pupil.Id);
|
||||
var severityAfter = pupil.Conditions[0].Severity;
|
||||
var catalogHunger = school.Catalog!.Needs["Hunger"];
|
||||
Assert.True(hungerAfter < hungerBefore);
|
||||
Assert.Equal(hungerBefore - catalogHunger.DecayPerHour, hungerAfter, precision: 3);
|
||||
Assert.True(severityAfter > severityBefore);
|
||||
}
|
||||
|
||||
private static void HangArtificial(School school, string personId, float severity)
|
||||
{
|
||||
var person = school.Roster!.People.First(row => row.Id.Equals(personId, StringComparison.Ordinal));
|
||||
HealthConditions.Add(
|
||||
person,
|
||||
new HealthCondition
|
||||
{
|
||||
DefName = "TestCold",
|
||||
Severity = severity,
|
||||
Progress = 0f,
|
||||
Source = "dev",
|
||||
StartedAt = school.Clock.Time,
|
||||
SeverityPerDay = 0.5f,
|
||||
ProgressPerDay = 0.1f,
|
||||
});
|
||||
}
|
||||
|
||||
private static float ReadHunger(School school, string personId)
|
||||
{
|
||||
var value = float.NaN;
|
||||
var query = new QueryDescription().WithAll<PersonIdentity, PersonNeeds>();
|
||||
school.World.Query(
|
||||
in query,
|
||||
(ref PersonIdentity identity, ref PersonNeeds needs) =>
|
||||
{
|
||||
if (identity.Id.Equals(personId, StringComparison.Ordinal))
|
||||
{
|
||||
value = needs.Values["Hunger"];
|
||||
}
|
||||
});
|
||||
Assert.False(float.IsNaN(value));
|
||||
return value;
|
||||
}
|
||||
|
||||
private static void TickMinutes(School school, int minutes)
|
||||
{
|
||||
for (var i = 0; i < minutes; i++)
|
||||
{
|
||||
school.Tick(0.2d, 5d);
|
||||
}
|
||||
}
|
||||
|
||||
private static void AdvanceTo(School school, DateTime until)
|
||||
{
|
||||
while (school.Clock.Time < until)
|
||||
{
|
||||
school.Tick(0.2d, 5d);
|
||||
}
|
||||
}
|
||||
|
||||
private static School OpenStaffed()
|
||||
{
|
||||
var start = new DateTime(2012, 4, 3, 6, 0, 0, DateTimeKind.Utc);
|
||||
var (catalog, map) = Vanilla();
|
||||
var roster = RosterGenerator.Generate(catalog, map, schoolSeed: 1, "Russia", start);
|
||||
var pool = ApplicantPool.Create(catalog, roster, schoolSeed: 1, "Russia", start);
|
||||
var schoolClass = roster.Classes.First(row =>
|
||||
row.RoomId is "classroom-101" or "classroom-102" or "classroom-103" or "classroom-104");
|
||||
var school = School.Create(1, "Здоровье", start, catalog, map);
|
||||
school.InstallPeople(roster, seed: 1, "Russia", pool);
|
||||
school.SetTimetable(new Timetable(
|
||||
[
|
||||
new LessonPlacement(schoolClass.Id, "Mathematics", "t1", schoolClass.RoomId, Day: 1, Period: 1),
|
||||
new LessonPlacement(schoolClass.Id, "PhysicalEducation", "t2", "gym-hall", Day: 1, Period: 2),
|
||||
],
|
||||
[]));
|
||||
school.ConfigurePresence(weekDays: 5, maxDecisionsPerTick: 10_000);
|
||||
return school;
|
||||
}
|
||||
|
||||
private static (DefCatalog Catalog, MapLayout Map) Vanilla()
|
||||
{
|
||||
var root = Path.Combine(AppContext.BaseDirectory, "vanilla");
|
||||
var documents = new List<ContentDocument>();
|
||||
foreach (var path in Directory.EnumerateFiles(root, "*.*", SearchOption.AllDirectories))
|
||||
{
|
||||
if (!path.EndsWith(".jsonc", StringComparison.OrdinalIgnoreCase)
|
||||
&& !path.EndsWith(".json", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
var relative = Path.GetRelativePath(root, path).Replace('\\', '/');
|
||||
documents.Add(new ContentDocument(CatalogLoader.CorePackId, relative, File.ReadAllText(path)));
|
||||
}
|
||||
|
||||
var catalog = new CatalogLoader().Load([CatalogLoader.CorePackId], documents);
|
||||
var map = CatalogLoader.LastDefaultMap([CatalogLoader.CorePackId], documents);
|
||||
Assert.NotNull(map);
|
||||
return (catalog, map);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user