@@ -1,5 +1,6 @@

 Changes in version 2.17.2 (2019-12-17):

 	- Fixed error "length(x) = 5 > 1' in coercion to 'logical(1)'"

+	- Compiles with fno-common (for gcc 10).

 Changes in version 2.17.1 (2019-11-24):

 	- rfitness: clarified log=TRUE and truncate_at_0 after log.

@@ -226,6 +226,7 @@ for the MAGELLAN code.

   \code{\link{evalAllGenotypes}}

   \code{\link{allFitnessEffects}}

   \code{\link{plotFitnessLandscape}}

+  \code{\link{Magellan_stats}}  

 }

 \examples{

@@ -14,7 +14,7 @@

 #define DEFAULT_FITNESS -99999999999

-char verbose;   /* if set to non-0 , become verbose */

+extern char verbose;   /* if set to non-0 , become verbose */

 /*

@@ -16,6 +16,7 @@

+

 void usage( char *prog ){

 	fprintf(stderr, "Version of Nov 18 2014\n");

@@ -93,8 +94,9 @@ int main( int argc, char ** argv ){

 	int i;

-	extern char verbose;                /* level of verbosity */

-

+	/* extern char verbose; */                  /* level of verbosity */

+	char verbose;    

+	

 	int opt;

 	extern char *optarg;                /* external variables, see man 3 getopt */

 	extern int optind;

@@ -57,7 +57,8 @@ int main( int argc, char ** argv ){

 	char *outfile=NULL;

-	verbose=0;

+	/* prevent confusion with the other extern verbose */

+	char verbose_fl_stats=0;

 	/*

 		Parse Input

@@ -85,7 +86,7 @@ int main( int argc, char ** argv ){

 				break;

 			case 'v':

-				verbose=1;

+				verbose_fl_stats=1;

 				break;

 			case 's':

@@ -115,7 +116,7 @@ int main( int argc, char ** argv ){

 	h = ReadFile( filename, opt_zero );

-	if(verbose)

+	if(verbose_fl_stats)

 		print_landscape( &h );

 	OutputSummaryStats( &h, FitnessRatio, opt_log, opt_short, "coco", outfile );

@@ -10,7 +10,7 @@

 #include "summary_statistics.h"

 #include "models.h"

-

+/* extern char verbose; */

 /*

@@ -21,7 +21,7 @@

 */

 void HouseOfCards( struct landscape *l, float sigma){

-

+  char verbose;

 	int i;

 	if( sigma <= 0 )

@@ -55,7 +55,8 @@ void HouseOfCards( struct landscape *l, float sigma){

 */

 void Multiplicative( struct landscape *l , double s, double stdev, int  opt_single_fitness, float DimRet,  char opt_log )

 {

-	

+

+  char verbose;

 	int *genotype=NULL;

 	float *fa;  

@@ -165,7 +166,8 @@ void Multiplicative( struct landscape *l , double s, double stdev, int  opt_sing

 void Optimum( struct landscape *l , double mean_p, double sigma_p, double mean_o, double sigma_o )

 {

-	

+

+  char verbose;

 	int *genotype=NULL;

 	float *fa;  

@@ -266,7 +268,7 @@ void Optimum( struct landscape *l , double mean_p, double sigma_p, double mean_o

 void Kaufman_NK( struct landscape *l,  int K, short random ){

-	extern char verbose;

+	char verbose;

 	int i,j, g;

@@ -426,12 +428,11 @@ void Kaufman_NK( struct landscape *l,  int K, short random ){

 */

 void Ising( struct landscape *l, float mu_c, float sigma_c, short opt_circ )

 {

-	

+  char verbose;

 	int i,g;

 	float *costs;

-	extern char verbose;

 	costs = (float *) malloc( (size_t) l->ngenotypes*sizeof(float) );

 	if(!costs)fprintf(stderr, "Ising: cannot allocate the fitness of alleles, bye"), exit(3);

@@ -570,7 +571,7 @@ void MixedModel( struct landscape *fl, struct model_opt myoptions, int opt_log )

 	struct landscape fl_tmp;

-	extern char verbose;

+	char verbose;

 	int g;

@@ -8,6 +8,12 @@

 #ifndef _MODELS_H_

 #define _MODELS_H_

+

+

+extern char verbose;

+

+

+

 struct model_opt {

@@ -1,15 +1,15 @@

 \usepackage[%

-		shash={8a06478},

-		lhash={8a064788fa0871be4bd6d6fe8be79c0b4f1cd3f7},

+		shash={a6c95a3},

+		lhash={a6c95a3f05c9d32bbdb27c5634bfc9d5dad7a776},

 		authname={ramon diaz-uriarte (at Phelsuma)},

 		authemail={rdiaz02@gmail.com},

-		authsdate={2019-11-28},

-		authidate={2019-11-28 20:43:07 +0100},

-		authudate={1574970187},

+		authsdate={2019-12-17},

+		authidate={2019-12-17 13:12:29 +0100},

+		authudate={1576584749},

 		commname={ramon diaz-uriarte (at Phelsuma)},

 		commemail={rdiaz02@gmail.com},

-		commsdate={2019-11-28},

-		commidate={2019-11-28 20:43:07 +0100},

-		commudate={1574970187},

-		refnames={ (HEAD -> master, origin/master, origin/HEAD)}

+		commsdate={2019-12-17},

+		commidate={2019-12-17 13:12:29 +0100},

+		commudate={1576584749},

+		refnames={ (HEAD -> master)}

 	]{gitsetinfo}

\ No newline at end of file