Merge branch 'review/slice-9-ab'
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
Leonid Pershin
Cursor
@@ -113,6 +113,112 @@ public class TalkCirclesTests
|
||||
Assert.True(high > low);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void NodeFriendScore_PullsTowardFriends_NotEnemies()
|
||||
{
|
||||
var (catalog, _, _) = World();
|
||||
var opinions = new Dictionary<string, int>(StringComparer.Ordinal)
|
||||
{
|
||||
["friend"] = 50,
|
||||
["enemy"] = -50,
|
||||
};
|
||||
var nodes = new Dictionary<string, string>(StringComparer.Ordinal)
|
||||
{
|
||||
["friend"] = "corridor-a",
|
||||
["enemy"] = "corridor-b",
|
||||
};
|
||||
var context = new TalkPlannerContext("self", opinions, nodes, null, false, true, catalog.BehaviorRules);
|
||||
Assert.True(TalkCircles.NodeFriendScore("corridor-a", "self", context) > 0);
|
||||
Assert.True(TalkCircles.NodeFriendScore("corridor-b", "self", context) < 0);
|
||||
Assert.Equal(0f, TalkCircles.NodeFriendScore("corridor-a", "self", context with { FriendPullActive = false }));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void LunchNodeBlockedByEnemy_OnlyWhenAnotherSeatExists()
|
||||
{
|
||||
var (catalog, _, _) = World();
|
||||
var opinions = new Dictionary<string, int>(StringComparer.Ordinal) { ["enemy"] = -50 };
|
||||
var nodes = new Dictionary<string, string>(StringComparer.Ordinal) { ["enemy"] = "canteen-1" };
|
||||
var context = new TalkPlannerContext("self", opinions, nodes, null, false, true, catalog.BehaviorRules);
|
||||
Assert.True(TalkCircles.LunchNodeBlockedByEnemy("canteen-1", "self", context, hasAlternative: true));
|
||||
Assert.False(TalkCircles.LunchNodeBlockedByEnemy("canteen-1", "self", context, hasAlternative: false));
|
||||
Assert.False(TalkCircles.LunchNodeBlockedByEnemy("canteen-2", "self", context, hasAlternative: true));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void GossipAndOutgoing_UseTraitFields_NotHardcodedIdLists()
|
||||
{
|
||||
var (catalog, _, _) = World();
|
||||
Assert.True(catalog.Traits["Gossip"].TalkOpinionMultiplier > 1f);
|
||||
Assert.Contains(catalog.Traits["Gossip"].TalkTagWeights, bias => bias.Tag.Equals("gossip", StringComparison.Ordinal));
|
||||
Assert.True(catalog.Traits["Outgoing"].TalkInitiative > 1f);
|
||||
Assert.Equal(1, catalog.Traits["Outgoing"].TalkCircleBonus);
|
||||
Assert.True(TalkCircles.OpinionMultiplier(["Gossip"], catalog) > TalkCircles.OpinionMultiplier([], catalog));
|
||||
Assert.True(TalkCircles.Initiative(["Outgoing"], catalog) > TalkCircles.Initiative([], catalog));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void GossipTrait_BiasesPickTopicTowardGossipTag()
|
||||
{
|
||||
var (catalog, _, _) = World();
|
||||
var gossip = Person("g", ["RussianLanguage"]) with { Traits = ["Gossip"] };
|
||||
var plain = Person("p", ["RussianLanguage"]);
|
||||
var gossipHits = 0;
|
||||
var plainHits = 0;
|
||||
for (var i = 0; i < 200; i++)
|
||||
{
|
||||
var seed = Seed.Mix(i, 17, Seed.ApparelSalt);
|
||||
var gossipId = TalkCircles.PickTopic(catalog, gossip, age: 14, seed);
|
||||
var plainId = TalkCircles.PickTopic(catalog, plain, age: 14, seed);
|
||||
if (gossipId is not null && catalog.Topics[gossipId].Tags.Contains("gossip", StringComparer.Ordinal))
|
||||
{
|
||||
gossipHits++;
|
||||
}
|
||||
|
||||
if (plainId is not null && catalog.Topics[plainId].Tags.Contains("gossip", StringComparer.Ordinal))
|
||||
{
|
||||
plainHits++;
|
||||
}
|
||||
}
|
||||
|
||||
Assert.True(gossipHits > plainHits);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void PickTopic_IsNotAlwaysTheLastNameAlphabetically()
|
||||
{
|
||||
var (catalog, _, _) = World();
|
||||
var picker = Person("a", ["RussianLanguage"]);
|
||||
var picked = new HashSet<string>(StringComparer.Ordinal);
|
||||
for (var i = 0; i < 80; i++)
|
||||
{
|
||||
var id = TalkCircles.PickTopic(catalog, picker, age: 14, Seed.Mix(i, 3, Seed.ApparelSalt));
|
||||
Assert.NotNull(id);
|
||||
picked.Add(id!);
|
||||
}
|
||||
|
||||
Assert.True(picked.Count >= 3);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void AppearanceTopic_UsesDressAppropriateness()
|
||||
{
|
||||
Assert.Equal(2, TalkCircles.AppearanceModifier(ApparelIssue.None));
|
||||
Assert.Equal(-2, TalkCircles.AppearanceModifier(ApparelIssue.Formality));
|
||||
Assert.Equal(0, TalkCircles.AppearanceModifier(ApparelIssue.Color));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void CommunicationGain_IsLessThanLessonSkillPerHour()
|
||||
{
|
||||
var (catalog, _, _) = World();
|
||||
var rules = catalog.BehaviorRules!;
|
||||
Assert.True(rules.TalkSkillPerHour < rules.LessonSkillPerHour);
|
||||
var skill = catalog.Skills["Communication"];
|
||||
var afterTalkHour = TalkCircles.CommunicationGain(50f, skill, 1f, rules);
|
||||
Assert.Equal(50f + rules.TalkSkillPerHour, afterTalkHour);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Enemies_AreNotRankedAsInvitees()
|
||||
{
|
||||
|
||||
@@ -52,4 +52,44 @@ public class OpinionGeneratorTests
|
||||
Assert.True(child.Opinions.TryGetValue(parentId, out var childView));
|
||||
Assert.NotEqual(parentView, childView);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void RosterJson_RoundTripsFamilyOpinions()
|
||||
{
|
||||
var roster = Fixtures.Generate(Fixtures.Classrooms(4));
|
||||
var child = roster.People.First(person => person.IsStudent && !person.IsParent);
|
||||
var parentId = roster.Families.Single(row => row.Id.Equals(child.FamilyId, StringComparison.Ordinal)).ParentIds[0];
|
||||
Assert.True(child.Opinions.TryGetValue(parentId, out var before));
|
||||
|
||||
var loaded = RosterJson.Parse(RosterJson.Serialize(RosterDocument.From(1, roster))).ToRoster();
|
||||
var loadedChild = loaded.People.First(person => person.Id.Equals(child.Id, StringComparison.Ordinal));
|
||||
Assert.Equal(before, loadedChild.Opinions[parentId]);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void SaveWithoutOpinionsField_SeedsFamilyOnLoad()
|
||||
{
|
||||
var roster = Fixtures.Generate(Fixtures.Classrooms(4));
|
||||
var json = RosterJson.Serialize(RosterDocument.From(1, roster));
|
||||
var node = System.Text.Json.Nodes.JsonNode.Parse(json)!;
|
||||
foreach (var person in node["people"]!.AsArray())
|
||||
{
|
||||
person!.AsObject().Remove("opinions");
|
||||
}
|
||||
|
||||
var stripped = RosterJson.Parse(node.ToJsonString()).ToRoster();
|
||||
Assert.True(OpinionGenerator.NeedsFamilyOpinions(stripped));
|
||||
Assert.All(stripped.People, person => Assert.Empty(person.Opinions));
|
||||
|
||||
var seeded = OpinionGenerator.SeedFamily(Fixtures.Catalog(), stripped);
|
||||
Assert.False(OpinionGenerator.NeedsFamilyOpinions(seeded));
|
||||
var child = seeded.People.First(person => person.IsStudent && !person.IsParent);
|
||||
var family = seeded.Families.Single(row => row.Id.Equals(child.FamilyId, StringComparison.Ordinal));
|
||||
Assert.NotEmpty(family.ParentIds);
|
||||
foreach (var parentId in family.ParentIds)
|
||||
{
|
||||
Assert.True(child.Opinions.TryGetValue(parentId, out var toParent));
|
||||
Assert.True(toParent > 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,56 @@
|
||||
namespace HSchool.People.Tests;
|
||||
|
||||
public class OpinionStoreTests
|
||||
{
|
||||
[Fact]
|
||||
public void SetZero_RemovesTheEntry()
|
||||
{
|
||||
var person = Blank("a");
|
||||
Assert.True(OpinionStore.Set(person, "b", 12));
|
||||
Assert.Equal(12, OpinionStore.Get(person, "b"));
|
||||
|
||||
Assert.True(OpinionStore.Set(person, "b", 0));
|
||||
Assert.Null(OpinionStore.Get(person, "b"));
|
||||
Assert.False(person.Opinions.ContainsKey("b"));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Set_ClampsToMinusOneHundredAndOneHundred()
|
||||
{
|
||||
var person = Blank("a");
|
||||
OpinionStore.Set(person, "b", 500);
|
||||
Assert.Equal(100, person.Opinions["b"]);
|
||||
OpinionStore.Set(person, "b", -500);
|
||||
Assert.Equal(-100, person.Opinions["b"]);
|
||||
}
|
||||
|
||||
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),
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -63,6 +63,22 @@ public class MorningOpinionsTests
|
||||
Assert.True(after < before);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void DriftToZero_DropsTheRecord()
|
||||
{
|
||||
using var school = OpenStaffed();
|
||||
var child = school.Roster!.People.First(person => person.IsStudent && !person.IsParent);
|
||||
var classmate = school.Roster.People.First(person =>
|
||||
person.IsStudent
|
||||
&& !person.Id.Equals(child.Id, StringComparison.Ordinal)
|
||||
&& !OpinionStore.FamilyMemberIds(school.Roster, child).Contains(person.Id));
|
||||
var drift = school.Catalog!.BehaviorRules!.OpinionDriftPerMorning;
|
||||
OpinionStore.Set(child, classmate.Id, Math.Min(2, drift));
|
||||
|
||||
Assert.True(MorningOpinions.Apply(school));
|
||||
Assert.False(child.Opinions.ContainsKey(classmate.Id));
|
||||
}
|
||||
|
||||
private static void AdvanceTo(School school, DateTime until)
|
||||
{
|
||||
while (school.Clock.Time < until)
|
||||
|
||||
@@ -151,6 +151,28 @@ public class TalkCircleTests
|
||||
}
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void TalkCircleFinish_MarksTickPeopleChangedSoSaveWritesOpinions()
|
||||
{
|
||||
var (school, first, second) = TwoPupilsOnBreak();
|
||||
using (school)
|
||||
{
|
||||
OpinionStore.Set(first, second.Id, 10);
|
||||
PlaceAt(school, first.Id, "corridor-1");
|
||||
PlaceAt(school, second.Id, "corridor-1");
|
||||
Assert.True(school.TryStartAction(first.Id, TalkActions.Chat));
|
||||
|
||||
var peopleChanged = false;
|
||||
while (ActivityOf(school, first.Id) is not null)
|
||||
{
|
||||
peopleChanged |= school.Tick(0.2d, 5d);
|
||||
}
|
||||
|
||||
Assert.True(peopleChanged);
|
||||
Assert.NotEqual(10, OpinionStore.Get(first, second.Id));
|
||||
}
|
||||
}
|
||||
|
||||
private static (School School, Person First, Person Second) TwoPupilsWithPhonesOnBreak()
|
||||
{
|
||||
var (catalog, map) = Vanilla();
|
||||
|
||||
@@ -134,6 +134,53 @@ public class WhisperTests
|
||||
}
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void CaughtWhisper_BecomesDisciplineTalkWithTeacher()
|
||||
{
|
||||
var (school, homeroom, firstId, secondId, teacherId) = TwoPupilsAndTeacher();
|
||||
using (school)
|
||||
{
|
||||
AdvanceTo(school, LessonStart);
|
||||
var converted = false;
|
||||
for (var i = 0; i < 24; i++)
|
||||
{
|
||||
school.Clock.JumpTo(LessonStart.AddMinutes(i));
|
||||
TalkCircleSystem.Interrupt(school, firstId);
|
||||
TalkCircleSystem.Interrupt(school, secondId);
|
||||
TalkCircleSystem.Interrupt(school, teacherId);
|
||||
var schoolClass = school.Roster!.Classes.First(row => row.PupilIds.Contains(firstId));
|
||||
foreach (var id in schoolClass.PupilIds)
|
||||
{
|
||||
PlaceAt(school, id, id == firstId || id == secondId ? homeroom : "corridor-1");
|
||||
}
|
||||
|
||||
PlaceAt(school, firstId, homeroom);
|
||||
PlaceAt(school, secondId, homeroom);
|
||||
PlaceAt(school, teacherId, homeroom);
|
||||
Assert.True(school.TryStartAction(firstId, TalkActions.Whisper));
|
||||
TalkCircleSystem.Apply(school, 0.2d);
|
||||
if (!school.DayLog.Any(row =>
|
||||
(row.PersonId == firstId || row.PersonId == secondId)
|
||||
&& row.Type.Equals(PersonLogTypes.TeacherInterrupted, StringComparison.Ordinal)
|
||||
&& row.Time == school.Clock.Time))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
Assert.Equal(TalkActions.TeacherTalk, ActivityOf(school, firstId));
|
||||
Assert.Equal(TalkActions.TeacherTalk, ActivityOf(school, teacherId));
|
||||
var circle = school.TalkCircleOf(firstId);
|
||||
Assert.NotNull(circle);
|
||||
Assert.Equal(TeacherTopics.Discipline, circle.TopicId);
|
||||
Assert.Contains(teacherId, circle.MemberIds);
|
||||
converted = true;
|
||||
break;
|
||||
}
|
||||
|
||||
Assert.True(converted);
|
||||
}
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void OrdinaryChat_DoesNotStartOnLesson()
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user