From 2a22f9f7afc08f6f4d967046fed8b665f4663ef5 Mon Sep 17 00:00:00 2001 From: Alex Lancaster Date: Tue, 15 Aug 2017 16:09:29 -0400 Subject: [PATCH] increase array size for larger data sets (temporary change) --- emhaplofreq/emhaplofreq.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/emhaplofreq/emhaplofreq.h b/emhaplofreq/emhaplofreq.h index 0f5486ee4..6cd5d56be 100644 --- a/emhaplofreq/emhaplofreq.h +++ b/emhaplofreq/emhaplofreq.h @@ -34,23 +34,23 @@ MODIFICATIONS. */ #define NAME_LEN 22 /* 10 chars for allele name, plus colon and null */ #define LINE_LEN 132 /* RS changed from 120 to 132=6*2*(10+1) */ -#define MAX_ROWS 5000 /* increased from 1023 */ +#define MAX_ROWS 10000 /* increased from 1023 */ #define MAX_ALLELES 200 /* increased from 80 for a large dataset */ -#define MAX_LOCI 20 +#define MAX_LOCI 2 #define MAX_COLS MAX_LOCI * 2 /* max genotypes: 2^max_loci*max_rows */ -#define MAX_GENOS 40000 /* RS changed from 64*MAX_ROWS and then 20000 */ +#define MAX_GENOS 300000 /* RS changed from 64*MAX_ROWS and then 20000 */ #define MAX_HAPLOS 30000 /* RS added and changed declaration in main_proc */ -#define CRITERION 0.000001 -#define MAX_ITER 400 /* RS changed from 200 */ +#define CRITERION 0.0001 +#define MAX_ITER 600 /* RS changed from 200 */ #define FALSE 0 #define TRUE 1 -#define MAX_INIT 50 +#define MAX_INIT 10 -#define MAX_GENOS_PER_PHENO 64 /* 2^(max_loci - 1) */ +#define MAX_GENOS_PER_PHENO 2 /* 2^(max_loci - 1) */ #define MAX_PERMU 1001 #define MAX_INIT_FOR_PERMU 5