Speed up ExpressionKey's comparison. #2129
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Santarh
changed the title
Santarh
commented
Aug 15, 2023
| @@ -145,19 +146,24 @@ public static ExpressionKey CreateFromPreset(ExpressionPreset preset) | |||
|
|
|||
| public override string ToString() | |||
| { | |||
| return _id.Replace(UnknownPresetPrefix, ""); | |||
| return Name; | |||
There was a problem hiding this comment.
The behaviour has not changed.
|
|
||
| if (Preset != other.Preset) return false; | ||
| if (Preset != ExpressionPreset.custom) return true; | ||
| return Name == other.Name; |
There was a problem hiding this comment.
Fast comparison by early pruning via _hashCode
and
Accurate equality comparison when _hashCodes are collided.
| m_clipMap = expressions.Clips.ToDictionary( | ||
| x => expressions.CreateKey(x.Clip), | ||
| x => x.Clip, | ||
| ExpressionKey.Comparer |
There was a problem hiding this comment.
Pass IEqualityComparer<ExpressionKey>
Santarh
commented
Aug 15, 2023
| // { | ||
| // return this.Equals(CreateFromClip(clip)); | ||
| // } | ||
|
|
||
| public int CompareTo(ExpressionKey other) |
There was a problem hiding this comment.
実は CompareTo バグってね？と気づいたけど、いったんここでは破壊的変更はしないということでスルー
Santarh
commented
Aug 15, 2023
| @@ -192,5 +193,20 @@ public SubAssetKey SubAssetKey | |||
| return new SubAssetKey(typeof(VRM10Expression), this.ToString()); | |||
| } | |||
| } | |||
|
|
|||
| public static IEqualityComparer<ExpressionKey> Comparer { get; } = new EqualityComparer(); | |||
There was a problem hiding this comment.
IEqualityComparer<ExpressionKey> はユーザにも公開されていると嬉しいので public で公開する
Santarh
commented
Aug 15, 2023
|
|
||
| namespace UniVRM10.Test | ||
| { | ||
| public sealed class ExpressionKeyTests |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
毎フレーム呼び出される
Vrm10RuntimeExpression中の処理でExpressionKeyの Dictionary Key としての比較処理がそこそこ負荷が高い。これを public な挙動を変更せずに改善する。
13 % くらいは高速化した、かも。