[Genabel-commits] r1539 - branches/ProbABEL-0.50/src

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

Author: maartenk
Date: 2014-01-11 01:56:55 +0100 (Sat, 11 Jan 2014)
New Revision: 1539

Modified:
   branches/ProbABEL-0.50/src/reg1.cpp
   branches/ProbABEL-0.50/src/reg1.h
   branches/ProbABEL-0.50/src/regdata.cpp
Log:
masking of X and Y is only done ones. Still need to remove unessary variables from functions

Modified: branches/ProbABEL-0.50/src/reg1.cpp
===================================================================
--- branches/ProbABEL-0.50/src/reg1.cpp	2014-01-11 00:13:11 UTC (rev 1538)
+++ branches/ProbABEL-0.50/src/reg1.cpp	2014-01-11 00:56:55 UTC (rev 1539)
@@ -234,7 +234,7 @@
 
 linear_reg::linear_reg(regdata& rdatain)
 {
-    regdata rdata = rdatain.get_unmasked_data();
+     rdata = rdatain.get_unmasked_data();
     // std::cout << "linear_reg: " << rdata.nids << " " << (rdata.X).ncol
     //           << " " << (rdata.Y).ncol << "\n";
     int length_beta = (rdata.X).ncol;
@@ -307,7 +307,7 @@
 {
     // suda interaction parameter
     // model should come here
-    regdata rdata = rdatain.get_unmasked_data();
+   // regdata rdata = rdatain.get_unmasked_data();
     if (invvarmatrixin.length_of_mask != 0)
     {
         invvarmatrixin.update_mask(rdatain.masked_data);
@@ -557,7 +557,7 @@
                        double tol_chol, int model, int interaction, int ngpreds,
                        const masked_matrix& invvarmatrix, int nullmodel)
 {
-    regdata rdata = rdatain.get_unmasked_data();
+    //regdata rdata = rdatain.get_unmasked_data();
     base_score(resid, rdata, verbose, tol_chol, model, interaction, ngpreds,
                invvarmatrix, nullmodel = 0);
 }

Modified: branches/ProbABEL-0.50/src/reg1.h
===================================================================
--- branches/ProbABEL-0.50/src/reg1.h	2014-01-11 00:13:11 UTC (rev 1538)
+++ branches/ProbABEL-0.50/src/reg1.h	2014-01-11 00:56:55 UTC (rev 1539)
@@ -39,6 +39,7 @@
 
 class base_reg {
  public:
+    regdata rdata;
     mematrix<double> beta;
     mematrix<double> sebeta;
     //Han Chen

Modified: branches/ProbABEL-0.50/src/regdata.cpp
===================================================================
--- branches/ProbABEL-0.50/src/regdata.cpp	2014-01-11 00:13:11 UTC (rev 1538)
+++ branches/ProbABEL-0.50/src/regdata.cpp	2014-01-11 00:56:55 UTC (rev 1539)
@@ -177,7 +177,7 @@
 
 regdata::~regdata()
 {
-    delete[] regdata::masked_data;
+    //delete[] regdata::masked_data;
     // delete X;
     // delete Y;
 }