b7e0ed9b87
When handling the Nodes collection in MiniYaml, individual nodes are located via one of two methods:
// Lookup a single key with linear search.
var node = yaml.Nodes.FirstOrDefault(n => n.Key == "SomeKey");
// Convert to dictionary, expecting many key lookups.
var dict = nodes.ToDictionary();
// Lookup a single key in the dictionary.
var node = dict["SomeKey"];
To simplify lookup of individual keys via linear search, provide helper methods NodeWithKeyOrDefault and NodeWithKey. These helpers do the equivalent of Single{OrDefault} searches. Whilst this requires checking the whole list, it provides a useful correctness check. Two duplicated keys in TS yaml are fixed as a result. We can also optimize the helpers to not use LINQ, avoiding allocation of the delegate to search for a key.
Adjust existing code to use either lnear searches or dictionary lookups based on whether it will be resolving many keys. Resolving few keys can be done with linear searches to avoid building a dictionary. Resolving many keys should be done with a dictionary to avoid quaradtic runtime from repeated linear searches.
61 lines
1.6 KiB
C#
61 lines
1.6 KiB
C#
#region Copyright & License Information
|
|
/*
|
|
* Copyright (c) The OpenRA Developers and Contributors
|
|
* This file is part of OpenRA, which is free software. It is made
|
|
* available to you under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation, either version 3 of
|
|
* the License, or (at your option) any later version. For more
|
|
* information, see COPYING.
|
|
*/
|
|
#endregion
|
|
|
|
using System.Collections.Generic;
|
|
|
|
namespace OpenRA
|
|
{
|
|
public class GameSpeed
|
|
{
|
|
[TranslationReference]
|
|
[FieldLoader.Require]
|
|
public readonly string Name;
|
|
|
|
[FieldLoader.Require]
|
|
public readonly int Timestep;
|
|
|
|
[FieldLoader.Require]
|
|
public readonly int OrderLatency;
|
|
}
|
|
|
|
public class GameSpeeds : IGlobalModData
|
|
{
|
|
[FieldLoader.Require]
|
|
public readonly string DefaultSpeed;
|
|
|
|
[FieldLoader.LoadUsing(nameof(LoadSpeeds))]
|
|
public readonly Dictionary<string, GameSpeed> Speeds;
|
|
|
|
static object LoadSpeeds(MiniYaml y)
|
|
{
|
|
var ret = new Dictionary<string, GameSpeed>();
|
|
var speedsNode = y.NodeWithKeyOrDefault("Speeds");
|
|
if (speedsNode == null)
|
|
throw new YamlException("Error parsing GameSpeeds: Missing Speeds node!");
|
|
|
|
foreach (var node in speedsNode.Value.Nodes)
|
|
{
|
|
try
|
|
{
|
|
ret.Add(node.Key, FieldLoader.Load<GameSpeed>(node.Value));
|
|
}
|
|
catch (FieldLoader.MissingFieldsException e)
|
|
{
|
|
var label = e.Missing.Length > 1 ? "Required properties missing" : "Required property missing";
|
|
throw new YamlException($"Error parsing GameSpeed {node.Key}: {label}: {e.Missing.JoinWith(", ")}");
|
|
}
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
}
|
|
}
|