|
@@ -61,14 +61,13 @@ class GenericClassifierSelection
|
|
|
|
|
|
if ( classifier_type == "amit" ) {
|
|
|
classifier = new VCAmitSVM ( conf );
|
|
|
- } else if ( classifier_type == "nn" ) {
|
|
|
- classifier = new VCNearestNeighbour( conf, new NICE::EuclidianDistance<double>() );
|
|
|
+ } else if ( classifier_type == "nn" ) {
|
|
|
+ classifier = new VCNearestNeighbour( conf, new NICE::EuclidianDistance<double>() );
|
|
|
#ifdef NICE_USELIB_ICE
|
|
|
- } else if ( classifier_type == "gauss" ) {
|
|
|
- classifier = new VCSimpleGaussian( conf );
|
|
|
-
|
|
|
- } else if ( classifier_type == "nearest_classmean2" ) {
|
|
|
- classifier = new VCNearestClassMean( conf, new NICE::EuclidianDistance<double>() );
|
|
|
+ } else if ( classifier_type == "gauss" ) {
|
|
|
+ classifier = new VCSimpleGaussian( conf );
|
|
|
+ } else if ( classifier_type == "nearest_classmean" ) {
|
|
|
+ classifier = new VCNearestClassMean( conf, new NICE::EuclidianDistance<double>() );
|
|
|
#endif
|
|
|
} else if ( classifier_type == "random_forest" ) {
|
|
|
FeaturePoolClassifier *fpc = new FPCRandomForests ( conf, "RandomForest" );
|