From d03c1766d92d8f9435fac69e812bc8afc3ca0baf Mon Sep 17 00:00:00 2001 From: OTB Bot <otbbot@orfeo-toolbox.org> Date: Wed, 6 Apr 2011 19:55:23 +0200 Subject: [PATCH] STYLE --- ...tbStreamingStatisticsVectorImageFilter.txx | 66 +++++++++---------- .../Learning/otbConfusionMatrixCalculator.txx | 4 +- .../otbSVMSampleListModelEstimator.txx | 2 +- ...varianceToReciprocalCoherencyImageFilter.h | 2 +- .../otbShiftScaleVectorImageFilterTest.cxx | 2 +- .../SARPolarimetry/otbSinclairImageFilter.cxx | 2 +- .../otbSinclairReciprocalImageFilter.cxx | 2 +- 7 files changed, 40 insertions(+), 40 deletions(-) diff --git a/Code/BasicFilters/otbStreamingStatisticsVectorImageFilter.txx b/Code/BasicFilters/otbStreamingStatisticsVectorImageFilter.txx index c576cef3fd..630c128279 100644 --- a/Code/BasicFilters/otbStreamingStatisticsVectorImageFilter.txx +++ b/Code/BasicFilters/otbStreamingStatisticsVectorImageFilter.txx @@ -32,7 +32,7 @@ namespace otb { template<class TInputImage, class TPrecision> -PersistentStreamingStatisticsVectorImageFilter<TInputImage,TPrecision> +PersistentStreamingStatisticsVectorImageFilter<TInputImage, TPrecision> ::PersistentStreamingStatisticsVectorImageFilter() : m_EnableMinMax(true), m_EnableFirstOrderStats(true), @@ -51,7 +51,7 @@ PersistentStreamingStatisticsVectorImageFilter<TInputImage,TPrecision> template<class TInputImage, class TPrecision> itk::DataObject::Pointer -PersistentStreamingStatisticsVectorImageFilter<TInputImage,TPrecision> +PersistentStreamingStatisticsVectorImageFilter<TInputImage, TPrecision> ::MakeOutput(unsigned int output) { switch (output) @@ -82,96 +82,96 @@ PersistentStreamingStatisticsVectorImageFilter<TInputImage,TPrecision> } template<class TInputImage, class TPrecision> -typename PersistentStreamingStatisticsVectorImageFilter<TInputImage,TPrecision>::PixelObjectType* -PersistentStreamingStatisticsVectorImageFilter<TInputImage,TPrecision> +typename PersistentStreamingStatisticsVectorImageFilter<TInputImage, TPrecision>::PixelObjectType* +PersistentStreamingStatisticsVectorImageFilter<TInputImage, TPrecision> ::GetMinimumOutput() { return static_cast<PixelObjectType*>(this->itk::ProcessObject::GetOutput(1)); } template<class TInputImage, class TPrecision> -const typename PersistentStreamingStatisticsVectorImageFilter<TInputImage,TPrecision>::PixelObjectType* -PersistentStreamingStatisticsVectorImageFilter<TInputImage,TPrecision> +const typename PersistentStreamingStatisticsVectorImageFilter<TInputImage, TPrecision>::PixelObjectType* +PersistentStreamingStatisticsVectorImageFilter<TInputImage, TPrecision> ::GetMinimumOutput() const { return static_cast<const PixelObjectType*>(this->itk::ProcessObject::GetOutput(1)); } template<class TInputImage, class TPrecision> -typename PersistentStreamingStatisticsVectorImageFilter<TInputImage,TPrecision>::PixelObjectType* -PersistentStreamingStatisticsVectorImageFilter<TInputImage,TPrecision> +typename PersistentStreamingStatisticsVectorImageFilter<TInputImage, TPrecision>::PixelObjectType* +PersistentStreamingStatisticsVectorImageFilter<TInputImage, TPrecision> ::GetMaximumOutput() { return static_cast<PixelObjectType*>(this->itk::ProcessObject::GetOutput(2)); } template<class TInputImage, class TPrecision> -const typename PersistentStreamingStatisticsVectorImageFilter<TInputImage,TPrecision>::PixelObjectType* -PersistentStreamingStatisticsVectorImageFilter<TInputImage,TPrecision> +const typename PersistentStreamingStatisticsVectorImageFilter<TInputImage, TPrecision>::PixelObjectType* +PersistentStreamingStatisticsVectorImageFilter<TInputImage, TPrecision> ::GetMaximumOutput() const { return static_cast<const PixelObjectType*>(this->itk::ProcessObject::GetOutput(2)); } template<class TInputImage, class TPrecision> -typename PersistentStreamingStatisticsVectorImageFilter<TInputImage,TPrecision>::RealPixelObjectType* -PersistentStreamingStatisticsVectorImageFilter<TInputImage,TPrecision> +typename PersistentStreamingStatisticsVectorImageFilter<TInputImage, TPrecision>::RealPixelObjectType* +PersistentStreamingStatisticsVectorImageFilter<TInputImage, TPrecision> ::GetMeanOutput() { return static_cast<RealPixelObjectType*>(this->itk::ProcessObject::GetOutput(3)); } template<class TInputImage, class TPrecision> -const typename PersistentStreamingStatisticsVectorImageFilter<TInputImage,TPrecision>::RealPixelObjectType* -PersistentStreamingStatisticsVectorImageFilter<TInputImage,TPrecision> +const typename PersistentStreamingStatisticsVectorImageFilter<TInputImage, TPrecision>::RealPixelObjectType* +PersistentStreamingStatisticsVectorImageFilter<TInputImage, TPrecision> ::GetMeanOutput() const { return static_cast<const RealPixelObjectType*>(this->itk::ProcessObject::GetOutput(3)); } template<class TInputImage, class TPrecision> -typename PersistentStreamingStatisticsVectorImageFilter<TInputImage,TPrecision>::RealPixelObjectType* -PersistentStreamingStatisticsVectorImageFilter<TInputImage,TPrecision> +typename PersistentStreamingStatisticsVectorImageFilter<TInputImage, TPrecision>::RealPixelObjectType* +PersistentStreamingStatisticsVectorImageFilter<TInputImage, TPrecision> ::GetSumOutput() { return static_cast<RealPixelObjectType*>(this->itk::ProcessObject::GetOutput(4)); } template<class TInputImage, class TPrecision> -const typename PersistentStreamingStatisticsVectorImageFilter<TInputImage,TPrecision>::RealPixelObjectType* -PersistentStreamingStatisticsVectorImageFilter<TInputImage,TPrecision> +const typename PersistentStreamingStatisticsVectorImageFilter<TInputImage, TPrecision>::RealPixelObjectType* +PersistentStreamingStatisticsVectorImageFilter<TInputImage, TPrecision> ::GetSumOutput() const { return static_cast<const RealPixelObjectType*>(this->itk::ProcessObject::GetOutput(4)); } template<class TInputImage, class TPrecision> -typename PersistentStreamingStatisticsVectorImageFilter<TInputImage,TPrecision>::MatrixObjectType* -PersistentStreamingStatisticsVectorImageFilter<TInputImage,TPrecision> +typename PersistentStreamingStatisticsVectorImageFilter<TInputImage, TPrecision>::MatrixObjectType* +PersistentStreamingStatisticsVectorImageFilter<TInputImage, TPrecision> ::GetCorrelationOutput() { return static_cast<MatrixObjectType*>(this->itk::ProcessObject::GetOutput(5)); } template<class TInputImage, class TPrecision> -const typename PersistentStreamingStatisticsVectorImageFilter<TInputImage,TPrecision>::MatrixObjectType* -PersistentStreamingStatisticsVectorImageFilter<TInputImage,TPrecision> +const typename PersistentStreamingStatisticsVectorImageFilter<TInputImage, TPrecision>::MatrixObjectType* +PersistentStreamingStatisticsVectorImageFilter<TInputImage, TPrecision> ::GetCorrelationOutput() const { return static_cast<const MatrixObjectType*>(this->itk::ProcessObject::GetOutput(5)); } template<class TInputImage, class TPrecision> -typename PersistentStreamingStatisticsVectorImageFilter<TInputImage,TPrecision>::MatrixObjectType* -PersistentStreamingStatisticsVectorImageFilter<TInputImage,TPrecision> +typename PersistentStreamingStatisticsVectorImageFilter<TInputImage, TPrecision>::MatrixObjectType* +PersistentStreamingStatisticsVectorImageFilter<TInputImage, TPrecision> ::GetCovarianceOutput() { return static_cast<MatrixObjectType*>(this->itk::ProcessObject::GetOutput(6)); } template<class TInputImage, class TPrecision> -const typename PersistentStreamingStatisticsVectorImageFilter<TInputImage,TPrecision>::MatrixObjectType* -PersistentStreamingStatisticsVectorImageFilter<TInputImage,TPrecision> +const typename PersistentStreamingStatisticsVectorImageFilter<TInputImage, TPrecision>::MatrixObjectType* +PersistentStreamingStatisticsVectorImageFilter<TInputImage, TPrecision> ::GetCovarianceOutput() const { return static_cast<const MatrixObjectType*>(this->itk::ProcessObject::GetOutput(6)); @@ -179,7 +179,7 @@ PersistentStreamingStatisticsVectorImageFilter<TInputImage,TPrecision> template<class TInputImage, class TPrecision> void -PersistentStreamingStatisticsVectorImageFilter<TInputImage,TPrecision> +PersistentStreamingStatisticsVectorImageFilter<TInputImage, TPrecision> ::GenerateOutputInformation() { Superclass::GenerateOutputInformation(); @@ -197,7 +197,7 @@ PersistentStreamingStatisticsVectorImageFilter<TInputImage,TPrecision> template<class TInputImage, class TPrecision> void -PersistentStreamingStatisticsVectorImageFilter<TInputImage,TPrecision> +PersistentStreamingStatisticsVectorImageFilter<TInputImage, TPrecision> ::AllocateOutputs() { // This is commented to prevent the streaming of the whole image for the first stream strip @@ -209,7 +209,7 @@ PersistentStreamingStatisticsVectorImageFilter<TInputImage,TPrecision> template<class TInputImage, class TPrecision> void -PersistentStreamingStatisticsVectorImageFilter<TInputImage,TPrecision> +PersistentStreamingStatisticsVectorImageFilter<TInputImage, TPrecision> ::Reset() { TInputImage * inputPtr = const_cast<TInputImage *>(this->GetInput()); @@ -271,7 +271,7 @@ PersistentStreamingStatisticsVectorImageFilter<TInputImage,TPrecision> template<class TInputImage, class TPrecision> void -PersistentStreamingStatisticsVectorImageFilter<TInputImage,TPrecision> +PersistentStreamingStatisticsVectorImageFilter<TInputImage, TPrecision> ::Synthetize() { TInputImage * inputPtr = const_cast<TInputImage *>(this->GetInput()); @@ -353,7 +353,7 @@ PersistentStreamingStatisticsVectorImageFilter<TInputImage,TPrecision> template<class TInputImage, class TPrecision> void -PersistentStreamingStatisticsVectorImageFilter<TInputImage,TPrecision> +PersistentStreamingStatisticsVectorImageFilter<TInputImage, TPrecision> ::ThreadedGenerateData(const RegionType& outputRegionForThread, int threadId) { // Support progress methods/callbacks @@ -398,7 +398,7 @@ PersistentStreamingStatisticsVectorImageFilter<TInputImage,TPrecision> { for (unsigned int c = 0; c < threadSecondOrder.Cols(); ++c) { - threadSecondOrder(r,c) += vectorValue[r] * vectorValue[c]; + threadSecondOrder(r, c) += vectorValue[r] * vectorValue[c]; } } } @@ -408,7 +408,7 @@ PersistentStreamingStatisticsVectorImageFilter<TInputImage,TPrecision> template <class TImage, class TPrecision> void -PersistentStreamingStatisticsVectorImageFilter<TImage,TPrecision> +PersistentStreamingStatisticsVectorImageFilter<TImage, TPrecision> ::PrintSelf(std::ostream& os, itk::Indent indent) const { Superclass::PrintSelf(os, indent); diff --git a/Code/Learning/otbConfusionMatrixCalculator.txx b/Code/Learning/otbConfusionMatrixCalculator.txx index e4b597b0be..7abc44980e 100644 --- a/Code/Learning/otbConfusionMatrixCalculator.txx +++ b/Code/Learning/otbConfusionMatrixCalculator.txx @@ -168,14 +168,14 @@ ConfusionMatrixCalculator<TRefListLabel, TProdListLabel> /*std::cout << "TP= " << this->m_TruePositiveValue << std::endl; std::cout << "FN= " << this->m_FalseNegativeValue << std::endl; std::cout << "FP= " << this->m_FalsePositiveValue << std::endl; - std::cout << "TN= " << this->m_TrueNegativeValue << std::endl;*/ + std::cout << "TN= " << this->m_TrueNegativeValue << std::endl; */ } else { /*std::cout << "TP= " << this->m_TruePositiveValues << std::endl; std::cout << "FN= " << this->m_FalseNegativeValues << std::endl; std::cout << "FP= " << this->m_FalsePositiveValues << std::endl; - std::cout << "TN= " << this->m_TrueNegativeValues << std::endl;*/ + std::cout << "TN= " << this->m_TrueNegativeValues << std::endl; */ } m_Precisions = MeasurementType(m_NumberOfClasses); diff --git a/Code/Learning/otbSVMSampleListModelEstimator.txx b/Code/Learning/otbSVMSampleListModelEstimator.txx index f31104bdb5..4ded92b3a5 100644 --- a/Code/Learning/otbSVMSampleListModelEstimator.txx +++ b/Code/Learning/otbSVMSampleListModelEstimator.txx @@ -74,7 +74,7 @@ SVMSampleListModelEstimator<TInputSampleList, TTrainingSampleList, TMeasurementF __FILE__, __LINE__, "Input pointset size is not the same as the training pointset size.", - ITK_LOCATION);*/ + ITK_LOCATION); */ itkExceptionMacro(<< "Input pointset size is not the same as the training pointset size (" << inputSampleListSize << " vs "<< trainingSampleListSize << ")."); } diff --git a/Code/SARPolarimetry/otbReciprocalCovarianceToReciprocalCoherencyImageFilter.h b/Code/SARPolarimetry/otbReciprocalCovarianceToReciprocalCoherencyImageFilter.h index e6255f891f..38a5ed4b40 100644 --- a/Code/SARPolarimetry/otbReciprocalCovarianceToReciprocalCoherencyImageFilter.h +++ b/Code/SARPolarimetry/otbReciprocalCovarianceToReciprocalCoherencyImageFilter.h @@ -109,7 +109,7 @@ private: * from the Covariance image (6 complex channels) * * For more details, please refer to the class ReciprocalCovarianceToReciprocalCoherencyFunctor. - * + * * \ingroup SARPolarimetry * \sa ReciprocalCovarianceToReciprocalCoherencyFunctor */ diff --git a/Testing/Code/BasicFilters/otbShiftScaleVectorImageFilterTest.cxx b/Testing/Code/BasicFilters/otbShiftScaleVectorImageFilterTest.cxx index 447fda6a06..33e44198e9 100644 --- a/Testing/Code/BasicFilters/otbShiftScaleVectorImageFilterTest.cxx +++ b/Testing/Code/BasicFilters/otbShiftScaleVectorImageFilterTest.cxx @@ -36,7 +36,7 @@ int otbShiftScaleVectorImageFilterTest(int argc, char * argv[]) typedef float OutputPixelType; typedef otb::VectorImage<InputPixelType, Dimension> InputImageType; typedef otb::VectorImage<OutputPixelType, Dimension> OutputImageType; - typedef otb::Image<InputPixelType,2> ImageType; + typedef otb::Image<InputPixelType, 2> ImageType; typedef otb::ImageList<ImageType> ImageListType; typedef otb::VectorImageToImageListFilter<InputImageType, ImageListType> VI2ILFilterType; //Statistics estimator diff --git a/Testing/Code/SARPolarimetry/otbSinclairImageFilter.cxx b/Testing/Code/SARPolarimetry/otbSinclairImageFilter.cxx index 7b4a9b852a..ff71917227 100644 --- a/Testing/Code/SARPolarimetry/otbSinclairImageFilter.cxx +++ b/Testing/Code/SARPolarimetry/otbSinclairImageFilter.cxx @@ -86,7 +86,7 @@ int generic_SinclairImageFilter(int argc, char * argv[]) typename ExtractROIType::Pointer extract = ExtractROIType::New(); extract->SetStartX(10); extract->SetStartY(10); - extract->SetSizeX(30); + extract->SetSizeX(30); extract->SetSizeY(30); extract->SetInput(filter->GetOutput()); diff --git a/Testing/Code/SARPolarimetry/otbSinclairReciprocalImageFilter.cxx b/Testing/Code/SARPolarimetry/otbSinclairReciprocalImageFilter.cxx index 148f3dc71c..339bffacab 100644 --- a/Testing/Code/SARPolarimetry/otbSinclairReciprocalImageFilter.cxx +++ b/Testing/Code/SARPolarimetry/otbSinclairReciprocalImageFilter.cxx @@ -64,7 +64,7 @@ int generic_SinclairReciprocalImageFilter(int argc, char * argv[]) typedef otb::ImageFileWriter<OutputImageType> WriterType; typedef otb::MultiChannelExtractROI<TOutputPixel, TOutputPixel > ExtractROIType; - typedef otb::SinclairReciprocalImageFilter<InputImageType, InputImageType, InputImageType, OutputImageType, TFunction> FilterType; + typedef otb::SinclairReciprocalImageFilter<InputImageType, InputImageType, InputImageType, OutputImageType, TFunction> FilterType; typename FilterType::Pointer filter = FilterType::New(); typename ReaderType::Pointer reader1 = ReaderType::New(); -- GitLab