added modify names parameter to set.dir

[mothur.git] / forest.cpp

diff --git a/forest.cpp b/forest.cpp
index 8ac1b79ca12c540ccb8c38498cc62b0201bc2f41..179ecef19d26de2a61f68776445dfdfc72132f07 100644 (file)
--- a/forest.cpp
+++ b/forest.cpp
@@ -16,10 +16,10 @@ Forest::Forest(const std::vector < std::vector<int> > dataSet,
 numDecisionTrees(numDecisionTrees),
 numSamples((int)dataSet.size()),
 numFeatures((int)(dataSet[0].size() - 1)),
-globalDiscardedFeatureIndices(getGlobalDiscardedFeatureIndices()),
 globalVariableImportanceList(numFeatures, 0),
 treeSplitCriterion(treeSplitCriterion) {
     m = MothurOut::getInstance();
+    globalDiscardedFeatureIndices = getGlobalDiscardedFeatureIndices();
     // TODO: double check if the implemenatation of 'globalOutOfBagEstimates' is correct
 }
 
@@ -27,10 +27,11 @@ treeSplitCriterion(treeSplitCriterion) {
 
 vector<int> Forest::getGlobalDiscardedFeatureIndices() {
     try {
-        vector<int> globalDiscardedFeatureIndices;
+        //vector<int> globalDiscardedFeatureIndices;
+        //globalDiscardedFeatureIndices.push_back(1);
         
         // calculate feature vectors
-        vector< vector<int> > featureVectors(numFeatures, vector<int>(numSamples, 0));
+        vector< vector<int> > featureVectors(numFeatures, vector<int>(numSamples, 0) );
         for (int i = 0; i < numSamples; i++) {
             if (m->control_pressed) { return globalDiscardedFeatureIndices; }
             for (int j = 0; j < numFeatures; j++) { featureVectors[j][i] = dataSet[i][j]; }