get the new lasso class to work

DEploid-dev · Oct 8, 2018 · 8df4664 · 8df4664
1 parent ad6b99e
commit 8df4664
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/DEploid-Lasso-lib b/DEploid-Lasso-lib
diff --git a/Makefile.am b/Makefile.am
@@ -34,10 +34,11 @@ common_src = src/random/fastfunc.cpp \
 			 src/export/dEploidIOExport.cpp \
 			 src/export/dEploidIOExportPosteriorProb.cpp \
 			 src/export/writeMcmcRelated.cpp \
+			 DEploid-Lasso-lib/src/lasso.cpp \
 			 DEploid-Lasso-lib/src/dEploidLasso.cpp
 
 debug_src = src/debug/mcmcDebug.cpp src/debug/vcfReaderDebug.cpp \
-			DEploid-Lasso-lib/src/dEploidLassoDBG.cpp
+			DEploid-Lasso-lib/src/lassoDBG.cpp
 
 dEploid_SOURCES = src/dEploid.cpp $(common_src)
 dEploid_dbg_SOURCES =  $(debug_src) $(dEploid_SOURCES)

diff --git a/src/dEploidIO.cpp b/src/dEploidIO.cpp
@@ -821,7 +821,8 @@ void DEploidIO::dEploidLasso() {
         vector < vector <double> > tmpPanel = lassoSubsetPanel(start, length);
         DEploidLASSO dummy(tmpPanel, wsaf, 250);
 
-        ////dummy.printResults();
+        //lassoPanels.push_back();
+        dummy.printResults();
 
         // for loop, for each chromosome
             // First produce reference panels

diff --git a/src/dEploidIO.hpp b/src/dEploidIO.hpp
@@ -172,6 +172,9 @@ class DEploidIO{
     bool doComputeLLK_;
     void setDoComputeLLK( const bool setTo ) { this->doComputeLLK_ = setTo; }
 
+    // Lasso Related
+    vector < vector < vector <double> > > lassoPanels;
+
     // Parameters
     double missCopyProb_;
     double averageCentimorganDistance_;// = 15000.0,
+1 −0		.gitignore
+2 −2		Makefile.am
+3 −2		main.cpp
+20 −560		src/dEploidLasso.cpp
+14 −205		src/dEploidLasso.hpp
+607 −0		src/lasso.cpp
+253 −0		src/lasso.hpp
+3 −3		src/lassoDBG.cpp
+2 −0		tests/unittest/test_DEploidLASSO.cpp