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

New upstream version 3.0.21

parent 928df20d

parser/parsePartitions.c

+14 −8
Original line number Diff line number Diff line
@@ -370,7 +370,15 @@ static int myGetline(char **lineptr, int *n, FILE *stream) 
  return p - *lineptr;

}





static void nonContiguousError(analdef *adef)

{

  if(adef->compressPatterns == FALSE)

    {

      printf("\nError: You are not allowed to use interleaved partitions, that is, assign non-contiguous sites\n");

      printf("to the same partition model, when pattern compression is disabled via the -c flag!\n\n");

      exit(-1);

    }

}



void parsePartitions(analdef *adef, rawdata *rdta, tree *tr)

{
@@ -499,6 +507,7 @@ void parsePartitions(analdef *adef, rawdata *rdta, tree *tr) 
      if(*ch == ',')

	{	     

	  upper = lower;

	  nonContiguousError(adef);

	  goto SINGLE_NUMBER;

	}
@@ -542,6 +551,7 @@ void parsePartitions(analdef *adef, rawdata *rdta, tree *tr) 
      if(*ch == ',')

	{	 

	  ch++;

	  nonContiguousError(adef);

	  goto numberPairs;

	}
@@ -556,12 +566,7 @@ void parsePartitions(analdef *adef, rawdata *rdta, tree *tr) 
	      exit(-1);

	    }   



	  if(adef->compressPatterns == FALSE)

	    {

	      printf("\nError: You are not allowed to use interleaved partitions, that is, assign non-contiguous sites\n");

	      printf("to the same partition model, when pattern compression is disabled via the -c flag!\n\n");

	      exit(-1);

	    }

	  nonContiguousError(adef);



	  l = 0;

	  while(isNum(*ch))
@@ -582,6 +587,7 @@ void parsePartitions(analdef *adef, rawdata *rdta, tree *tr) 
	  if(*ch == ',')

	    {	       

	      ch++;

	      nonContiguousError(adef);

	      goto numberPairs;

	    }

	}

versionHeader/version.h

+3 −3
Original line number Diff line number Diff line 
#define programName        "ExaML"

#define programVersion     "3.0.20"

#define programVersionInt  3020

#define programDate        "January 26 2018"
 
#define programVersion     "3.0.21"

#define programVersionInt  3021

#define programDate        "May 29 2018"