Skip to content
Snippets Groups Projects
Commit 0dc226a9 authored by Julien Malik's avatar Julien Malik
Browse files

DOC: improve doc and logs of classification chain

parent 8450523d
No related branches found
No related tags found
No related merge requests found
...@@ -44,7 +44,7 @@ private: ...@@ -44,7 +44,7 @@ private:
EstimateImagesStatistics() EstimateImagesStatistics()
{ {
SetName("EstimateImagesStatistics"); SetName("EstimateImagesStatistics");
SetDescription("Estimate mean/standard deviation for all images in the input list. Possibility to write the output in an xml file or just display the result."); SetDescription("Estimate mean/standard deviation for all images in the input list and optionally save the results in an XML file");
} }
virtual ~EstimateImagesStatistics() virtual ~EstimateImagesStatistics()
...@@ -54,8 +54,8 @@ private: ...@@ -54,8 +54,8 @@ private:
void DoCreateParameters() void DoCreateParameters()
{ {
AddParameter(ParameterType_InputImageList, "il", "Input Image List"); AddParameter(ParameterType_InputImageList, "il", "Input Image List");
AddParameter(ParameterType_Filename, "out", "Output xml file"); AddParameter(ParameterType_Filename, "out", "Output XML file");
SetParameterDescription( "out", "If set, will write the statistics into the given html file." ); SetParameterDescription( "out", "Name of the XML file where the statistics are saved for future reuse" );
MandatoryOff("out"); MandatoryOff("out");
} }
......
...@@ -70,7 +70,7 @@ private: ...@@ -70,7 +70,7 @@ private:
ImageSVMClassifier() ImageSVMClassifier()
{ {
SetName("ImageSVMClassifier"); SetName("ImageSVMClassifier");
SetDescription("Perform SVM classification based a previous computed svm model to an new input image."); SetDescription("Perform SVM classification based a previous computed SVM model");
} }
virtual ~ImageSVMClassifier() virtual ~ImageSVMClassifier()
...@@ -91,7 +91,7 @@ private: ...@@ -91,7 +91,7 @@ private:
MandatoryOff("imstat"); MandatoryOff("imstat");
AddParameter(ParameterType_Filename, "svm", "SVM Model."); AddParameter(ParameterType_Filename, "svm", "SVM Model.");
SetParameterDescription("svm", "An estimated svm model previously computed"); SetParameterDescription("svm", "An estimated SVM model previously computed");
AddParameter(ParameterType_OutputImage, "out", "Output Image"); AddParameter(ParameterType_OutputImage, "out", "Output Image");
SetParameterDescription( "out", "Output labeled image"); SetParameterDescription( "out", "Output labeled image");
...@@ -105,16 +105,15 @@ private: ...@@ -105,16 +105,15 @@ private:
void DoExecute() void DoExecute()
{ {
otbAppLogDEBUG("Entering DoExecute");
// Load input image // Load input image
FloatVectorImageType::Pointer inImage = GetParameterImage("in"); FloatVectorImageType::Pointer inImage = GetParameterImage("in");
inImage->UpdateOutputInformation(); inImage->UpdateOutputInformation();
// Load svm model // Load svm model
otbAppLogINFO("Loading SVM model");
m_ModelSVM = ModelType::New(); m_ModelSVM = ModelType::New();
m_ModelSVM->LoadModel(GetParameterString("svm").c_str()); m_ModelSVM->LoadModel(GetParameterString("svm").c_str());
otbAppLogINFO("SVM model loaded");
// Normalize input image (optional) // Normalize input image (optional)
StatisticsReader::Pointer statisticsReader = StatisticsReader::New(); StatisticsReader::Pointer statisticsReader = StatisticsReader::New();
...@@ -129,13 +128,13 @@ private: ...@@ -129,13 +128,13 @@ private:
// Normalize input image if asked // Normalize input image if asked
if( HasValue("imstat") ) if( HasValue("imstat") )
{ {
otbAppLogDEBUG("Input image normalization activated."); otbAppLogINFO("Input image normalization activated.");
// Load input image statistics // Load input image statistics
statisticsReader->SetFileName(GetParameterString("imstat")); statisticsReader->SetFileName(GetParameterString("imstat"));
meanMeasurementVector = statisticsReader->GetStatisticVectorByName("mean"); meanMeasurementVector = statisticsReader->GetStatisticVectorByName("mean");
stddevMeasurementVector = statisticsReader->GetStatisticVectorByName("stddev"); stddevMeasurementVector = statisticsReader->GetStatisticVectorByName("stddev");
otbAppLogDEBUG( "mean used: " << meanMeasurementVector ); otbAppLogINFO( "mean used: " << meanMeasurementVector );
otbAppLogDEBUG( "standard deviation used: " << stddevMeasurementVector ); otbAppLogINFO( "standard deviation used: " << stddevMeasurementVector );
// Rescale vector image // Rescale vector image
m_Rescaler->SetScale(stddevMeasurementVector); m_Rescaler->SetScale(stddevMeasurementVector);
m_Rescaler->SetShift(meanMeasurementVector); m_Rescaler->SetShift(meanMeasurementVector);
...@@ -145,14 +144,14 @@ private: ...@@ -145,14 +144,14 @@ private:
} }
else else
{ {
otbAppLogDEBUG("Input image normalization deactivated."); otbAppLogINFO("Input image normalization deactivated.");
m_ClassificationFilter->SetInput(inImage); m_ClassificationFilter->SetInput(inImage);
} }
if( HasValue("mask") ) if( HasValue("mask") )
{ {
otbAppLogDEBUG("Use input mask."); otbAppLogINFO("Using input mask");
// Load mask image and cast into LabeledImageType // Load mask image and cast into LabeledImageType
FloatVectorImageType::Pointer inMask = GetParameterImage("mask"); FloatVectorImageType::Pointer inMask = GetParameterImage("mask");
ExtractImageFilterType::Pointer extract = ExtractImageFilterType::New(); ExtractImageFilterType::Pointer extract = ExtractImageFilterType::New();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment