}
}
}
- else if (matrix == "sim9") { }
+ else if (matrix == "sim9" || matrix == "sim2") { }
else {
m->mothurOut("[ERROR]: No model selected! \n");
m->control_pressed = true;
//burn-in for sim9
if(matrix == "sim9") {
- for(int i=0;i<10000;i++) trial.swap_checkerboards (co_matrix, rowtotal, columntotal, ncols, nrows);
+ for(int i=0;i<10000;i++) trial.swap_checkerboards (co_matrix, ncols, nrows);
}
//populate null matrix from probability matrix, do this a lot.
- for(int h=0;h<runs;h++){
+ for(int k=0;k<runs;k++){
nullmatrix.clear();
//zero-fill the null matrix
nullmatrix.assign(nrows, vector<int>(ncols, 0));
else if(matrix == "sim4") {
for(int i=0;i<nrows;i++) {
- previous = 0.0;
count = 0;
while(count < rowtotal[i]) {
previous = 0.0;
randnum = rand() / double(RAND_MAX);
for(int j=0;j<ncols;j++) {
current = probabilityMatrix[ncols * i + j];
- if((randnum <= current && randnum > previous && nullmatrix[i][j] != 1) || (previous==current)){
+ if(randnum <= current && randnum > previous && nullmatrix[i][j] != 1) {
nullmatrix[i][j] = 1;
count++;
previous = 0.0;
//swap_checkerboards takes the original matrix and swaps checkerboards
else if(matrix == "sim9") {
- trial.swap_checkerboards (co_matrix, rowtotal, columntotal, ncols, nrows);
+ trial.swap_checkerboards (co_matrix, ncols, nrows);
+ nullmatrix = co_matrix;
}
else {
m->mothurOut("[ERROR]: No null model selected!\n\n"); m->control_pressed = true;