Changeset 11742 for branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Common/Extensions.cs

Timestamp:

01/09/15 14:57:28 (9 years ago)

Author:

gkronber

Message:

#2283 refactoring

File:

• branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Common/Extensions.cs (modified) (2 diffs)

branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Common/Extensions.cs

@@ -8 +8 @@
   public static class Extensions {
     public static bool IsAlmost(this double x, double y) {
-      return Math.Abs(x - y) < 1.0e-6;
+      return Math.Abs(x - y) < 1.0e-12;
     }
 
@@ -38 +38 @@
       var ssX = 0.0;
       var ssY = 0.0;
-      foreach (var p in xs.Zip(ys, (x, y) => new { x, y })) {
-        s += (p.x - meanX) * (p.y - meanY);
-        ssX += Math.Pow(p.x - meanX, 2);
-        ssY += Math.Pow(p.y - meanY, 2);
+      var xEnum = xs.GetEnumerator();
+      var yEnum = ys.GetEnumerator();
+      while (xEnum.MoveNext() & yEnum.MoveNext()) {
+        var x = xEnum.Current;
+        var y = yEnum.Current;
+        s += (x - meanX) * (y - meanY);
+        ssX += Math.Pow(x - meanX, 2);
+        ssY += Math.Pow(y - meanY, 2);
       }
+      if (xEnum.MoveNext() | yEnum.MoveNext()) throw new ArgumentException("lengths are not equal");
 
       if (s.IsAlmost(0)) return 0;