git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
10a9a04
)
score is a double, fix bugs for score only annotation not being associated with sequences
author
jprocter
<Jim Procter>
Thu, 26 Apr 2007 17:11:27 +0000
(17:11 +0000)
committer
jprocter
<Jim Procter>
Thu, 26 Apr 2007 17:11:27 +0000
(17:11 +0000)
src/jalview/datamodel/AlignmentAnnotation.java
patch
|
blob
|
history
diff --git
a/src/jalview/datamodel/AlignmentAnnotation.java
b/src/jalview/datamodel/AlignmentAnnotation.java
index
acb02b1
..
20a3633
100755
(executable)
--- a/
src/jalview/datamodel/AlignmentAnnotation.java
+++ b/
src/jalview/datamodel/AlignmentAnnotation.java
@@
-57,7
+57,7
@@
public class AlignmentAnnotation
/**
* Score associated with label and description.
*/
/**
* Score associated with label and description.
*/
- public float score= Float.NaN;
+ public double score= Double.NaN;
/**
* flag indicating if annotation has a score.
*/
/**
* flag indicating if annotation has a score.
*/
@@
-483,13
+483,13
@@
Loading...
{
return;
}
{
return;
}
+ sequenceRef=seqRef;
if (annotations==null)
{
return;
}
sequenceMapping = new java.util.Hashtable();
if (annotations==null)
{
return;
}
sequenceMapping = new java.util.Hashtable();
- sequenceRef = seqRef;
int seqPos;
for (int i = 0; i < annotations.length; i++)
int seqPos;
for (int i = 0; i < annotations.length; i++)
@@
-616,7
+616,7
@@
Loading...
/**
* @return the score
*/
/**
* @return the score
*/
- public float getScore()
+ public double getScore()
{
return score;
}
{
return score;
}
@@
-624,8
+624,9
@@
Loading...
/**
* @param score the score to set
*/
/**
* @param score the score to set
*/
- public void setScore(float score)
+ public void setScore(double score)
{
{
+ hasScore=true;
this.score = score;
}
/**
this.score = score;
}
/**
@@
-634,6
+635,6
@@
Loading...
*/
public boolean hasScore()
{
*/
public boolean hasScore()
{
- return hasScore;
+ return hasScore || !Double.isNaN(score);
}
}
}
}