Commit 2fe67c0a authored by sgebreeg's avatar sgebreeg
Browse files

merge conflict resolved

parent 93f63439
......@@ -35,7 +35,7 @@ int main(int argc, char *argv[]) {
int numTrees = atoi(argv[1]);
float baggingWeight = 0.7;
int depth = atoi(argv[2]);
float featureWeight = 0.3;
float featureWeight = 0.005;
// double featWeight = numFeatures * 0.1;
// cout << featWeight << "\n";
......@@ -44,9 +44,9 @@ int main(int argc, char *argv[]) {
vector <vector<string>> datasetAsString;
vector <FeatureType> featureTypes;
vector <string> features;
datasetAsString = parseDataToString("../datasets/adult.data");
featureTypes = parseFeatureTypes("../datasets/adult.featureTypes");
features = parseFeatures("../datasets/adult.features");
datasetAsString = parseDataToString("../datasets/mnist.data");
featureTypes = parseFeatureTypes("../datasets/mnist.featureTypes");
features = parseFeatures("../datasets/mnist.features");
double accuracy = 0.0;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment