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
Merge branch 'develop' into releases/Release_2_11_3_Branch
[jalview.git]
/
src
/
jalview
/
schemes
/
Consensus.java
diff --git
a/src/jalview/schemes/Consensus.java
b/src/jalview/schemes/Consensus.java
index
cccc995
..
9d2c738
100755
(executable)
--- a/
src/jalview/schemes/Consensus.java
+++ b/
src/jalview/schemes/Consensus.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1)
- * 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.
*
@@
-53,8
+53,10
@@
public class Consensus
/**
* @deprecated Use {@link #isConserved(int[][],int,int,boolean)} instead
*/
/**
* @deprecated Use {@link #isConserved(int[][],int,int,boolean)} instead
*/
+ @Deprecated
public boolean isConserved(int[][] cons2, int col, int size)
{
public boolean isConserved(int[][] cons2, int col, int size)
{
+ System.out.println("DEPRECATED!!!!");
return isConserved(cons2, col, size, true);
}
return isConserved(cons2, col, size, true);
}
@@
-71,7
+73,7
@@
public class Consensus
tot += cons2[col][mask[i]];
}
tot += cons2[col][mask[i]];
}
- if ((double) tot > ((threshold * size) / 100))
+ if (tot > ((threshold * size) / 100))
{
// System.out.println("True conserved "+tot+" from "+threshold+" out of
// "+size+" : "+maskstr);
{
// System.out.println("True conserved "+tot+" from "+threshold+" out of
// "+size+" : "+maskstr);