Changeset 206

Timestamp:

Nov 24, 2006, 4:25:10 PM (15 years ago)

Author:

Johan Enell

Message:

fixes #26

Location:

trunk/se/lu/onk/ZTest/src/ztest

Files:

• Start.java (modified) (5 diffs)
• ZTest.java (modified) (1 diff)

trunk/se/lu/onk/ZTest/src/ztest/Start.java

@@ -123 +123 @@
     {
       PrintWriter html = new PrintWriter(new File("index.html"));
+      PrintWriter tab = new PrintWriter(new File("result.tsv"));
       int numOfReporters = bfss.getReporterSize();
 
@@ -133 +134 @@
       html.println("</head>");
       html.println("<table>");
-      html.println("<tr><th>Reporter</th><th>Average M</th><th>P</th><th>Number of values</th><th>Rank</th<th>Expected</th><th>FDR</th></tr>");
+      html.println("<tr><th>Reporter</th>" +
+          "<th>Average M</th>" +
+          "<th>P</th>" +
+          "<th>Number of values</th>" +
+          "<th>Rank</th>" +
+          "<th>Expected</th>" +
+          "<th>FDR</th></tr>");
+
+      tab.println("Reporter\t" +
+          "Average M\t" +
+          "P\t" +
+          "Number of values\t" +
+          "Rank\t" +
+          "Expected\t" +
+          "FDR");
       
       for (int i = 0; i < bfss.getReporterSize(); i++)
@@ -139 +154 @@
         int rank = i + 1;
         Reporter r = bfss.getReporter(i);
-        double numExpected = r.getP() * numOfReporters;
-        double fdr = (numExpected / rank);
+        double expected = r.getP() * numOfReporters;
+        double fdr = (expected / rank);
         
-        html.print("<tr class=\"row"+(i%2+1)+"\">");
-        html.printf(
-          "<td>%d</td>" +
-          "<td>%f</td>" +
-          "<td>%f</td>" +
-          "<td>%d</td>" +
-          "<td>%d</td>" +
-          "<td>%f</td>" +
-          "<td>%.2f</td>",
+        html.printf("<tr class=\"row"+(i%2+1)+"\">" +
+          "<td>%1$d</td>" +
+          "<td>%2$f</td>" +
+          "<td>%3$f</td>" +
+          "<td>%4$d</td>" +
+          "<td>%5$d</td>" +
+          "<td>%6$f</td>" +
+          "<td>%7$.2f</td></tr>\n",
           r.getReporter(),
           r.getM(),
@@ -156 +170 @@
           r.getSize(),
           rank,
-          numExpected,
+          expected,
           fdr);
-        html.println("</tr>");
+        
+        tab.printf("%d\t%f\t%f\t%d\t%d\t%f\t%f\n",
+          r.getReporter(),
+          r.getM(),
+          r.getP(),
+          r.getSize(),
+          rank,
+          expected,
+          fdr);
       }
       html.println("</table>");
@@ -164 +186 @@
       html.print("</html>");
       html.close();
+      
+      tab.close();
     }
     catch (FileNotFoundException e)

trunk/se/lu/onk/ZTest/src/ztest/ZTest.java

@@ -76 +76 @@
   private double p(double normsdist)
   {
-    return 2 * (1 - normsdist);
+    return 2.0 * (1.0 - normsdist);
   }