fixing code style check

DEploid-dev · Mar 29, 2021 · fd1a513 · fd1a513
1 parent 507f9b0
commit fd1a513
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 14 deletions.
diff --git a/src/ibd.cpp b/src/ibd.cpp
@@ -685,7 +685,11 @@ void IBDpath::makeLlkSurf(vector <double> altCount, vector <double> refCount,
 
         vector <double> ll;
         for ( double unadjustedP : pGrid ) {
-            ll.push_back(log(calcSiteLikelihood(ref, alt, unadjustedP, err, scalingConst)));
+            ll.push_back(log(calcSiteLikelihood(ref,
+                                                alt,
+                                                unadjustedP,
+                                                err,
+                                                scalingConst)));
         }
 
         double llmax = max_value(ll);

diff --git a/src/mcmc.hpp b/src/mcmc.hpp
@@ -27,7 +27,7 @@
 #include <iostream>
 #include <iomanip>      // std::setw
 #include <string>
-#include <utility>      // std::pair <>
+#include <utility>      // std::pair<>
 #include "random/mersenne_twister.hpp"
 #include "dEploidIO.hpp"
 #include "panel.hpp"

diff --git a/tests/unittest/test_utilities.cpp b/tests/unittest/test_utilities.cpp
@@ -253,32 +253,46 @@ class TestUtility : public CppUnit::TestCase {
 
     void testCalcLLK() {
         CPPUNIT_ASSERT_DOUBLES_EQUAL(0.0,
-          log(calcSiteLikelihood(0, 0, 0.0, this->err_, this->scalingFactor_)), ep2);
+          log(calcSiteLikelihood(0, 0, 0.0, this->err_, this->scalingFactor_)),
+          ep2);
         CPPUNIT_ASSERT_DOUBLES_EQUAL(0.0,
-          log(calcSiteLikelihood(0, 0, 1.0, this->err_, this->scalingFactor_)), ep2);
+          log(calcSiteLikelihood(0, 0, 1.0, this->err_, this->scalingFactor_)),
+          ep2);
         CPPUNIT_ASSERT_DOUBLES_EQUAL(0.0,
-          log(calcSiteLikelihood(0, 0, 0.5, this->err_, this->scalingFactor_)), ep2);
+          log(calcSiteLikelihood(0, 0, 0.5, this->err_, this->scalingFactor_)),
+          ep2);
 
         CPPUNIT_ASSERT_DOUBLES_EQUAL(-0.09622803,
-          log(calcSiteLikelihood(10, 0, 0.0, this->err_, this->scalingFactor_)), ep2);
+          log(calcSiteLikelihood(10, 0, 0.0, this->err_, this->scalingFactor_)),
+          ep2);
         CPPUNIT_ASSERT_DOUBLES_EQUAL(-31.38367782,
-          log(calcSiteLikelihood(10, 0, 1.0, this->err_, this->scalingFactor_)), ep2);
+          log(calcSiteLikelihood(10, 0, 1.0, this->err_, this->scalingFactor_)),
+          ep2);
         CPPUNIT_ASSERT_DOUBLES_EQUAL(-6.520005876,
-          log(calcSiteLikelihood(10, 0, 0.5, this->err_, this->scalingFactor_)), ep2);
+          log(calcSiteLikelihood(10, 0, 0.5, this->err_, this->scalingFactor_)),
+          ep2);
 
         CPPUNIT_ASSERT_DOUBLES_EQUAL(-92.39749823,
-          log(calcSiteLikelihood(0, 50, 0.0, this->err_, this->scalingFactor_)), ep2);
+          log(calcSiteLikelihood(0, 50, 0.0, this->err_, this->scalingFactor_)),
+          ep2);
         CPPUNIT_ASSERT_DOUBLES_EQUAL(-0.4088264558,
-          log(calcSiteLikelihood(0, 50, 1.0, this->err_, this->scalingFactor_)), ep2);
+          log(calcSiteLikelihood(0, 50, 1.0, this->err_, this->scalingFactor_)),
+          ep2);
         CPPUNIT_ASSERT_DOUBLES_EQUAL(-26.30680376,
-          log(calcSiteLikelihood(0, 50, 0.5, this->err_, this->scalingFactor_)), ep2);
+          log(calcSiteLikelihood(0, 50, 0.5, this->err_, this->scalingFactor_)),
+          ep2);
 
         CPPUNIT_ASSERT_DOUBLES_EQUAL(-39.454802987,
-          log(calcSiteLikelihood(11, 13, 0.0, this->err_, this->scalingFactor_)), ep2);
+          log(calcSiteLikelihood(11, 13, 0.0, this->err_,
+                                 this->scalingFactor_)),
+          ep2);
         CPPUNIT_ASSERT_DOUBLES_EQUAL(-82.7561739077,
-          log(calcSiteLikelihood(41, 2, 1.0, this->err_, this->scalingFactor_)), ep2);
+          log(calcSiteLikelihood(41, 2, 1.0, this->err_, this->scalingFactor_)),
+          ep2);
         CPPUNIT_ASSERT_DOUBLES_EQUAL(-71.6257227,
-          log(calcSiteLikelihood(23, 99, 0.5, this->err_, this->scalingFactor_)), ep2);
+          log(calcSiteLikelihood(23, 99, 0.5, this->err_,
+                                 this->scalingFactor_)),
+          ep2);
     }