potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23:05 +04:00
Code Packages Releases Wiki Activity

ml: apply CV_OVERRIDE/CV_FINAL

Browse Source
This commit is contained in:
Alexander Alekhin
2018-03-15 16:16:58 +03:00
parent 3314966acb
commit 4d0dd3e509
13 changed files with 370 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/ml/src/svmsgd.cpp
+25 -19
View File
@@ -57,7 +57,7 @@ namespace cv
namespace ml
{
class SVMSGDImpl : public SVMSGD
class SVMSGDImpl CV_FINAL : public SVMSGD
{
public:
@@ -65,36 +65,42 @@ public:
virtual ~SVMSGDImpl() {}
virtual bool train(const Ptr<TrainData>& data, int);
virtual bool train(const Ptr<TrainData>& data, int) CV_OVERRIDE;
virtual float predict( InputArray samples, OutputArray results=noArray(), int flags = 0 ) const;
virtual float predict( InputArray samples, OutputArray results=noArray(), int flags = 0 ) const CV_OVERRIDE;
virtual bool isClassifier() const;
virtual bool isClassifier() const CV_OVERRIDE;
virtual bool isTrained() const;
virtual bool isTrained() const CV_OVERRIDE;
virtual void clear();
virtual void clear() CV_OVERRIDE;
virtual void write(FileStorage &fs) const;
virtual void write(FileStorage &fs) const CV_OVERRIDE;
virtual void read(const FileNode &fn);
virtual void read(const FileNode &fn) CV_OVERRIDE;
virtual Mat getWeights(){ return weights_; }
virtual Mat getWeights() CV_OVERRIDE { return weights_; }
virtual float getShift(){ return shift_; }
virtual float getShift() CV_OVERRIDE { return shift_; }
virtual int getVarCount() const { return weights_.cols; }
virtual int getVarCount() const CV_OVERRIDE { return weights_.cols; }
virtual String getDefaultName() const {return "opencv_ml_svmsgd";}
virtual String getDefaultName() const CV_OVERRIDE {return "opencv_ml_svmsgd";}
virtual void setOptimalParameters(int svmsgdType = ASGD, int marginType = SOFT_MARGIN);
virtual void setOptimalParameters(int svmsgdType = ASGD, int marginType = SOFT_MARGIN) CV_OVERRIDE;
CV_IMPL_PROPERTY(int, SvmsgdType, params.svmsgdType)
CV_IMPL_PROPERTY(int, MarginType, params.marginType)
CV_IMPL_PROPERTY(float, MarginRegularization, params.marginRegularization)
CV_IMPL_PROPERTY(float, InitialStepSize, params.initialStepSize)
CV_IMPL_PROPERTY(float, StepDecreasingPower, params.stepDecreasingPower)
CV_IMPL_PROPERTY_S(cv::TermCriteria, TermCriteria, params.termCrit)
inline int getSvmsgdType() const CV_OVERRIDE { return params.svmsgdType; }
inline void setSvmsgdType(int val) CV_OVERRIDE { params.svmsgdType = val; }
inline int getMarginType() const CV_OVERRIDE { return params.marginType; }
inline void setMarginType(int val) CV_OVERRIDE { params.marginType = val; }
inline float getMarginRegularization() const CV_OVERRIDE { return params.marginRegularization; }
inline void setMarginRegularization(float val) CV_OVERRIDE { params.marginRegularization = val; }
inline float getInitialStepSize() const CV_OVERRIDE { return params.initialStepSize; }
inline void setInitialStepSize(float val) CV_OVERRIDE { params.initialStepSize = val; }
inline float getStepDecreasingPower() const CV_OVERRIDE { return params.stepDecreasingPower; }
inline void setStepDecreasingPower(float val) CV_OVERRIDE { params.stepDecreasingPower = val; }
inline cv::TermCriteria getTermCriteria() const CV_OVERRIDE { return params.termCrit; }
inline void setTermCriteria(const cv::TermCriteria& val) CV_OVERRIDE { params.termCrit = val; }
private:
void updateWeights(InputArray sample, bool positive, float stepSize, Mat &weights);