From 7c4f54edf75790e93be1339dc1e68958f8eea252 Mon Sep 17 00:00:00 2001
From: Sam White <white67@illinois.edu>
Date: Mon, 29 Oct 2018 15:53:14 -0500
Subject: [PATCH] Cleanup: remove all instances of 'using std::*' from headers

Change-Id: Iac5f95817803a311d606e049d9eca8b8b0a7f154
---
 src/ck-ldb/RandomForestModel.h | 15 +++++++--------
 src/ck-ldb/forestTest.C        |  4 ++--
 src/ck-ldb/readmodel.C         |  2 +-
 src/ck-ldb/treeTest.C          |  4 ++--
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/ck-ldb/RandomForestModel.h b/src/ck-ldb/RandomForestModel.h
index f4795efae6..f6694ebae7 100644
--- a/src/ck-ldb/RandomForestModel.h
+++ b/src/ck-ldb/RandomForestModel.h
@@ -40,10 +40,9 @@
 #define LB_CLASSES 6
 #define DEPTH 9
 
-using std::vector;
 namespace rfmodel {
 struct DataMatrix {
-  vector<double> data;
+  std::vector<double> data;
   int num_rows;
   int num_cols;
   DataMatrix() {}
@@ -53,7 +52,7 @@ struct DataMatrix {
     else
       data.resize(nrows * ncols, 0);
   }
-  DataMatrix(const vector<double>& d, int nrows, int ncols)
+  DataMatrix(const std::vector<double>& d, int nrows, int ncols)
       : data(d), num_rows(nrows), num_cols(ncols) {
     CkAssert(d.size() == (size_t)nrows * (size_t)ncols);
   }
@@ -176,21 +175,21 @@ struct Model {
   int classifierID;
   int r1;
   int r2;
-  vector<double> w;
+  std::vector<double> w;
   double weakTest(const DataMatrix& X) const;
 };
 
 struct TreeModel {
   int l_X, l_D;
   int* classes;
-  vector<Model> weakModels;
-  vector<double> leafdist;
-  void treeTest(const DataMatrix& X, vector<double>& Ysoft) const;
+  std::vector<Model> weakModels;
+  std::vector<double> leafdist;
+  void treeTest(const DataMatrix& X, std::vector<double>& Ysoft) const;
 };
 
 struct ForestModel {
   int classes[LB_CLASSES];
-  vector<TreeModel> treeModels;
+  std::vector<TreeModel> treeModels;
   void readModel(const char* dir);
   int forestTest(std::vector<double>& X, int num_rows, int num_cols);
 };
diff --git a/src/ck-ldb/forestTest.C b/src/ck-ldb/forestTest.C
index 058d555bfb..7e972a6eea 100644
--- a/src/ck-ldb/forestTest.C
+++ b/src/ck-ldb/forestTest.C
@@ -39,9 +39,9 @@ int ForestModel::forestTest(std::vector<double>& X, int num_rows, int num_cols)
   // X is NxD, where rows are data points
 
   int numTrees = NUM_TREES;
-  vector<double> Ysoft(LB_CLASSES);
+  std::vector<double> Ysoft(LB_CLASSES);
 
-  vector<double> model_Ysoft(LB_CLASSES);
+  std::vector<double> model_Ysoft(LB_CLASSES);
   DataMatrix Xarray(X, num_rows, num_cols);
 
   // Assuming initialization to 0s
diff --git a/src/ck-ldb/readmodel.C b/src/ck-ldb/readmodel.C
index 1509792b7e..a4ccf99287 100644
--- a/src/ck-ldb/readmodel.C
+++ b/src/ck-ldb/readmodel.C
@@ -82,7 +82,7 @@ void ForestModel::readModel(const char* dir) {
   for (int k = 0; k < NUM_TREES; k++) {
     int classifierID, r1, r2;
     double val;
-    vector<double> w(3);
+    std::vector<double> w(3);
 
     int w_i;
     gzgets(pFile, linebuffer, LINE_SIZE);
diff --git a/src/ck-ldb/treeTest.C b/src/ck-ldb/treeTest.C
index cb2ec06228..47df0795f5 100644
--- a/src/ck-ldb/treeTest.C
+++ b/src/ck-ldb/treeTest.C
@@ -35,7 +35,7 @@
 using namespace rfmodel;
 
 // Test a tree
-void TreeModel::treeTest(const DataMatrix& X, vector<double>& Ysoft) const {
+void TreeModel::treeTest(const DataMatrix& X, std::vector<double>& Ysoft) const {
   //[N, D]= size(X); //Returns number of rows and columns in matrix X
   int N = X.num_rows;
   int D = X.num_cols;
@@ -45,7 +45,7 @@ void TreeModel::treeTest(const DataMatrix& X, vector<double>& Ysoft) const {
   int numInternals = (nd + 1) / 2 - 1;
 
   // Propagate data down the tree using weak classifiers at each node
-  vector<double> dataix(N * nd, 0.0);
+  std::vector<double> dataix(N * nd, 0.0);
 
   for (int n = 1; n <= numInternals; n++) {
     DataMatrix* reld;
-- 
2.11.4.GIT