style check

DEploid-dev · Oct 7, 2018 · ad6b99e · ad6b99e
1 parent 328d44b
commit ad6b99e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/DEploid-Lasso-lib b/DEploid-Lasso-lib
diff --git a/src/dEploid.cpp b/src/dEploid.cpp
@@ -51,7 +51,7 @@ int main(int argc, char *argv[]) {
             dEploidIO.paintIBD();
         } else if (dEploidIO.useLasso()) {
             dEploidIO.dEploidLasso();
-            //cout << "to do" << endl;
+            // cout << "to do" << endl;
         } else {
             if (dEploidIO.useIBD()) {  // ibd
                 McmcSample * ibdMcmcSample = new McmcSample();

diff --git a/tests/unittest/test_dEploidIO.cpp b/tests/unittest/test_dEploidIO.cpp
@@ -823,14 +823,15 @@ class TestIO : public CppUnit::TestCase {
                          "-lasso" };
         CPPUNIT_ASSERT_NO_THROW(DEploidIO(10, argv));
         DEploidIO dEploidIOlasso(10, argv);
-        //CPPUNIT_ASSERT_EQUAL(dEploidIOlasso.obsWsaf_.size(), (size_t)594);
-        //CPPUNIT_ASSERT_DOUBLES_EQUAL(dEploidIOlasso.obsWsaf_[0], 0, epsilon3);
-        //CPPUNIT_ASSERT_DOUBLES_EQUAL(dEploidIOlasso.obsWsaf_[4],
-                                     //0.22772277, epsilon2);
-        //CPPUNIT_ASSERT_DOUBLES_EQUAL(dEploidIOlasso.obsWsaf_[11],
-                                     //0.21111111, epsilon2);
-        //CPPUNIT_ASSERT_DOUBLES_EQUAL(dEploidIOlasso.obsWsaf_[589],
-                                     //0.18324607, epsilon2);
+        // CPPUNIT_ASSERT_EQUAL(dEploidIOlasso.obsWsaf_.size(), (size_t)594);
+        // CPPUNIT_ASSERT_DOUBLES_EQUAL(dEploidIOlasso.obsWsaf_[0],
+                                     // 0, epsilon3);
+        // CPPUNIT_ASSERT_DOUBLES_EQUAL(dEploidIOlasso.obsWsaf_[4],
+                                     // 0.22772277, epsilon2);
+        // CPPUNIT_ASSERT_DOUBLES_EQUAL(dEploidIOlasso.obsWsaf_[11],
+                                     // 0.21111111, epsilon2);
+        // CPPUNIT_ASSERT_DOUBLES_EQUAL(dEploidIOlasso.obsWsaf_[589],
+                                     // 0.18324607, epsilon2);
     }
 };
+5 −0		.gitignore
+2 −2		src/dEploidLasso.hpp
+9 −6		tests/unittest/test_DEploidLASSO.cpp
+1 −1		tests/unittest/test_standardizeVector.cpp
+6 −6		tests/unittest/test_txtReader.cpp