From: westcott <westcott>
Date: Wed, 8 Dec 2010 21:51:24 +0000 (+0000)
Subject: metastats double* to double fix for windows
X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=commitdiff_plain;h=5c076cc7d3842d8050694918948e023334c9839e

metastats double* to double fix for windows
---

diff --git a/makefile b/makefile
index 36d0d77..aa20f8c 100644
--- a/makefile
+++ b/makefile
@@ -30,8 +30,8 @@ endif
 
 MOTHUR_FILES = "\"../release\""
 
-RELEASE_DATE = "\"11/02/2010\""
-VERSION = "\"1.14.0\""
+RELEASE_DATE = "\"12/10/2010\""
+VERSION = "\"1.15.0\""
 
 CXXFLAGS += -DRELEASE_DATE=${RELEASE_DATE} -DVERSION=${VERSION}
 
diff --git a/metastats2.c b/metastats2.c
index a6424f5..8f5ce39 100644
--- a/metastats2.c
+++ b/metastats2.c
@@ -34,8 +34,8 @@ int metastat_main (char* outputFileName, int numRows, int numCols, double thresh
 		storage[i] = malloc(9*sizeof(double));
 	}
 	
-	pmatrix = (double *) malloc(size*sizeof(double *));
-	permuted = (double *) malloc(size*sizeof(double *));
+	pmatrix = (double *) malloc(size*sizeof(double));
+	permuted = (double *) malloc(size*sizeof(double));
 	
 		
 	
@@ -133,9 +133,9 @@ int metastat_main (char* outputFileName, int numRows, int numCols, double thresh
 
   //changing ptt_size to row
   double * permuted_ttests, * pvalues, * tinitial;
-  permuted_ttests = (double *) malloc(size*sizeof(double *));
-  pvalues = (double *) malloc(size*sizeof(double *));
-  tinitial = (double *) malloc(size*sizeof(double *));
+  permuted_ttests = (double *) malloc(size*sizeof(double));
+  pvalues = (double *) malloc(size*sizeof(double));
+  tinitial = (double *) malloc(size*sizeof(double));
   
   for(i=0;i<row;i++){
     permuted_ttests[i]=0;}
@@ -153,8 +153,8 @@ int metastat_main (char* outputFileName, int numRows, int numCols, double thresh
   if ( (col==2) || ((g-1)<8) || ((col-g+1) < 8) ){  
 
   double * fish, *fish2;
-  fish = (double *) malloc(size*sizeof(double *));
-  fish2 = (double *) malloc(size*sizeof(double *));
+  fish = (double *) malloc(size*sizeof(double));
+  fish2 = (double *) malloc(size*sizeof(double));
 	  
   for(i=0;i<row;i++){
   	fish[i]=0;
@@ -190,8 +190,8 @@ int metastat_main (char* outputFileName, int numRows, int numCols, double thresh
 	double *expect, *prc, *emin,*prt,*pre;
 	double e=0, prc1=0, emin1=0, prt1=0, pre1=0;
 	  
-	prt = (double *) malloc(size*sizeof(double *));
-	prc = (double *) malloc(size*sizeof(double *));
+	prt = (double *) malloc(size*sizeof(double));
+	prc = (double *) malloc(size*sizeof(double));
 
 	nr = &nrow;
 	nc = &ncol;
@@ -214,13 +214,13 @@ int metastat_main (char* outputFileName, int numRows, int numCols, double thresh
     }
   }
   else{
-printf("here before testp\n");	  	 
+	  	 
   testp(permuted_ttests, permutes, permuted,pmatrix, nc, nr, gvalue,tinitial,pvalues);
   	 
   	       // Checks to make sure the matrix isn't sparse.
   double * sparse, * sparse2;
-  sparse = (double *) malloc(size*sizeof(double *));
-  sparse2 = (double *) malloc(size*sizeof(double *));
+  sparse = (double *) malloc(size*sizeof(double));
+  sparse2 = (double *) malloc(size*sizeof(double));
 	  
   for(i=0;i<row;i++){
   	sparse[i]=0;
@@ -275,7 +275,7 @@ printf("here before testp\n");
 	emin=&emin1;
 	prt=&prt1;
 	pre=&pre1;
-printf("here before fexact2\n");		
+	
 	fexact(nr,nc,data, ldtabl,expect,prc,emin,prt,pre,work);
 	
 	if (*pre>.999999999){
@@ -295,7 +295,7 @@ printf("here before fexact2\n");
   for (i = 0; i<row; i++){
 	 temp[i] = malloc(col*sizeof(double));
   }
-printf("here\n");	  
+	  
   for(j=0;j<row;j++){
   	for(i=0;i<2;i++){
   		temp[j][i]=0;
@@ -558,8 +558,7 @@ void start(double *Imatrix,int *g,int *nr,int *nc,double *initial,
     C1[i][1]=tool[i+*nr+*nr]; // var group 1
     storage[i][1]=C1[i][1];
     C1[i][2]=C1[i][1]/(gvalue-1);
-    storage[i][2]=sqrt(C1[i][2]);
-    printf("here2\n"); 
+    storage[i][2]=sqrt(C1[i][2]); 
     C2[i][0]=tool[i+*nr]; // mean group 2
     storage[i][4]=C2[i][0]; 
     C2[i][1]=tool[i+*nr+*nr+*nr]; // var group 2 
diff --git a/mothur b/mothur
index 3b721ad..8537592 100755
Binary files a/mothur and b/mothur differ
diff --git a/removegroupscommand.cpp b/removegroupscommand.cpp
index 93646bc..6042bbe 100644
--- a/removegroupscommand.cpp
+++ b/removegroupscommand.cpp
@@ -420,6 +420,7 @@ int RemoveGroupsCommand::readName(){
 				}
 			}
 			
+			
 			//if the name in the first column is in the set then print it and any other names in second column also in set
 			if (names.count(firstCol) == 0) {