Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion Soccer/Knowledge/Knowledge.AttackerDecision.cs
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,15 @@ private void UpdateAttackerDecisions()
_attackerDecisions[robotId] = BuildAttackerDecision(assignment.Robot, attackerRole);
}

foreach (var robotId in _passShootHysteresisByRobot.Keys.Where(id => !assignedAttackers.Contains(id)).ToList())
var keysToRemove = new List<int>();
foreach (var robotId in _passShootHysteresisByRobot.Keys)
{
if (!assignedAttackers.Contains(robotId))
{
keysToRemove.Add(robotId);
}
}
foreach (var robotId in keysToRemove)
{
_passShootHysteresisByRobot.Remove(robotId);
}
Expand Down
3 changes: 0 additions & 3 deletions Soccer/Knowledge/Knowledge.Defense.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@ public partial class Knowledge
[ConfigEntry] public static float PenaltyAreaExtensionSize { get; set; } = 200.0f;
[ConfigEntry] public static float GoalLineExtentionSize { get; set; } = 100.0f;

private Common.Data.Ssl.Gc.Command? _lastRefCommand;
private Common.Time.Timestamp _oppRestartTimestamp;

public bool GoalieDiveAllowed { get; private set; }
public bool BallIsGoaling { get; private set; }
public float BallOwnGoalReachTime { get; private set; }
Expand Down
5 changes: 4 additions & 1 deletion Soccer/Plays/OurFreekick.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@ public Formation Tick()

var zones = Context.Knowledge.SortedZonesByOffense;
var bestOffenseZone = zones.Count > 0 ? zones.Peek() : null;
Draw.DrawCircle(bestOffenseZone.BestPosOffence, 200, Color.Amber, Options.Outline());
if (bestOffenseZone != null)
{
Draw.DrawCircle(bestOffenseZone.BestPosOffence, 200, Color.Amber, Options.Outline());
}
var chipperTarget = bestOffenseZone?.BestPosOffence ?? Context.Field.OppGoal();
var chipPower = 0;

Expand Down
7 changes: 3 additions & 4 deletions Soccer/Tactics/BallPlacement.cs
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ public BallPlacement(Robot.Robot robot, int placerId)
var finalBallPos = Context.Referee.DesignatedPosition();
var ballPlacer1 = GetPlacer(1);
var ballPlacer2 = GetPlacer(2);
if (ballPlacer1 == null || ballPlacer2 == null) return false;
var middle = (ballPlacer1.Position + ballPlacer2.Position) / 2.0f;
return Vector2.Distance(middle, finalBallPos) < 100f;
}, BPStateDelay);
Expand Down Expand Up @@ -311,11 +312,10 @@ public void Exit()
var ballPlacer1 = GetPlacer(1);
var ballPlacer2 = GetPlacer(2);

var direction = Vector2.Normalize((ballPlacer1.Position + ballPlacer2.Position) / 2.0f - finalBallPos);

var direction = Vector2.Zero;
if (ballPlacer1 != null && ballPlacer2 != null)
{
//var direction = Vector2.Normalize((ballPlacer1.Position + ballPlacer2.Position) / 2.0f - finalBallPos);
direction = Vector2.Normalize((ballPlacer1.Position + ballPlacer2.Position) / 2.0f - finalBallPos);
tactic._ballPlacer2FinalPos = finalBallPos +
direction *
BPKissInitDistance;
Expand All @@ -324,7 +324,6 @@ public void Exit()
BPKissInitDistance;
}

//var axis = Vector2.Normalize((ballPlacer1?.Position ?? tactic.Robot.Position) - finalBallPos);
var kissTouch2 = finalBallPos + direction * 75f;
var kissTouch1 = finalBallPos - direction * 75f;
return new GoToPoint
Expand Down
2 changes: 1 addition & 1 deletion SourceGen/SourceGen.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="5.3.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.10.0" />
</ItemGroup>

</Project>
29 changes: 23 additions & 6 deletions Vision/Tracking/RobotMerger.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,34 @@ public partial class RobotMerger
"Factor to weight stdDeviation during tracker merging, reasonable range: 1.0 - 2.0. High values lead to more jitter")]
private static float MergePower { get; set; } = 1.5f;

private readonly Dictionary<RobotId, List<RobotTracker>> _trackersById = new();

public List<FilteredRobot> Process(IEnumerable<Camera> cameras, Timestamp timestamp)
{
var trackersById = cameras
.SelectMany(camera => camera.Robots.Values)
.GroupBy(robot => robot.Id)
.ToDictionary(grouping => grouping.Key, grouping => grouping.ToList());
// Bolt: eliminates ~15-30 enumerator, closure, and dictionary allocs/frame by avoiding LINQ
foreach (var list in _trackersById.Values)
{
list.Clear();
}

foreach (var camera in cameras)
{
foreach (var tracker in camera.Robots.Values)
{
if (!_trackersById.TryGetValue(tracker.Id, out var list))
{
list = new List<RobotTracker>(8);
_trackersById[tracker.Id] = list;
}
list.Add(tracker);
}
}

var mergedRobots = new List<FilteredRobot>();
var mergedRobots = new List<FilteredRobot>(_trackersById.Count);

foreach (var (id, trackers) in trackersById)
foreach (var (id, trackers) in _trackersById)
{
if (trackers.Count == 0) continue;
mergedRobots.Add(Merge(id, trackers, timestamp));
}

Expand Down
Loading