X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fanalysis%2FPCA.java;h=5cc81a8a541b8499b546efccaf755e040b2ec862;hb=1fab405409225677be34c43c179dc29b0cb44429;hp=d51f00e41216d12ed8ffd480525c95f5242ab09d;hpb=7335cf4c36225b8f425e6b5c452e0529d5b36de5;p=jalview.git diff --git a/src/jalview/analysis/PCA.java b/src/jalview/analysis/PCA.java index d51f00e..5cc81a8 100755 --- a/src/jalview/analysis/PCA.java +++ b/src/jalview/analysis/PCA.java @@ -22,7 +22,7 @@ package jalview.analysis; import jalview.api.analysis.ScoreModelI; import jalview.api.analysis.SimilarityParamsI; -import jalview.bin.Cache; +import jalview.bin.Console; import jalview.datamodel.AlignmentView; import jalview.datamodel.Point; import jalview.math.MatrixI; @@ -60,7 +60,8 @@ public class PCA implements Runnable * @param sm * @param options */ - public PCA(AlignmentView sequences, ScoreModelI sm, SimilarityParamsI options) + public PCA(AlignmentView sequences, ScoreModelI sm, + SimilarityParamsI options) { this.seqs = sequences; this.scoreModel = sm; @@ -164,13 +165,13 @@ public class PCA implements Runnable sb.append("PCA calculation using ").append(scoreModel.getName()) .append(" sequence similarity matrix\n========\n\n"); PrintStream ps = wrapOutputBuffer(sb); - + /* * pairwise similarity scores */ sb.append(" --- OrigT * Orig ---- \n"); pairwiseScores.print(ps, "%8.2f"); - + /* * tridiagonal matrix, with D and E vectors */ @@ -181,7 +182,7 @@ public class PCA implements Runnable sb.append("--- E vector ---\n"); tridiagonal.printE(ps, "%15.4e"); ps.println(); - + /* * eigenvalues matrix, with D vector */ @@ -190,7 +191,7 @@ public class PCA implements Runnable sb.append(" --- Eigenvalues ---\n"); eigenMatrix.printD(ps, "%15.4e"); ps.println(); - + return sb.toString(); } @@ -220,7 +221,7 @@ public class PCA implements Runnable eigenMatrix.tqli(); } catch (Exception q) { - Cache.log.error("Error computing PCA: " + q.getMessage()); + Console.error("Error computing PCA: " + q.getMessage()); q.printStackTrace(); } }