Commit 7a25381227215ad068aa34eef748815bb3204a7d

Authored by Jordi Inglada
1 parent ac6e231b
Exists in master and in 1 other branch avignon

ENH: override specifier

app/otbBVImageInversion.cxx
... ... @@ -163,7 +163,7 @@ public:
163 163 FunctorType>;
164 164  
165 165 private:
166   - void DoInit()
  166 + void DoInit() override
167 167 {
168 168 SetName("BVImageInversion");
169 169 SetDescription("Estimate biophysical variables for every pixel of an image using an inversion of Prospect+Sail.");
... ... @@ -186,17 +186,17 @@ private:
186 186  
187 187 }
188 188  
189   - virtual ~BVImageInversion()
  189 + virtual ~BVImageInversion() override
190 190 {
191 191 }
192 192  
193 193  
194   - void DoUpdateParameters()
  194 + void DoUpdateParameters() override
195 195 {
196 196 // Nothing to do here : all parameters are independent
197 197 }
198 198  
199   - void DoExecute()
  199 + void DoExecute() override
200 200 {
201 201 // read output info of the input image
202 202 FloatVectorImageType::Pointer input_image = this->GetParameterImage("in");
... ...
app/otbBVInputVariableGeneration.h
... ... @@ -37,13 +37,13 @@ public:
37 37  
38 38  
39 39 private:
40   - void DoInit();
41   - virtual ~BVInputVariableGeneration(){}
42   - void DoUpdateParameters() {}
  40 + void DoInit() override;
  41 + virtual ~BVInputVariableGeneration() override {}
  42 + void DoUpdateParameters() override {}
43 43 ///Builds the map with the values of the sample
44 44 otb::BV::SampleType DrawSample();
45 45 void WriteSample(otb::BV::SampleType s);
46   - void DoExecute();
  46 + void DoExecute() override;
47 47  
48 48 otb::BV::VarParams m_MLAI = {0.0, 15.0, 2.0, 2.0, 0, 0, true, 6, otb::BV::DistType::LOGNORMAL};
49 49 otb::BV::VarParams m_ALA ={30.0, 80.0, 60.0, 20.0, 55, 65, true, 3, otb::BV::DistType::GAUSSIAN};
... ...
app/otbBVInversion.cxx
... ... @@ -62,7 +62,7 @@ public:
62 62 typedef otb::MultiLinearRegressionModel<PrecisionType> MLRType;
63 63  
64 64 private:
65   - void DoInit()
  65 + void DoInit() override
66 66 {
67 67 SetName("BVInversion");
68 68 SetDescription("Estimate biophysical variables using aninversion of Prospect+Sail.");
... ... @@ -85,18 +85,18 @@ private:
85 85 MandatoryOff("normalization");
86 86 }
87 87  
88   - virtual ~BVInversion()
  88 + virtual ~BVInversion() override
89 89 {
90 90 }
91 91  
92 92  
93   - void DoUpdateParameters()
  93 + void DoUpdateParameters() override
94 94 {
95 95 // Nothing to do here : all parameters are independent
96 96 }
97 97  
98 98  
99   - void DoExecute()
  99 + void DoExecute() override
100 100 {
101 101  
102 102 auto reflectancesFileName = GetParameterString("reflectances");
... ...
app/otbInverseModelLearning.cxx
... ... @@ -64,7 +64,7 @@ public:
64 64 typedef otb::MultiLinearRegressionModel<PrecisionType> MLRType;
65 65  
66 66 private:
67   - void DoInit()
  67 + void DoInit() override
68 68 {
69 69 SetName("InverseModelLearning");
70 70 SetDescription("Simulate reflectances using Prospect+Sail.");
... ... @@ -106,18 +106,18 @@ private:
106 106  
107 107 }
108 108  
109   - virtual ~InverseModelLearning()
  109 + virtual ~InverseModelLearning() override
110 110 {
111 111 }
112 112  
113 113  
114   - void DoUpdateParameters()
  114 + void DoUpdateParameters() override
115 115 {
116 116 // Nothing to do here : all parameters are independent
117 117 }
118 118  
119 119  
120   - void DoExecute()
  120 + void DoExecute() override
121 121 {
122 122  
123 123 auto trainingFileName = GetParameterString("training");
... ...
app/otbProSailSimulator.cxx
... ... @@ -79,7 +79,7 @@ public:
79 79 typedef typename ProSailType::OutputType SimulationType;
80 80  
81 81 private:
82   - void DoInit()
  82 + void DoInit() override
83 83 {
84 84 SetName("ProSailSimulator");
85 85 SetDescription("Simulate reflectances, fcover and fapar using Prospect+Sail.");
... ... @@ -131,12 +131,12 @@ private:
131 131  
132 132 }
133 133  
134   - virtual ~ProSailSimulator()
  134 + virtual ~ProSailSimulator() override
135 135 {
136 136 }
137 137  
138 138  
139   - void DoUpdateParameters()
  139 + void DoUpdateParameters() override
140 140 {
141 141 // Nothing to do here : all parameters are independent
142 142 }
... ... @@ -148,7 +148,7 @@ private:
148 148 m_SimulationsFile << std::endl;
149 149 }
150 150  
151   - void DoExecute()
  151 + void DoExecute() override
152 152 {
153 153 using namespace otb::BV;
154 154 m_Azimuth = GetParameterFloat("azimuth");
... ...
app/otbProfileReprocessing.cxx
... ... @@ -46,7 +46,7 @@ public:
46 46 itkTypeMacro(ProfileReprocessing, otb::Application);
47 47  
48 48 private:
49   - void DoInit()
  49 + void DoInit() override
50 50 {
51 51  
52 52 SetName("ProfileReprocessing");
... ... @@ -83,12 +83,12 @@ private:
83 83 MandatoryOff("algo");
84 84 }
85 85  
86   - void DoUpdateParameters()
  86 + void DoUpdateParameters() override
87 87 {
88 88 //std::cout << "ProfileReprocessing::DoUpdateParameters" << std::endl;
89 89 }
90 90  
91   - void DoExecute()
  91 + void DoExecute() override
92 92 {
93 93 auto ipfn = GetParameterString("ipf");
94 94 std::ifstream in_profile_file;
... ...