Changeset 4287

Timestamp:

Feb 13, 2012, 5:18:13 PM (12 years ago)

Author:

Fredrik Levander

Message:

Refs #777. Writing null if no value instead of zero.

File:

• trunk/plugin/src/org/proteios/plugins/FeatureComparison.java (modified) (5 diffs)

trunk/plugin/src/org/proteios/plugins/FeatureComparison.java

@@ -193 +193 @@
     String currentAcc = "";
     boolean conflict = false;
-    float[] values = null;
+    Float[] values = null;
     writer
       .println("Cluster ID\tPeptide Sequence\tExternal IDs\tCharge\tAverage RT");
@@ -204 +204 @@
         printRow(writer, values, currentCluster, currentSequence,
           currentAcc, currentCharge, rtSum, nValues, conflict);
-        values = new float[entries];
+        values = new Float[entries];
         conflict = false;
         currentAcc = "";
@@ -232 +232 @@
         conflict = true;
       }
-      values[msFiles.indexOf(feature.getMsFile())] += feature
-        .getIntegratedIntensity().floatValue();
+      if (values[msFiles.indexOf(feature.getMsFile())] == null)
+      {
+        values[msFiles.indexOf(feature.getMsFile())] = feature
+          .getIntegratedIntensity();
+      }
+      else
+      {
+        values[msFiles.indexOf(feature.getMsFile())] += feature
+          .getIntegratedIntensity().floatValue();
+      }
       nValues++;
       if (currentCharge == 0)
@@ -245 +253 @@
 
 
-  private void printRow(PrintWriter writer, float[] values,
+  private void printRow(PrintWriter writer, Float[] values,
       Long currentCluster, String currentSequence, String currentAcc,
       int currentCharge, float rtSum, float nValues, boolean conflict)
@@ -256 +264 @@
       writer
         .print("\t" + currentAcc + "\t" + currentCharge + "\t" + (rtSum / nValues));
-      for (float value : values)
+      for (Float value : values)
       {
         writer.print("\t" + value);