git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-2401 fix for NPE on selectedButtons, tweak for button appearance
[jalview.git]
/
src
/
jalview
/
analysis
/
PCA.java
diff --git
a/src/jalview/analysis/PCA.java
b/src/jalview/analysis/PCA.java
index
f34fe83
..
eaea7bf
100755
(executable)
--- a/
src/jalview/analysis/PCA.java
+++ b/
src/jalview/analysis/PCA.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
*
* This file is part of Jalview.
*
@@
-20,14
+20,14
@@
*/
package jalview.analysis;
*/
package jalview.analysis;
-import java.io.*;
-
-import jalview.datamodel.*;
+import jalview.datamodel.BinarySequence;
import jalview.datamodel.BinarySequence.InvalidSequenceTypeException;
import jalview.datamodel.BinarySequence.InvalidSequenceTypeException;
-import jalview.math.*;
+import jalview.math.Matrix;
import jalview.schemes.ResidueProperties;
import jalview.schemes.ScoreMatrix;
import jalview.schemes.ResidueProperties;
import jalview.schemes.ScoreMatrix;
+import java.io.PrintStream;
+
/**
* Performs Principal Component Analysis on given sequences
*
/**
* Performs Principal Component Analysis on given sequences
*
@@
-144,8
+144,8
@@
public class PCA implements Runnable
// System.out.println("Created array");
// printMemory(rt);
// System.out.println(" --- Original matrix ---- ");
// System.out.println("Created array");
// printMemory(rt);
// System.out.println(" --- Original matrix ---- ");
- m = new Matrix(seqmat, count, bs[0].getDBinary().length);
- m2 = new Matrix(seqmat2, count, bs2[0].getDBinary().length);
+ m = new Matrix(seqmat);
+ m2 = new Matrix(seqmat2);
}
}
@@
-252,15
+252,18
@@
public class PCA implements Runnable
/**
* DOCUMENT ME!
*/
/**
* DOCUMENT ME!
*/
+ @Override
public void run()
{
PrintStream ps = new PrintStream(System.out)
{
public void run()
{
PrintStream ps = new PrintStream(System.out)
{
+ @Override
public void print(String x)
{
details.append(x);
}
public void print(String x)
{
details.append(x);
}
+ @Override
public void println()
{
details.append("\n");
public void println()
{
details.append("\n");