potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +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/nbayes.cpp
+11 -11
View File
@@ -52,7 +52,7 @@ public:
nallvars = 0;
}
bool train( const Ptr<TrainData>& trainData, int flags )
bool train( const Ptr<TrainData>& trainData, int flags ) CV_OVERRIDE
{
const float min_variation = FLT_EPSILON;
Mat responses = trainData->getNormCatResponses();
@@ -219,7 +219,7 @@ public:
float* value;
bool rawOutput;
void operator()( const Range& range ) const
void operator()(const Range& range) const CV_OVERRIDE
{
int cls = -1;
int rtype = 0, rptype = 0;
@@ -298,12 +298,12 @@ public:
}
};
float predict( InputArray _samples, OutputArray _results, int flags ) const
float predict( InputArray _samples, OutputArray _results, int flags ) const CV_OVERRIDE
{
return predictProb(_samples, _results, noArray(), flags);
}
float predictProb( InputArray _samples, OutputArray _results, OutputArray _resultsProb, int flags ) const
float predictProb( InputArray _samples, OutputArray _results, OutputArray _resultsProb, int flags ) const CV_OVERRIDE
{
int value=0;
Mat samples = _samples.getMat(), results, resultsProb;
@@ -339,7 +339,7 @@ public:
return (float)value;
}
void write( FileStorage& fs ) const
void write( FileStorage& fs ) const CV_OVERRIDE
{
int nclasses = (int)cls_labels.total(), i;
@@ -380,7 +380,7 @@ public:
fs << "c" << c;
}
void read( const FileNode& fn )
void read( const FileNode& fn ) CV_OVERRIDE
{
clear();
@@ -427,7 +427,7 @@ public:
fn["c"] >> c;
}
void clear()
void clear() CV_OVERRIDE
{
count.clear();
sum.clear();
@@ -442,10 +442,10 @@ public:
nallvars = 0;
}
bool isTrained() const { return !avg.empty(); }
bool isClassifier() const { return true; }
int getVarCount() const { return nallvars; }
String getDefaultName() const { return "opencv_ml_nbayes"; }
bool isTrained() const CV_OVERRIDE { return !avg.empty(); }
bool isClassifier() const CV_OVERRIDE { return true; }
int getVarCount() const CV_OVERRIDE { return nallvars; }
String getDefaultName() const CV_OVERRIDE { return "opencv_ml_nbayes"; }
int nallvars;
Mat var_idx, cls_labels, c;