[Genabel-commits] r664 - pkg/MixABEL/src/MXlib

[noreply at r-forge.r-project.org]

Author: wja
Date: 2011-02-26 17:23:51 +0100 (Sat, 26 Feb 2011)
New Revision: 664

Modified:
   pkg/MixABEL/src/MXlib/main.cpp
   pkg/MixABEL/src/MXlib/twovarcomp.cpp
Log:
Fixed bug in MixABEL due to hashed outline in main.cpp which meant chisq statistics were all equal to zero

Modified: pkg/MixABEL/src/MXlib/main.cpp
===================================================================
--- pkg/MixABEL/src/MXlib/main.cpp	2011-02-25 21:03:20 UTC (rev 663)
+++ pkg/MixABEL/src/MXlib/main.cpp	2011-02-26 16:23:51 UTC (rev 664)
@@ -197,7 +197,7 @@
       ChildTwoVarCompModel.SetExplan(ppexplantemp_vec[OMP_GET_THREAD_NUM]);
       altminimand=nullminimand;
     
-      //pchisq[it]=nulldev-ChildTwoVarCompModel.MinimiseDeviance(&altminimand);
+      pchisq[it]=nulldev-ChildTwoVarCompModel.MinimiseDeviance(&altminimand);
       
       pherit[it]=altminimand;
       ChildTwoVarCompModel.GetBeta(ppbeta_vec[OMP_GET_THREAD_NUM], altminimand);

Modified: pkg/MixABEL/src/MXlib/twovarcomp.cpp
===================================================================
--- pkg/MixABEL/src/MXlib/twovarcomp.cpp	2011-02-25 21:03:20 UTC (rev 663)
+++ pkg/MixABEL/src/MXlib/twovarcomp.cpp	2011-02-26 16:23:51 UTC (rev 664)
@@ -791,21 +791,21 @@
     }
  
   if(ppRvPx_mat[0])
-	gsl_matrix_free(ppRvPx_mat[0]);
-      if(ppRvPx_mat[1])
-	gsl_matrix_free(ppRvPx_mat[1]);
-      if(ppPVPx_mat[0])
-	gsl_matrix_free(ppPVPx_mat[0]);
-      if(ppPVPx_mat[1])
-	gsl_matrix_free(ppPVPx_mat[1]);
-      if(ppxPVPx_mat[0])
-	gsl_matrix_free(ppxPVPx_mat[0]);
-      if(ppxPVPx_mat[1])
-	gsl_matrix_free(ppxPVPx_mat[1]);
-      if(ppxPVPy_vec[0])
-	gsl_vector_free(ppxPVPy_vec[0]);
-      if(ppxPVPy_vec[1])
-	gsl_vector_free(ppxPVPy_vec[1]);
+    gsl_matrix_free(ppRvPx_mat[0]);
+  if(ppRvPx_mat[1])
+    gsl_matrix_free(ppRvPx_mat[1]);
+  if(ppPVPx_mat[0])
+    gsl_matrix_free(ppPVPx_mat[0]);
+  if(ppPVPx_mat[1])
+    gsl_matrix_free(ppPVPx_mat[1]);
+  if(ppxPVPx_mat[0])
+    gsl_matrix_free(ppxPVPx_mat[0]);
+  if(ppxPVPx_mat[1])
+    gsl_matrix_free(ppxPVPx_mat[1]);
+  if(ppxPVPy_vec[0])
+    gsl_vector_free(ppxPVPy_vec[0]);
+  if(ppxPVPy_vec[1])
+    gsl_vector_free(ppxPVPy_vec[1]);
   
 }