From 1aaea0ab7651f5a49120964a29ed60f55f6050f9 Mon Sep 17 00:00:00 2001
From: Emmanuel Christophe <emmanuel.christophe@orfeo-toolbox.org>
Date: Wed, 9 Jun 2010 14:18:26 +0800
Subject: [PATCH] ENH: add accessor, change type
---
Code/Learning/otbListSampleGenerator.h | 19 +++++++++++--------
Code/Visualization/otbPixelDescriptionModel.h | 2 +-
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/Code/Learning/otbListSampleGenerator.h b/Code/Learning/otbListSampleGenerator.h
index 2606f3ecd4..3b359b34c0 100644
--- a/Code/Learning/otbListSampleGenerator.h
+++ b/Code/Learning/otbListSampleGenerator.h
@@ -94,14 +94,17 @@ public:
virtual void Update();
/** Accessors */
- itkGetMacro(MaxTrainingSize, int);
- itkSetMacro(MaxTrainingSize, int);
- itkGetMacro(MaxValidationSize, int);
- itkSetMacro(MaxValidationSize, int);
- itkGetMacro(ValidationTrainingProportion, double);
+ itkGetConstMacro(MaxTrainingSize, long int);
+ itkSetMacro(MaxTrainingSize, long int);
+ itkGetConstMacro(MaxValidationSize, long int);
+ itkSetMacro(MaxValidationSize, long int);
+ itkGetConstMacro(ValidationTrainingProportion, double);
itkSetClampMacro(ValidationTrainingProportion, double, 0.0, 1.0);
- itkGetMacro(NumberOfClasses, unsigned short);
+ itkGetConstMacro(NumberOfClasses, unsigned short);
+ typedef std::map<int, int> SampleNumberType;
+ itkGetConstMacro(ClassesSamplesNumberTraining, SampleNumberType);
+ itkGetConstMacro(ClassesSamplesNumberValidation, SampleNumberType);
itkGetStringMacro(ClassKey);
itkSetStringMacro(ClassKey);
@@ -126,8 +129,8 @@ private:
void GenerateClassStatistics();
void ComputeClassSelectionProbability();
- int m_MaxTrainingSize; // number of traning samples (-1 = no limit)
- int m_MaxValidationSize; // number of validation samples (-1 = no limit)
+ long int m_MaxTrainingSize; // number of training samples (-1 = no limit)
+ long int m_MaxValidationSize; // number of validation samples (-1 = no limit)
double m_ValidationTrainingProportion; // proportion of training vs validation
// (0.0 = all training, 1.0 = all validation)
diff --git a/Code/Visualization/otbPixelDescriptionModel.h b/Code/Visualization/otbPixelDescriptionModel.h
index c3fb195248..eae9b1816a 100644
--- a/Code/Visualization/otbPixelDescriptionModel.h
+++ b/Code/Visualization/otbPixelDescriptionModel.h
@@ -26,7 +26,7 @@
namespace otb
{
/** \class PixelDescriptionModel
-* \brief This class is a layer based model reporting pixel information
+* \brief This class is a layer based model reporting pixel information
*
* \sa ImageLayer
*
--
GitLab