X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Fevoinference%2Fparsimony%2FSankoffParsimony.java;h=ecad514c8b53bc231eb63f14fcf01b44a9a4cf31;hb=391381d661a230af98751dd6eba77bb2353c4d3e;hp=195a7e073af9b534adb4126ec08f1cb3cb254f14;hpb=eccc2fdb674f76be1815fd7984295661bff8a2be;p=jalview.git diff --git a/forester/java/src/org/forester/evoinference/parsimony/SankoffParsimony.java b/forester/java/src/org/forester/evoinference/parsimony/SankoffParsimony.java index 195a7e0..ecad514 100644 --- a/forester/java/src/org/forester/evoinference/parsimony/SankoffParsimony.java +++ b/forester/java/src/org/forester/evoinference/parsimony/SankoffParsimony.java @@ -6,7 +6,7 @@ // Copyright (C) 2008-2009 Christian M. Zmasek // Copyright (C) 2008-2009 Burnham Institute for Medical Research // All rights reserved -// +// // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public // License as published by the Free Software Foundation; either @@ -16,7 +16,7 @@ // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // Lesser General Public License for more details. -// +// // You should have received a copy of the GNU Lesser General Public // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA @@ -220,8 +220,7 @@ public class SankoffParsimony { private Map getStatesForCharacterForTraceback( final Phylogeny p, final CharacterStateMatrix matrix, final int character_index ) { - final Map states = new HashMap( matrix - .getNumberOfIdentifiers() ); + final Map states = new HashMap( matrix.getNumberOfIdentifiers() ); for( int indentifier_index = 0; indentifier_index < matrix.getNumberOfIdentifiers(); ++indentifier_index ) { final STATE_TYPE state = matrix.getState( indentifier_index, character_index ); if ( state == null ) { @@ -315,8 +314,7 @@ public class SankoffParsimony { .getName() ); getInternalStatesMatrixPriorToTraceback().setIdentifier( identifier_index, ForesterUtil.isEmpty( node.getName() ) ? node - .getId() - + "" : node.getName() ); + .getId() + "" : node.getName() ); ++identifier_index; } for( int character_index = 0; character_index < external_node_states_matrix.getNumberOfCharacters(); ++character_index ) { @@ -423,7 +421,7 @@ public class SankoffParsimony { else if ( current_binary_state == ABSENT ) {//new setGainLossState( character_state_column, current_node, UNCHANGED_ABSENT );//new }//new - // setGainLossState( character_state_column, current_node, UNKNOWN_GAIN_LOSS ); + // setGainLossState( character_state_column, current_node, UNKNOWN_GAIN_LOSS ); } } }