From c0590e6c0daa3acbff876152972697ddb147e5a7 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Wed, 4 Nov 2015 09:13:44 +0100
Subject: [PATCH] re-enable SI::HasEqualUnit - no significant performance
impact
---
VectoCore/Utils/SI.cs | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/VectoCore/Utils/SI.cs b/VectoCore/Utils/SI.cs
index cfcb7d3b3d..f4f772d28f 100644
--- a/VectoCore/Utils/SI.cs
+++ b/VectoCore/Utils/SI.cs
@@ -1627,16 +1627,15 @@ namespace TUGraz.VectoCore.Utils
[DebuggerHidden]
public bool HasEqualUnit(SI si)
{
- return true;
- //Contract.Requires(si != null);
- //if (Numerator.SequenceEqual(si.Numerator) && Denominator.SequenceEqual(si.Denominator)) {
- // return true;
- //}
- //return ToBasicUnits()
- // .Denominator.OrderBy(x => x)
- // .SequenceEqual(si.ToBasicUnits().Denominator.OrderBy(x => x))
- // &&
- // ToBasicUnits().Numerator.OrderBy(x => x).SequenceEqual(si.ToBasicUnits().Numerator.OrderBy(x => x));
+ Contract.Requires(si != null);
+ if (Numerator.SequenceEqual(si.Numerator) && Denominator.SequenceEqual(si.Denominator)) {
+ return true;
+ }
+ return ToBasicUnits()
+ .Denominator.OrderBy(x => x)
+ .SequenceEqual(si.ToBasicUnits().Denominator.OrderBy(x => x))
+ &&
+ ToBasicUnits().Numerator.OrderBy(x => x).SequenceEqual(si.ToBasicUnits().Numerator.OrderBy(x => x));
}
/// <summary>
--
GitLab