mahalex/MatFileHandler
1
0
Fork 0
Code Issues 12 Pull Requests Actions Packages Projects Releases 9 Wiki Activity

Improve performance of reading objects

Browse Source
This commit is contained in:
Alexander Luzgarev 2024-07-24 19:10:47 +02:00
parent 404b982226
commit c0348f3e29
1 changed files with 69 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
MatFileHandler/SubsystemDataReader.cs
View File

@ -42,7 +42,7 @@ namespace MatFileHandler
var embeddedObjectPositionsToValues = ReadEmbeddedObjectPositionsToValues(info, offsets, numberOfEmbeddedObjects); var embeddedObjectPositionsToValues = ReadEmbeddedObjectPositionsToValues(info, offsets, numberOfEmbeddedObjects);
var numberOfObjects = ((offsets[5] - offsets[4]) / 24) - 1; var numberOfObjects = ((offsets[5] - offsets[4]) / 24) - 1;
var objectClasses = ReadObjectClassInformations(info, offsets, numberOfObjects); var objectClasses = ReadObjectClassInformations(info, offsets, numberOfObjects);
var numberOfObjectPositions = objectClasses.Values.Count(x => x.ObjectPosition != 0); var numberOfObjectPositions = objectClasses.NumberOfObjectPositions;
var objectPositionsToValues = ReadObjectPositionsToValues(info, offsets, numberOfObjectPositions); var objectPositionsToValues = ReadObjectPositionsToValues(info, offsets, numberOfObjectPositions);
var (classInformation, objectInformation) = var (classInformation, objectInformation) =
GatherClassAndObjectInformation( GatherClassAndObjectInformation(
@ -68,7 +68,7 @@ namespace MatFileHandler
return ReadObjectPositionsToValuesMapping(reader, numberOfObjectPositions); return ReadObjectPositionsToValuesMapping(reader, numberOfObjectPositions);
} }
private static Dictionary<int, ObjectClassInformation> ReadObjectClassInformations(byte[] info, int[] offsets, int numberOfObjects) private static ObjectClasses ReadObjectClassInformations(byte[] info, int[] offsets, int numberOfObjects)
{ {
using var stream = new MemoryStream(info, offsets[4], offsets[5] - offsets[4]); using var stream = new MemoryStream(info, offsets[4], offsets[5] - offsets[4]);
using var reader = new BinaryReader(stream); using var reader = new BinaryReader(stream);
@ -102,7 +102,7 @@ namespace MatFileHandler
GatherClassAndObjectInformation( GatherClassAndObjectInformation(
Dictionary<int, string> classIdToName, Dictionary<int, string> classIdToName,
string[] fieldNames, string[] fieldNames,
Dictionary<int, ObjectClassInformation> objectClasses, ObjectClasses objectClasses,
Dictionary<int, Dictionary<int, int>> objectPositionsToValues, Dictionary<int, Dictionary<int, int>> objectPositionsToValues,
Dictionary<int, Dictionary<int, int>> embeddedObjectPositionsToValues) Dictionary<int, Dictionary<int, int>> embeddedObjectPositionsToValues)
{ {
@ -113,8 +113,8 @@ namespace MatFileHandler
var fieldIds = new SortedSet<int>(); var fieldIds = new SortedSet<int>();
foreach (var objectPosition in objectPositionsToValues.Keys) foreach (var objectPosition in objectPositionsToValues.Keys)
{ {
var keyValuePair = objectClasses.First(pair => pair.Value.ObjectPosition == objectPosition); var foundClassId = objectClasses.GetClassIdByObjectPosition(objectPosition);
if (keyValuePair.Value.ClassId != classId) if (foundClassId != classId)
{ {
continue; continue;
} }
@ -127,8 +127,8 @@ namespace MatFileHandler
foreach (var objectPosition in embeddedObjectPositionsToValues.Keys) foreach (var objectPosition in embeddedObjectPositionsToValues.Keys)
{ {
var keyValuePair = objectClasses.First(pair => pair.Value.EmbeddedObjectPosition == objectPosition); var foundClassId = objectClasses.GetClassIdByEmbeddedObjectPosition(objectPosition);
if (keyValuePair.Value.ClassId != classId) if (foundClassId != classId)
{ {
continue; continue;
} }
@ -151,15 +151,14 @@ namespace MatFileHandler
var objectInfos = new Dictionary<int, SubsystemData.ObjectInfo>(); var objectInfos = new Dictionary<int, SubsystemData.ObjectInfo>();
foreach (var objectPosition in objectPositionsToValues.Keys) foreach (var objectPosition in objectPositionsToValues.Keys)
{ {
var keyValuePair = objectClasses.First(pair => pair.Value.ObjectPosition == objectPosition); var foundKey = objectClasses.GetKeyByObjectPosition(objectPosition);
objectInfos[keyValuePair.Key] = new SubsystemData.ObjectInfo(objectPositionsToValues[objectPosition]); objectInfos[foundKey] = new SubsystemData.ObjectInfo(objectPositionsToValues[objectPosition]);
} }
foreach (var objectPosition in embeddedObjectPositionsToValues.Keys) foreach (var embeddedObjectPosition in embeddedObjectPositionsToValues.Keys)
{ {
var keyValuePair = objectClasses.First(pair => pair.Value.EmbeddedObjectPosition == objectPosition); var foundKey = objectClasses.GetKeyByEmbeddedObjectPosition(embeddedObjectPosition);
objectInfos[keyValuePair.Key] = objectInfos[foundKey] = new SubsystemData.ObjectInfo(embeddedObjectPositionsToValues[embeddedObjectPosition]);
new SubsystemData.ObjectInfo(embeddedObjectPositionsToValues[objectPosition]);
} }
return (classInfos, objectInfos); return (classInfos, objectInfos);
@ -241,24 +240,40 @@ namespace MatFileHandler
return result; return result;
} }
private static Dictionary<int, ObjectClassInformation> ReadObjectClasses( private static ObjectClasses ReadObjectClasses(
BinaryReader reader, BinaryReader reader,
int numberOfObjects) int numberOfObjects)
{ {
var result = new Dictionary<int, ObjectClassInformation>(); var result = new Dictionary<int, ObjectClassInformation>();
var classIdFromObjectPosition = new Dictionary<int, int>();
var classIdFromEmbeddedObjectPosition = new Dictionary<int, int>();
var keyFromObjectPosition = new Dictionary<int, int>();
var keyFromEmbeddedObjectPosition = new Dictionary<int, int>();
reader.ReadBytes(24); reader.ReadBytes(24);
var numberOfObjectPositions = 0;
for (var i = 0; i < numberOfObjects; i++) for (var i = 0; i < numberOfObjects; i++)
{ {
var classId = reader.ReadInt32(); var classId = reader.ReadInt32();
reader.ReadBytes(8); reader.ReadBytes(8);
var embeddedObjectPosition = reader.ReadInt32(); var embeddedObjectPosition = reader.ReadInt32();
var objectPosition = reader.ReadInt32(); var objectPosition = reader.ReadInt32();
var loadingOrder = reader.ReadInt32(); var loadingOrder = reader.ReadInt32(); // Not used.
result[i + 1] = classIdFromObjectPosition[objectPosition] = classId;
new ObjectClassInformation(embeddedObjectPosition, objectPosition, loadingOrder, classId); classIdFromEmbeddedObjectPosition[embeddedObjectPosition] = classId;
keyFromObjectPosition[objectPosition] = i + 1;
keyFromEmbeddedObjectPosition[embeddedObjectPosition] = i + 1;
if (objectPosition != 0)
{
numberOfObjectPositions++;
}
} }
return result; return new ObjectClasses(
classIdFromObjectPosition,
classIdFromEmbeddedObjectPosition,
keyFromObjectPosition,
keyFromEmbeddedObjectPosition,
numberOfObjectPositions);
} }
private static Dictionary<int, Dictionary<int, int>> ReadObjectPositionsToValuesMapping( private static Dictionary<int, Dictionary<int, int>> ReadObjectPositionsToValuesMapping(
@ -344,5 +359,41 @@ namespace MatFileHandler
public int ObjectPosition { get; } public int ObjectPosition { get; }
} }
private class ObjectClasses
{
private readonly Dictionary<int, int> _classIdFromObjectPosition;
private readonly Dictionary<int, int> _classIdFromEmbeddedObjectPosition;
private readonly Dictionary<int, int> _keyFromObjectPosition;
private readonly Dictionary<int, int> _keyFromEmbeddedObjectPosition;
public ObjectClasses(
Dictionary<int, int> classIdFromObjectPosition,
Dictionary<int, int> classIdFromEmbeddedObjectPosition,
Dictionary<int, int> keyFromObjectPosition,
Dictionary<int, int> keyFromEmbeddedObjectPosition,
int numberOfObjectPositions)
{
_classIdFromObjectPosition = classIdFromObjectPosition;
_classIdFromEmbeddedObjectPosition = classIdFromEmbeddedObjectPosition;
_keyFromObjectPosition = keyFromObjectPosition;
_keyFromEmbeddedObjectPosition = keyFromEmbeddedObjectPosition;
NumberOfObjectPositions = numberOfObjectPositions;
}
public int NumberOfObjectPositions { get; }
public int GetClassIdByObjectPosition(int objectPosition)
=> _classIdFromObjectPosition[objectPosition];
public int GetClassIdByEmbeddedObjectPosition(int embeddedObjectPosition)
=> _classIdFromEmbeddedObjectPosition[embeddedObjectPosition];
public int GetKeyByObjectPosition(int objectPosition)
=> _keyFromObjectPosition[objectPosition];
public int GetKeyByEmbeddedObjectPosition(int embeddedObjectPosition)
=> _keyFromEmbeddedObjectPosition[embeddedObjectPosition];
}
} }
} }