diff --git a/java/src/org/broadinstitute/sting/playground/fourbasecaller/BasecallingBaseModel.java b/java/src/org/broadinstitute/sting/playground/fourbasecaller/BasecallingBaseModel.java index 11c50b592..69b2d3a5d 100755 --- a/java/src/org/broadinstitute/sting/playground/fourbasecaller/BasecallingBaseModel.java +++ b/java/src/org/broadinstitute/sting/playground/fourbasecaller/BasecallingBaseModel.java @@ -167,22 +167,30 @@ public class BasecallingBaseModel { PrintWriter writer = new PrintWriter(outparam); for (int baseCurIndex = 0; baseCurIndex < 4; baseCurIndex++) { - writer.print("mean_" + baseIndexToBase(baseCurIndex) + " : [ "); + writer.print("mean_" + baseIndexToBase(baseCurIndex) + " = c("); for (int channel = 0; channel < 4; channel++) { writer.print(sums[baseCurIndex].getQuick(channel)/counts[baseCurIndex]); - writer.print(" "); + + if (channel < 3) { + writer.print(", "); + } } - writer.print("] (" + counts[baseCurIndex] + ")\n"); + writer.println(");"); DoubleMatrix2D cov = unscaledCovarianceSums[baseCurIndex].copy(); cov.assign(F.div(counts[baseCurIndex])); - writer.println("cov_" + baseIndexToBase(baseCurIndex) + " : " + cov + "\n"); + writer.print("cov_" + baseIndexToBase(baseCurIndex) + " = matrix(c("); + for (int channel1 = 0; channel1 < 4; channel1++) { + for (int channel2 = 0; channel2 < 4; channel2++) { + writer.print(cov.get(channel2, channel1) + (channel1 == 3 && channel2 == 3 ? "" : ",")); + } + } + writer.println("), nr=4, nc=4);\n"); } writer.close(); } catch (IOException e) { - } } diff --git a/java/src/org/broadinstitute/sting/playground/fourbasecaller/BasecallingReadModel.java b/java/src/org/broadinstitute/sting/playground/fourbasecaller/BasecallingReadModel.java index c2cf83a67..4ec080623 100644 --- a/java/src/org/broadinstitute/sting/playground/fourbasecaller/BasecallingReadModel.java +++ b/java/src/org/broadinstitute/sting/playground/fourbasecaller/BasecallingReadModel.java @@ -81,7 +81,7 @@ public class BasecallingReadModel { */ public void write(File dir) { for (int cycle = 0; cycle < basemodels.length; cycle++) { - File outparam = new File(dir.getPath() + "/param." + cycle); + File outparam = new File(dir.getPath() + "/param." + cycle + ".r"); basemodels[cycle].write(outparam); } }