Commit cbcb3b1d authored by Andreas Tille's avatar Andreas Tille
Browse files

New upstream version 3.697+dfsg

parent 88e07faa

doc/main.html

+2 −2
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ 
<P>

<IMG SRC="phylip.gif" ALT="PHYLIP Logo">

<P>

<H3>Version 3.696</H3>

<H3>Version 3.697</H3>

<P>

<H3>September, 2014</H3>

<H3>December, 2017</H3>

<P>

<H2>by Joseph Felsenstein</H2>

<P>

src/cons.c

+2 −2
Original line number Diff line number Diff line
@@ -941,8 +941,8 @@ void rehash() 
    memcpy(s, grouping[old_index], setsz * sizeof(group_type));

    ss = 0.0;

    for (j = 0; j < setsz; j++)

      ss += s[j] /* pow(2, SETBITS*j)*/;

    temp = ss * smult;

      ss += s[j] * smult; /* pow(2, SETBITS*j)*/;

    temp = ss;

    new_index = (long)(new_maxgrp * (temp - floor(temp)));

    done = false;

    while (!done) {

src/phylip.h

+3 −3
Original line number Diff line number Diff line 
#ifndef _PHYLIP_H_

#define _PHYLIP_H_



/* version 3.696.

/* version 3.697.

   Written by Joseph Felsenstein, Akiko Fuseki, Sean Lamont, Andrew Keeffe,

   Mike Palczewski, Doug Buxton and Dan Fineman.



   Copyright (c) 1980-2014, Joseph Felsenstein

   Copyright (c) 1980-2017, Joseph Felsenstein

   All rights reserved.



   Redistribution and use in source and binary forms, with or without
@@ -31,7 +31,7 @@ 
   POSSIBILITY OF SUCH DAMAGE.

*/



#define VERSION "3.696"

#define VERSION "3.697"



/* Debugging options */

/* Define this to disable assertions */