Checked LINQ queries and collections for inefficiencies.

- Made Array.IndexOf available via extension method.
- Made ToHashSet extension method.
- Change collections queried often via Contains into sets.
- Avoid Count() extension if Count or Length property exist.
- Made Count() > 0 checks and variations calls to Any() instead.
- Don't call ToList/ToArray if there is no benefit to materializing the sequence.
- If the sequence does benefit from materialization, follow this general pattern:
  - Collection queried often via Contains use ToHashSet to speed up lookups.
  - Short lived variables use ToList. This is because ToArray requires an extra copy to output the final size.
  - Collections persisted into fields or for a long time use ToArray to minimize memory overhead.
This commit is contained in:
RoosterDragon
2014-05-23 19:52:44 +01:00
committed by RoosterDragon
parent f5f3747338
commit 82bea961ba
44 changed files with 151 additions and 126 deletions

View File

@@ -218,7 +218,7 @@ namespace OpenRA.Mods.RA.AI
if (!buildableThings.Any())
return null;
var unit = buildableThings.ElementAtOrDefault(Random.Next(buildableThings.Count()));
var unit = buildableThings.Random(Random);
return HasAdequateAirUnits(unit) ? unit : null;
}
@@ -231,11 +231,11 @@ namespace OpenRA.Mods.RA.AI
var myUnits = Player.World
.ActorsWithTrait<IPositionable>()
.Where(a => a.Actor.Owner == Player)
.Select(a => a.Actor.Info.Name).ToArray();
.Select(a => a.Actor.Info.Name).ToList();
foreach (var unit in Info.UnitsToBuild.Shuffle(Random))
if (buildableThings.Any(b => b.Name == unit.Key))
if (myUnits.Count(a => a == unit.Key) < unit.Value * myUnits.Length)
if (myUnits.Count(a => a == unit.Key) < unit.Value * myUnits.Count)
if (HasAdequateAirUnits(Map.Rules.Actors[unit.Key]))
return Map.Rules.Actors[unit.Key];
@@ -463,12 +463,9 @@ namespace OpenRA.Mods.RA.AI
{
var enemyUnits = World.FindActorsInCircle(pos, radius)
.Where(unit => Player.Stances[unit.Owner] == Stance.Enemy &&
!unit.HasTrait<Husk>() && unit.HasTrait<ITargetable>()).ToList();
!unit.HasTrait<Husk>() && unit.HasTrait<ITargetable>());
if (enemyUnits.Count > 0)
return enemyUnits.ClosestTo(pos);
return null;
return enemyUnits.ClosestTo(pos);
}
List<Actor> FindEnemyConstructionYards()
@@ -645,7 +642,7 @@ namespace OpenRA.Mods.RA.AI
{
var ownUnits = World.FindActorsInCircle(World.Map.CenterOfCell(BaseCenter), WRange.FromCells(Info.ProtectUnitScanRadius))
.Where(unit => unit.Owner == Player && !unit.HasTrait<Building>()
&& unit.HasTrait<AttackBase>()).ToList();
&& unit.HasTrait<AttackBase>());
foreach (var a in ownUnits)
protectSq.Units.Add(a);