Commit 4f61dcb1 authored by Julien Michel's avatar Julien Michel Committed by Guillaume Pasero
Browse files

Merge branch 'cvrtree-missing-override' into 'develop'

WRG: add missing overrides

See merge request !170
parent f94f0308
......@@ -113,7 +113,7 @@ public:
* is set from the CMake configuration option */
void SetAutomaticAdaptativeStreaming(unsigned int availableRAM = 0, double bias = 1.0);
virtual void UpdateOutputData(itk::DataObject * itkNotUsed(output));
virtual void UpdateOutputData(itk::DataObject * itkNotUsed(output)) override;
/** Connect a new input to the multi-writer. Only the input pointer is
* required. If the filename list is empty,
......@@ -147,38 +147,26 @@ public:
this->SetNthInput(size - 1, const_cast<itk::DataObject*>(dynamic_cast<const itk::DataObject*>(writer->GetInput())));
}
virtual void UpdateOutputInformation();
virtual void UpdateOutputInformation() override;
virtual void Update()
virtual void Update() override
{
this->UpdateOutputInformation();
this->UpdateOutputData(NULL);
}
protected:
/** SetInput is changed to protected. Use AddInputImage to connect the
* pipeline to the writer
*/
virtual void SetInput(const itk::ProcessObject::DataObjectIdentifierType & key, itk::DataObject* image)
{ this->Superclass::SetInput(key, image); }
/** SetNthInput is changed to protected. Use AddInputImage to connect the
* pipeline to the writer
*/
virtual void SetNthInput(itk::ProcessObject::DataObjectPointerArraySizeType i, itk::DataObject* image)
{ this->Superclass::SetNthInput(i, image); }
MultiImageFileWriter();
virtual ~MultiImageFileWriter() {}
/** GenerateData calls the Write method for each connected input */
virtual void GenerateData(void);
virtual void GenerateData(void) override;
/** GenerateInputRequestedRegion can predict approximate input regions
* based on the requested region of the fake output. Only useful for
* pipeline memory print estimation
*/
virtual void GenerateInputRequestedRegion();
virtual void GenerateInputRequestedRegion() override;
/** Computes the number of divisions */
virtual void InitializeStreaming();
......
......@@ -69,22 +69,22 @@ public:
#ifdef OTB_OPENCV_3
#define OTB_CV_WRAP_PROPERTY(type,name) \
virtual type get##name() const; \
virtual void set##name(type val);
virtual type get##name() const override; \
virtual void set##name(type val) override;
#define OTB_CV_WRAP_PROPERTY_REF(type,name) \
virtual type get##name() const; \
virtual void set##name(const type &val);
virtual type get##name() const override; \
virtual void set##name(const type &val) override;
#define OTB_CV_WRAP_CSTREF_GET(type, name) \
virtual const type& get##name() const;
virtual const type& get##name() const override;
// TODO : wrap all method used
virtual int getVarCount() const;
virtual int getVarCount() const override;
virtual bool isTrained() const;
virtual bool isTrained() const override;
virtual bool isClassifier() const;
virtual bool isClassifier() const override;
OTB_CV_WRAP_PROPERTY(int, MaxCategories)
OTB_CV_WRAP_PROPERTY(int, MaxDepth)
......@@ -104,21 +104,21 @@ public:
OTB_CV_WRAP_CSTREF_GET(std::vector<cv::ml::DTrees::Split>, Splits)
OTB_CV_WRAP_CSTREF_GET(std::vector<int>, Subsets)
virtual cv::Mat getVarImportance() const;
virtual cv::Mat getVarImportance() const override;
virtual cv::String getDefaultName () const;
virtual cv::String getDefaultName () const override;
virtual void read (const cv::FileNode &fn);
virtual void read (const cv::FileNode &fn) override;
virtual void write (cv::FileStorage &fs) const;
virtual void write (cv::FileStorage &fs) const override;
virtual void save (const cv::String &filename) const;
virtual void save (const cv::String &filename) const override;
virtual bool train(cv::InputArray samples, int layout, cv::InputArray responses);
virtual bool train(cv::InputArray samples, int layout, cv::InputArray responses) override;
virtual bool train( const cv::Ptr<cv::ml::TrainData>& trainData, int flags=0 );
virtual bool train( const cv::Ptr<cv::ml::TrainData>& trainData, int flags=0 ) override;
virtual float predict (cv::InputArray samples, cv::OutputArray results=cv::noArray(), int flags=0) const;
virtual float predict (cv::InputArray samples, cv::OutputArray results=cv::noArray(), int flags=0) const override;
static cv::Ptr<CvRTreesWrapper> create();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment