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:
3045b37
)
catch out of memory error for consensus when loading groups
author
amwaterhouse
<Andrew Waterhouse>
Mon, 7 Aug 2006 14:37:33 +0000
(14:37 +0000)
committer
amwaterhouse
<Andrew Waterhouse>
Mon, 7 Aug 2006 14:37:33 +0000
(14:37 +0000)
src/jalview/datamodel/SequenceGroup.java
patch
|
blob
|
history
diff --git
a/src/jalview/datamodel/SequenceGroup.java
b/src/jalview/datamodel/SequenceGroup.java
index
161c010
..
272d81d
100755
(executable)
--- a/
src/jalview/datamodel/SequenceGroup.java
+++ b/
src/jalview/datamodel/SequenceGroup.java
@@
-319,31
+319,37
@@
public class SequenceGroup
if(cs == null)
\r
return;
\r
\r
if(cs == null)
\r
return;
\r
\r
- cs.setConsensus(AAFrequency.calculate(sequences, 0, getWidth()));
\r
-
\r
-
\r
- if (cs instanceof ClustalxColourScheme)
\r
+ try
\r
{
\r
{
\r
- ((ClustalxColourScheme) cs).resetClustalX(sequences, getWidth());
\r
- }
\r
+ cs.setConsensus(AAFrequency.calculate(sequences, 0, getWidth()));
\r
\r
\r
+ if (cs instanceof ClustalxColourScheme)
\r
+ {
\r
+ ( (ClustalxColourScheme) cs).resetClustalX(sequences, getWidth());
\r
+ }
\r
\r
\r
- if (cs.conservationApplied())
\r
- {
\r
+ if (cs.conservationApplied())
\r
+ {
\r
Conservation c = new Conservation(groupName,
\r
Conservation c = new Conservation(groupName,
\r
- ResidueProperties.propHash, 3, sequences, 0, getWidth());
\r
+ ResidueProperties.propHash, 3, sequences,
\r
+ 0, getWidth());
\r
c.calculate();
\r
c.verdict(false, 25);
\r
\r
c.calculate();
\r
c.verdict(false, 25);
\r
\r
-
\r
cs.setConservation(c);
\r
\r
if (cs instanceof ClustalxColourScheme)
\r
{
\r
cs.setConservation(c);
\r
\r
if (cs instanceof ClustalxColourScheme)
\r
{
\r
- ((ClustalxColourScheme) cs).resetClustalX(sequences,
\r
- getWidth());
\r
+ ( (ClustalxColourScheme) cs).resetClustalX(sequences,
\r
+ getWidth());
\r
}
\r
}
\r
+ }
\r
}
\r
}
\r
+ catch (java.lang.OutOfMemoryError err)
\r
+ {
\r
+ System.out.println("Out of memory loading groups: " + err);
\r
+ }
\r
+
\r
}
\r
\r
/**
\r
}
\r
\r
/**
\r