simplify scale()

zhanxw · Apr 26, 2016 · 5e2a86f · 5e2a86f
1 parent b51cd1e
commit 5e2a86f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/regression/MultipleTraitLinearRegressionScoreTest.cpp b/regression/MultipleTraitLinearRegressionScoreTest.cpp
@@ -81,11 +81,7 @@ void removeRow(const std::vector<bool>& missingIndicator, EMat* m) {
   (*m).conservativeResize(idx, (*m).cols());
 }
 
-void scale(EMat* m) {
-  (*m).rowwise() -= (*m).colwise().sum() / (*m).rows();
-  (*m).colwise().normalize();
-  // rowwise() /= (*m).colwise().norm().array();
-}
+void scale(EMat* m) { (*m).rowwise() -= (*m).colwise().sum() / (*m).rows(); }
 
 MultipleTraitLinearRegressionScoreTest::
     MultipleTraitLinearRegressionScoreTest() {

diff --git a/regression/MultipleTraitLinearRegressionScoreTest.h b/regression/MultipleTraitLinearRegressionScoreTest.h
@@ -12,15 +12,21 @@ class MultipleTraitLinearRegressionScoreTest {
  public:
   MultipleTraitLinearRegressionScoreTest();
   virtual ~MultipleTraitLinearRegressionScoreTest();
-  bool FitNullModel(Matrix& cov, Matrix& y,
-                    const FormulaVector & tests);
+  bool FitNullModel(Matrix& cov, Matrix& y, const FormulaVector& tests);
   bool TestCovariate(Matrix& g);
   Vector& GetPvalue() { return this->pvalue; };
   Vector& GetU() { return this->ustat; };
-  Vector& GetV() { return this->vstat; };  
+  Vector& GetV() { return this->vstat; };
+
+ private:
+  MultipleTraitLinearRegressionScoreTest(
+      const MultipleTraitLinearRegressionScoreTest&);
+  MultipleTraitLinearRegressionScoreTest& operator=(
+      const MultipleTraitLinearRegressionScoreTest&);
+
  private:
   Vector ustat;
-  Vector vstat;  
+  Vector vstat;
   Vector pvalue;
   MultipleTraitLinearRegressionScoreTestInternal* work;  // store working data
 };