Changeset 4363

Timestamp:

Jul 2, 2008, 8:56:15 AM (15 years ago)

Author:

Jari Häkkinen

Message:

Addresses #1077. A couple of more issues found. Further quality control needed before release.

File:

• branches/2.7-stable/src/plugins/core/net/sf/basedb/plugins/LowessNormalization.java (modified) (3 diffs)

branches/2.7-stable/src/plugins/core/net/sf/basedb/plugins/LowessNormalization.java

@@ -605 +605 @@
         // while distance from windowStart to i is greater then distance from i to windowEnd: move window
         while ((windowStart + windowSize < dataSize) && 
-            (Ai - data.get(windowStart).A > data.get(windowStart + windowSize).A - Ai))
+            (Ai - data.get(windowStart).A > data.get(windowStart + windowSize-1).A - Ai))
         {
           windowStart++;
@@ -651 +651 @@
       {
         double w = Math.abs((smoothCurve[j] - data.get(j).M) * invYWRange);
-        wFit.set(j, w < 1 ? Math.pow(Math.pow(1 - w, 2), 2) : 0);
+        wFit.set(j, w < 1 ? Math.pow(1 - w*w, 2) : 0);
       }
     }
@@ -669 +669 @@
       double v1 = temp.get((temp.size() / 2) - 1);
       double v2 = temp.get((temp.size() / 2));
-      return 0.5 * v1 * v2; 
-    }
-    else
-    {
-      return temp.get((temp.size() - 1) / 2);
-    }
+      return 0.5 * (v1 + v2);
+    }
+    return temp.get(temp.size() / 2);
   }