removed old R# directives

aarondandy · Dec 6, 2014 · 6a8ada6 · 6a8ada6
1 parent 7e47766
commit 6a8ada6
Show file tree

Hide file tree

Showing 33 changed files with 2 additions and 161 deletions.
diff --git a/src/Vertesaur.Core/Core/Line2.cs b/src/Vertesaur.Core/Core/Line2.cs
@@ -78,7 +78,6 @@ public static Line2 Standard(double a, double b, double c) {
 
             Point2 p;
             Vector2 v;
-            // ReSharper disable CompareOfFloatsByEqualityOperator
             if (a == 0.0) {
                 p = b == 0.0
                     ? Point2.Zero
@@ -92,7 +91,6 @@ public static Line2 Standard(double a, double b, double c) {
                     : new Vector2(-p.X, (c / b) - p.Y);
             }
             return new Line2(p, v);
-            // ReSharper restore CompareOfFloatsByEqualityOperator
         }
 
         /// <summary>
@@ -257,7 +255,6 @@ object ICloneable.Clone() {
         [Pure]
         public Mbr GetMbr() {
             Contract.Ensures(Contract.Result<Mbr>() != null);
-            // ReSharper disable CompareOfFloatsByEqualityOperator
             return (
                 (Direction.X == 0.0)
                 ? (
@@ -271,7 +268,6 @@ public Mbr GetMbr() {
                     : new Mbr(Double.NegativeInfinity, Double.NegativeInfinity, Double.PositiveInfinity, Double.PositiveInfinity)
                 )
             );
-            // ReSharper restore CompareOfFloatsByEqualityOperator
         }
 
         /// <summary>
@@ -283,13 +279,11 @@ public Mbr GetMbr() {
         public double Distance(Point2 point) {
             var v0 = point - P;
             var m = Direction.GetMagnitudeSquared();
-            // ReSharper disable CompareOfFloatsByEqualityOperator
             if (m != 0.0) {
                 var aDot = Direction.Dot(v0);
                 return Math.Sqrt(v0.GetMagnitudeSquared() - ((aDot * aDot) / m));
             }
             return v0.GetMagnitude();
-            // ReSharper restore CompareOfFloatsByEqualityOperator
         }
 
         /// <summary>
@@ -301,13 +295,11 @@ public double Distance(Point2 point) {
         public double DistanceSquared(Point2 point) {
             var v0 = point - P;
             var m = Direction.GetMagnitudeSquared();
-            // ReSharper disable CompareOfFloatsByEqualityOperator
             if (m != 0.0) {
                 var aDot = Direction.Dot(v0);
                 return v0.GetMagnitudeSquared() - ((aDot * aDot) / m);
             }
             return v0.GetMagnitudeSquared();
-            // ReSharper restore CompareOfFloatsByEqualityOperator
         }
 
         /// <summary>
@@ -320,14 +312,12 @@ public bool Intersects(Point2 p) {
             // TODO: make sure the line used to test for intersection is consistent, (A,B) n P == (B,A) n P
             var v0 = p - P;
             var m = Direction.GetMagnitudeSquared();
-            // ReSharper disable CompareOfFloatsByEqualityOperator
             if (m != 0.0) {
                 var aDot = Direction.Dot(v0);
                 // NOTE: preserve the /m to be consistent with DistanceSquared
                 return v0.GetMagnitudeSquared() - ((aDot * aDot) / m) == 0.0;
             }
             return v0.X == 0.0 && v0.Y == 0.0;
-            // ReSharper restore CompareOfFloatsByEqualityOperator
         }
 
 

diff --git a/src/Vertesaur.Core/Core/LineString2.cs b/src/Vertesaur.Core/Core/LineString2.cs
@@ -226,11 +226,9 @@ public Point2 GetCentroid() {
                     ySum = ySum + ((this[i].Y + this[nextIndex].Y) * m);
                 }
 
-                // ReSharper disable CompareOfFloatsByEqualityOperator
                 if (0 != mSum) {
                     return new Point2(xSum / mSum, ySum / mSum);
                 }
-                // ReSharper restore CompareOfFloatsByEqualityOperator
             }
             return lastIndex == 0 ? this[0] : Point2.Invalid;
         }

diff --git a/src/Vertesaur.Core/Core/Matrix2.cs b/src/Vertesaur.Core/Core/Matrix2.cs
@@ -5,8 +5,6 @@
 namespace Vertesaur
 {
 
-    // ReSharper disable CompareOfFloatsByEqualityOperator
-
     /// <summary>
     /// A square matrix with two rows and two columns with an element type of double.
     /// </summary>
@@ -289,9 +287,7 @@ public override bool Equals(object obj) {
         /// A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table. 
         /// </returns>
         public override int GetHashCode() {
-            // ReSharper disable NonReadonlyFieldInGetHashCode
             return E00.GetHashCode() ^ E11.GetHashCode() ^ -OrderValue;
-            // ReSharper restore NonReadonlyFieldInGetHashCode
         }
 
         /// <summary>
@@ -731,7 +727,4 @@ public void DivideColumn(int c, double value) {
             }
         }
     }
-
-    // ReSharper restore CompareOfFloatsByEqualityOperator
-
 }
diff --git a/src/Vertesaur.Core/Core/Matrix3.cs b/src/Vertesaur.Core/Core/Matrix3.cs
@@ -5,8 +5,6 @@
 namespace Vertesaur
 {
 
-    // ReSharper disable CompareOfFloatsByEqualityOperator
-
     /// <summary>
     /// A square matrix with three rows and three columns with an element type of double.
     /// </summary>
@@ -366,9 +364,7 @@ public override bool Equals(object obj) {
         /// A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table. 
         /// </returns>
         public override int GetHashCode() {
-            // ReSharper disable NonReadonlyFieldInGetHashCode
             return E00.GetHashCode() ^ OrderValue;
-            // ReSharper restore NonReadonlyFieldInGetHashCode
         }
 
         /// <summary>

diff --git a/src/Vertesaur.Core/Core/Matrix4.cs b/src/Vertesaur.Core/Core/Matrix4.cs
@@ -5,9 +5,6 @@
 
 namespace Vertesaur
 {
-
-    // ReSharper disable CompareOfFloatsByEqualityOperator
-
     /// <summary>
     /// A square matrix with four rows and four columns with an element type of double.
     /// </summary>
@@ -338,9 +335,7 @@ private void CopyFrom(Matrix4 m) {
         /// A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table. 
         /// </returns>
         public override int GetHashCode() {
-            // ReSharper disable NonReadonlyFieldInGetHashCode
             return E00.GetHashCode() ^ OrderValue;
-            // ReSharper restore NonReadonlyFieldInGetHashCode
         }
 
         /// <summary>
@@ -932,7 +927,4 @@ public void DivideColumn(int c, double denominator) {
         }
 
     }
-
-    // ReSharper restore CompareOfFloatsByEqualityOperator
-
 }
diff --git a/src/Vertesaur.Core/Core/Mbr.cs b/src/Vertesaur.Core/Core/Mbr.cs
@@ -315,13 +315,10 @@ public bool Equals(Mbr other) {
         /// <inheritdoc/>
         public bool Equals(IMbr<double> other) {
             return !ReferenceEquals(null, other)
-                // ReSharper disable CompareOfFloatsByEqualityOperator
                 && XMin == other.XMin
                 && XMax == other.XMax
                 && YMin == other.YMin
-                && YMax == other.YMax
-                // ReSharper restore CompareOfFloatsByEqualityOperator
-            ;
+                && YMax == other.YMax;
         }
 
         /// <inheritdoc/>
@@ -477,7 +474,6 @@ public bool Overlaps(Mbr other) {
             if (null == other)
                 return false;
 
-            // ReSharper disable CompareOfFloatsByEqualityOperator
             var yMagnitude = Y.GetMagnitude();
             if (0 == X.GetMagnitude()) {
                 if (0 == yMagnitude)
@@ -496,7 +492,6 @@ public bool Overlaps(Mbr other) {
                 }
             }
             return !Equals(other) && Intersects(other);
-            // ReSharper restore CompareOfFloatsByEqualityOperator
         }
 
         /// <inheritdoc/>

diff --git a/src/Vertesaur.Core/Core/MultiLineString2.cs b/src/Vertesaur.Core/Core/MultiLineString2.cs
@@ -9,8 +9,6 @@
 namespace Vertesaur
 {
 
-    // ReSharper disable LoopCanBeConvertedToQuery
-
     /// <summary>
     /// A collection of line strings.
     /// </summary>
@@ -186,7 +184,6 @@ public Mbr GetMbr() {
         /// </summary>
         /// <returns>A centroid.</returns>
         public Point2 GetCentroid() {
-            // ReSharper disable CompareOfFloatsByEqualityOperator
             var lastIndex = Count - 1;
             if (lastIndex > 0) {
                 var mSum = 0.0;
@@ -208,7 +205,6 @@ public Point2 GetCentroid() {
             }
             Contract.Assume(this[0] != null);
             return lastIndex == 0 ? this[0].GetCentroid() : Point2.Invalid;
-            // ReSharper restore CompareOfFloatsByEqualityOperator
         }
 
         /// <summary>

diff --git a/src/Vertesaur.Core/Core/Point2.cs b/src/Vertesaur.Core/Core/Point2.cs
@@ -5,8 +5,6 @@
 namespace Vertesaur
 {
 
-    // ReSharper disable CompareOfFloatsByEqualityOperator
-
     /// <summary>
     /// A point in 2D space.
     /// </summary>
@@ -351,7 +349,4 @@ bool ISpatiallyEquatable<Point2>.SpatiallyEqual(Point2 other) {
             return Equals(other);
         }
     }
-
-    // ReSharper restore CompareOfFloatsByEqualityOperator
-
 }
diff --git a/src/Vertesaur.Core/Core/Point3.cs b/src/Vertesaur.Core/Core/Point3.cs
@@ -5,8 +5,6 @@
 namespace Vertesaur
 {
 
-    // ReSharper disable CompareOfFloatsByEqualityOperator
-
     /// <summary>
     /// A point in 3D space.
     /// </summary>
@@ -439,5 +437,4 @@ bool ISpatiallyEquatable<Point3>.SpatiallyEqual(Point3 other) {
             return Equals(other);
         }
     }
-
 }
diff --git a/src/Vertesaur.Core/Core/Polygon2.cs b/src/Vertesaur.Core/Core/Polygon2.cs
@@ -142,7 +142,6 @@ public void ForceFillWinding(PointWinding desiredWinding) {
         /// </summary>
         /// <returns>A centroid.</returns>
         public Point2 GetCentroid() {
-            // ReSharper disable CompareOfFloatsByEqualityOperator
             if (Count > 0) {
                 if (Count == 1) {
                     Contract.Assume(this[0] != null);
@@ -163,7 +162,6 @@ public Point2 GetCentroid() {
                     return new Point2(xSum / aSum, ySum / aSum);
             }
             return Point2.Invalid;
-            // ReSharper restore CompareOfFloatsByEqualityOperator
         }
 
         /// <summary>
@@ -192,8 +190,6 @@ public bool Intersects(Point2 p) {
             var crossCount = 0;
             var hasUnconstrainedHoles = false;
             var fillRings = new List<Ring2>();
-            // ReSharper disable LoopCanBeConvertedToQuery
-            // ReSharper disable ForCanBeConvertedToForeach
             foreach (var ring in this) {
                 if (ring.Hole.HasValue && ring.Hole.Value)
                     continue;
@@ -228,8 +224,6 @@ public bool Intersects(Point2 p) {
                     hasUnconstrainedHoles = true;
             }
             return (hasUnconstrainedHoles ? 0 : 1) == (crossCount % 2);
-            // ReSharper restore ForCanBeConvertedToForeach
-            // ReSharper restore LoopCanBeConvertedToQuery
         }
 
         /// <summary>
@@ -282,15 +276,11 @@ public double GetMagnitude() {
                 return Double.NaN;
 
             var sum = 0.0;
-            // ReSharper disable LoopCanBeConvertedToQuery
-            // ReSharper disable ForCanBeConvertedToForeach
             for (var i = 0; i < Count; i++) {
                 Contract.Assume(this[i] != null);
                 sum += this[i].GetMagnitude();
             }
             return sum;
-            // ReSharper restore ForCanBeConvertedToForeach
-            // ReSharper restore LoopCanBeConvertedToQuery
         }
 
         /// <inheritdoc/>
@@ -312,15 +302,11 @@ public double GetArea() {
                 return Double.NaN;
 
             var sum = 0.0;
-            // ReSharper disable LoopCanBeConvertedToQuery
-            // ReSharper disable ForCanBeConvertedToForeach
             for (var i = 0; i < Count; i++) {
                 Contract.Assume(this[i] != null);
                 sum += this[i].GetArea();
             }
             return sum;
-            // ReSharper restore ForCanBeConvertedToForeach
-            // ReSharper restore LoopCanBeConvertedToQuery
         }
 
         /// <summary>

diff --git a/src/Vertesaur.Core/Core/Range.cs b/src/Vertesaur.Core/Core/Range.cs
@@ -5,8 +5,6 @@
 namespace Vertesaur
 {
 
-    // ReSharper disable CompareOfFloatsByEqualityOperator
-
     /// <summary>
     /// A range which encompasses all values between two values, inclusive.
     /// </summary>

diff --git a/src/Vertesaur.Core/Core/Ray2.cs b/src/Vertesaur.Core/Core/Ray2.cs
@@ -151,12 +151,10 @@ public override string ToString() {
         /// </summary>
         /// <returns>The length.</returns>
         public double GetMagnitude() {
-            // ReSharper disable CompareOfFloatsByEqualityOperator
             Contract.Ensures(
                 Contract.Result<double>() == 0.0
                 || Double.IsNaN(Contract.Result<double>())
                 || Contract.Result<double>() == Double.PositiveInfinity);
-            // ReSharper restore CompareOfFloatsByEqualityOperator
             return Vector2.Zero.Equals(Direction) ? 0 : Double.PositiveInfinity;
         }
 
@@ -165,12 +163,10 @@ public double GetMagnitude() {
         /// </summary>
         /// <returns>The length.</returns>
         public double GetMagnitudeSquared() {
-            // ReSharper disable CompareOfFloatsByEqualityOperator
             Contract.Ensures(
                 Contract.Result<double>() == 0.0
                 || Double.IsNaN(Contract.Result<double>())
                 || Contract.Result<double>() == Double.PositiveInfinity);
-            // ReSharper restore CompareOfFloatsByEqualityOperator
             return GetMagnitude();
         }
 
@@ -197,7 +193,6 @@ object ICloneable.Clone() {
         /// <returns>A minimum bounding rectangle.</returns>
         public Mbr GetMbr() {
             Contract.Ensures(Contract.Result<Mbr>() != null);
-            // ReSharper disable CompareOfFloatsByEqualityOperator
             return (
                 (Direction.X == 0.0)
                 ? (
@@ -231,7 +226,6 @@ public Mbr GetMbr() {
                     )
                 )
             );
-            // ReSharper restore CompareOfFloatsByEqualityOperator
         }
 
         /// <summary>

diff --git a/src/Vertesaur.Core/Core/Ring2.cs b/src/Vertesaur.Core/Core/Ring2.cs
@@ -534,7 +534,6 @@ public double GetArea() {
         /// </summary>
         /// <returns>The centroid of the ring.</returns>
         public Point2 GetCentroid() {
-            // ReSharper disable CompareOfFloatsByEqualityOperator
             var lastIndex = _pointList.Count - 1;
             if (lastIndex > 1) {
                 var sumValue = 0.0;
@@ -566,7 +565,6 @@ public Point2 GetCentroid() {
                     : Point2.Invalid
                 )
             );
-            // ReSharper restore CompareOfFloatsByEqualityOperator
         }
 
         /// <summary>
@@ -579,7 +577,6 @@ public Point2 GetCentroid() {
         /// </list></remarks>
         /// <returns>The point winding of the ring.</returns>
         public PointWinding DetermineWinding() {
-            // ReSharper disable CompareOfFloatsByEqualityOperator
             var areaSum = GetAreaSumValue();
             return (
                 (0 == areaSum || Double.IsNaN(areaSum) || Double.IsInfinity(areaSum))
@@ -590,7 +587,6 @@ public PointWinding DetermineWinding() {
                     : PointWinding.CounterClockwise
                 )
             );
-            // ReSharper restore CompareOfFloatsByEqualityOperator
         }
 
         /// <summary>