diff --git a/Modules/Applications/AppClassification/app/otbTrainImagesClassifier.cxx b/Modules/Applications/AppClassification/app/otbTrainImagesClassifier.cxx index 2a84ff53e78b81d71c5eddc3f32967f5cd92fb0b..c841489f797b61416a7eec65f9f0ec810da9fa14 100644 --- a/Modules/Applications/AppClassification/app/otbTrainImagesClassifier.cxx +++ b/Modules/Applications/AppClassification/app/otbTrainImagesClassifier.cxx @@ -146,7 +146,7 @@ public: // { ComputePolygonStatistics( imageList, vectorFileList, fileNames.polyStatTrainOutputs ); ComputeSamplingRate( fileNames.polyStatTrainOutputs, fileNames.rateTrainOut, rates.fmt ); - SelectAndExtractTrainSamples( fileNames, imageList, vectorFileList, SamplingStrategy::CLASS ); + SelectAndExtractTrainSamples( fileNames, imageList, vectorFileList, Superclass::CLASS ); // } // else // Select training samples base on geometric sampling if no input vector is provided // { @@ -224,4 +224,4 @@ private : } // end namespace Wrapper } // end namespace otb -OTB_APPLICATION_EXPORT( otb::Wrapper::TrainImagesClassifier ) \ No newline at end of file +OTB_APPLICATION_EXPORT( otb::Wrapper::TrainImagesClassifier ) diff --git a/Modules/Applications/AppClassification/include/otbTrainImagesBase.h b/Modules/Applications/AppClassification/include/otbTrainImagesBase.h index a01eb6c430fffc3d588d109d0f41f1bf677783b5..3ca86e31cd0391c02930257c22d3b74420646ccc 100644 --- a/Modules/Applications/AppClassification/include/otbTrainImagesBase.h +++ b/Modules/Applications/AppClassification/include/otbTrainImagesBase.h @@ -62,10 +62,10 @@ public: protected: - enum SamplingStrategy + typedef enum { CLASS, GEOMETRIC - }; + } SamplingStrategy; struct SamplingRates; class TrainFileNamesHandler; diff --git a/Modules/Applications/AppClassification/include/otbTrainImagesBase.txx b/Modules/Applications/AppClassification/include/otbTrainImagesBase.txx index deb34bfc735224c66b64ac8a4d3d15d0b98ed7b3..93605b280744eb6ffdb89afc46b2d1b35a5a0df7 100644 --- a/Modules/Applications/AppClassification/include/otbTrainImagesBase.txx +++ b/Modules/Applications/AppClassification/include/otbTrainImagesBase.txx @@ -335,7 +335,7 @@ void TrainImagesBase::SelectAndExtractValidationSamples(const TrainFileNamesHand { SelectAndExtractSamples( imageList->GetNthElement( i ), validationVectorFileList[i], fileNames.sampleValidOutputs[i], fileNames.polyStatValidOutputs[i], - fileNames.ratesValidOutputs[i], SamplingStrategy::CLASS ); + fileNames.ratesValidOutputs[i], Self::CLASS ); } }