Skip to content

Commit

Permalink
template update + warning when char state count < 2
Browse files Browse the repository at this point in the history
  • Loading branch information
gavryushkina committed Jun 29, 2015
1 parent fc8c5f8 commit 96c640b
Show file tree
Hide file tree
Showing 4 changed files with 112 additions and 96 deletions.
2 changes: 1 addition & 1 deletion build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<property name="srcBeast2" location="${beast2path}/src" />
<property name="beast2classpath" location="${beast2path}/build" />
<property name="Add_on_dir" value="${release_dir}/add-on" />
<property name="version" value="1.0.1" />
<property name="version" value="1.0.2" />

<import file="${beast2path}/build.xml" />

Expand Down
6 changes: 6 additions & 0 deletions src/beast/app/beauti/BeautiMorphModelAlignmentProvider.java
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,12 @@ public void processAlignment(Alignment alignment, List<BEASTInterface> filteredA
}
} else {
// deal with the case where there is no charStateLabel or there is no state description
if (nrOfStatesPresented < 2) {
throw new RuntimeException("Cannot determine the number of possible states for character " +
(i+1) + ". \n There is no character description and there are fewer than two states for " +
"this character in the matrix. \n Please specify the number of possible states for " +
"characters in CHARSTATELABELS block");
}
nrOfStates = nrOfStatesPresented;
}
if (!stateSpaceMap.containsKey(nrOfStates)) {
Expand Down
Loading

0 comments on commit 96c640b

Please sign in to comment.