X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Futil%2FComparison.java;h=32e049d08b05c6faaa13c8aed17fdbc3659f9b96;hb=153dd62dc91da13ae732600e6ea55ddbe15eab39;hp=9cb2430d3546721c2500d30f7bf6ba28738acf64;hpb=506d60f0e188723ddc91c26824b41ac7034df3fe;p=jalview.git diff --git a/src/jalview/util/Comparison.java b/src/jalview/util/Comparison.java index 9cb2430..32e049d 100755 --- a/src/jalview/util/Comparison.java +++ b/src/jalview/util/Comparison.java @@ -1,20 +1,19 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.4) - * Copyright (C) 2008 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6) + * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. + * This file is part of Jalview. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Jalview is free software: you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + * Jalview is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with Jalview. If not, see . */ package jalview.util; @@ -35,9 +34,9 @@ public class Comparison * DOCUMENT ME! * * @param ii - * DOCUMENT ME! + * DOCUMENT ME! * @param jj - * DOCUMENT ME! + * DOCUMENT ME! * * @return DOCUMENT ME! */ @@ -50,13 +49,13 @@ public class Comparison * this was supposed to be an ungapped pid calculation * * @param ii - * SequenceI + * SequenceI * @param jj - * SequenceI + * SequenceI * @param start - * int + * int * @param end - * int + * int * @return float */ public static float compare(SequenceI ii, SequenceI jj, int start, int end) @@ -119,9 +118,9 @@ public class Comparison * this is a gapped PID calculation * * @param s1 - * SequenceI + * SequenceI * @param s2 - * SequenceI + * SequenceI * @return float */ public final static float PID(String seq1, String seq2) @@ -186,7 +185,7 @@ public class Comparison * DOCUMENT ME! * * @param c - * DOCUMENT ME! + * DOCUMENT ME! * * @return DOCUMENT ME! */