Browse Source

local commit

Michael Kemmler 13 years ago
parent
commit
2e02ead2f2

+ 4 - 0
classifier/genericClassifierSelection.h

@@ -4,6 +4,7 @@
 #include "core/basics/StringTools.h"
 #include "core/basics/StringTools.h"
 
 
 #include "vislearning/classifier/vclassifier/VCAmitSVM.h"
 #include "vislearning/classifier/vclassifier/VCAmitSVM.h"
+#include "vislearning/classifier/vclassifier/VCNearestClassMean.h"
 #include "vislearning/classifier/vclassifier/VCSimpleGaussian.h"
 #include "vislearning/classifier/vclassifier/VCSimpleGaussian.h"
 #include "vislearning/classifier/vclassifier/VCNearestNeighbour.h"
 #include "vislearning/classifier/vclassifier/VCNearestNeighbour.h"
 #include "vislearning/classifier/vclassifier/VCCrossGeneralization.h"
 #include "vislearning/classifier/vclassifier/VCCrossGeneralization.h"
@@ -66,6 +67,9 @@ class GenericClassifierSelection
 #ifdef NICE_USELIB_ICE 
 #ifdef NICE_USELIB_ICE 
 			 } else if ( classifier_type == "gauss" ) {
 			 } else if ( classifier_type == "gauss" ) {
 				  classifier = new VCSimpleGaussian( conf );
 				  classifier = new VCSimpleGaussian( conf );
+
+                         } else if ( classifier_type == "nearest_classmean2" ) {
+                                  classifier = new VCNearestClassMean( conf, new NICE::EuclidianDistance<double>() );
 #endif
 #endif
 			 } else if ( classifier_type == "random_forest" ) {
 			 } else if ( classifier_type == "random_forest" ) {
 				  FeaturePoolClassifier *fpc = new FPCRandomForests ( conf, "RandomForest" );
 				  FeaturePoolClassifier *fpc = new FPCRandomForests ( conf, "RandomForest" );

+ 1 - 1
features/gradientfeatures/progs/testPHOGFeatures.cpp

@@ -42,7 +42,7 @@ int main(int argc, char **argv)
 	
 	
 	PHOG.sayYourName();
 	PHOG.sayYourName();
 	
 	
-	std::cerr << "Concatenating NONE histograms resulting in \sum_{i=0}{level} 4^i histograms." << std::endl;
+	std::cerr << "Concatenating NONE histograms resulting in \\sum_{i=0}{level} 4^i histograms." << std::endl;
 	PHOG.set_histrogram_concatenation(OBJREC::PHOGFeature::NONE);
 	PHOG.set_histrogram_concatenation(OBJREC::PHOGFeature::NONE);
 	std::vector<std::vector<float> > resulting_feature = PHOG.createOneFeatureVector(imgfilename);
 	std::vector<std::vector<float> > resulting_feature = PHOG.createOneFeatureVector(imgfilename);
 	for (std::vector<std::vector<float> >::const_iterator i = resulting_feature.begin(); i != resulting_feature.end(); i++)
 	for (std::vector<std::vector<float> >::const_iterator i = resulting_feature.begin(); i != resulting_feature.end(); i++)