chore: enable modernize-use-override and fix existing violations (#419)
Add modernize-use-override to .clang-tidy and apply fixes across src/ and tests/: replace redundant virtual with override, annotate missing override on derived methods, and drop redundant virtual on already-overridden methods.
This commit is contained in:
@@ -39,38 +39,38 @@ class KmeansCluster : public IndexCluster {
|
||||
KmeansCluster(bool batch) : batch_(batch) {}
|
||||
|
||||
//! Destructor
|
||||
virtual ~KmeansCluster(void) {}
|
||||
~KmeansCluster(void) override {}
|
||||
|
||||
//! Initialize Cluster
|
||||
virtual int init(const IndexMeta &meta, const ailego::Params ¶ms);
|
||||
int init(const IndexMeta &meta, const ailego::Params ¶ms) override;
|
||||
|
||||
//! Cleanup Cluster
|
||||
virtual int cleanup(void);
|
||||
int cleanup(void) override;
|
||||
|
||||
//! Reset Cluster
|
||||
virtual int reset(void);
|
||||
int reset(void) override;
|
||||
|
||||
//! Update Cluster
|
||||
virtual int update(const ailego::Params ¶ms);
|
||||
int update(const ailego::Params ¶ms) override;
|
||||
|
||||
//! Suggest dividing to K clusters
|
||||
virtual void suggest(uint32_t k);
|
||||
void suggest(uint32_t k) override;
|
||||
|
||||
//! Mount features
|
||||
virtual int mount(IndexFeatures::Pointer feats);
|
||||
int mount(IndexFeatures::Pointer feats) override;
|
||||
|
||||
//! Cluster
|
||||
virtual int cluster(IndexThreads::Pointer threads,
|
||||
IndexCluster::CentroidList ¢s);
|
||||
int cluster(IndexThreads::Pointer threads,
|
||||
IndexCluster::CentroidList ¢s) override;
|
||||
|
||||
//! Classify
|
||||
virtual int classify(IndexThreads::Pointer threads,
|
||||
IndexCluster::CentroidList ¢s);
|
||||
int classify(IndexThreads::Pointer threads,
|
||||
IndexCluster::CentroidList ¢s) override;
|
||||
|
||||
//! Label
|
||||
virtual int label(IndexThreads::Pointer threads,
|
||||
const IndexCluster::CentroidList ¢s,
|
||||
std::vector<uint32_t> *out);
|
||||
int label(IndexThreads::Pointer threads,
|
||||
const IndexCluster::CentroidList ¢s,
|
||||
std::vector<uint32_t> *out) override;
|
||||
|
||||
protected:
|
||||
//! Test if it is valid
|
||||
@@ -169,23 +169,23 @@ class KmeansCentroidFeatures : public IndexFeatures {
|
||||
feature_dimension_(meta.dimension()),
|
||||
data_type_(meta.data_type()) {}
|
||||
|
||||
virtual size_t count(void) const {
|
||||
size_t count(void) const override {
|
||||
return centroids_.size();
|
||||
}
|
||||
|
||||
virtual size_t dimension(void) const {
|
||||
size_t dimension(void) const override {
|
||||
return feature_dimension_;
|
||||
}
|
||||
|
||||
virtual const void *element(size_t i) const {
|
||||
const void *element(size_t i) const override {
|
||||
return centroids_[i].feature();
|
||||
}
|
||||
|
||||
virtual IndexMeta::DataType data_type(void) const {
|
||||
IndexMeta::DataType data_type(void) const override {
|
||||
return data_type_;
|
||||
}
|
||||
|
||||
virtual size_t element_size(void) const {
|
||||
size_t element_size(void) const override {
|
||||
return feature_size_;
|
||||
}
|
||||
|
||||
|
||||
@@ -29,38 +29,38 @@ class OptKmeansAlgorithm : public IndexCluster {
|
||||
OptKmeansAlgorithm(void) {}
|
||||
|
||||
//! Destructor
|
||||
virtual ~OptKmeansAlgorithm(void) {}
|
||||
~OptKmeansAlgorithm(void) override {}
|
||||
|
||||
//! Initialize Cluster
|
||||
int init(const IndexMeta &meta, const ailego::Params ¶ms);
|
||||
int init(const IndexMeta &meta, const ailego::Params ¶ms) override;
|
||||
|
||||
//! Mount features
|
||||
virtual int mount(IndexFeatures::Pointer feats);
|
||||
int mount(IndexFeatures::Pointer feats) override;
|
||||
|
||||
//! Suggest dividing to K clusters
|
||||
virtual void suggest(uint32_t k);
|
||||
void suggest(uint32_t k) override;
|
||||
|
||||
//! Classify
|
||||
virtual int classify(IndexThreads::Pointer threads,
|
||||
IndexCluster::CentroidList ¢s);
|
||||
int classify(IndexThreads::Pointer threads,
|
||||
IndexCluster::CentroidList ¢s) override;
|
||||
|
||||
//! Label
|
||||
virtual int label(IndexThreads::Pointer threads,
|
||||
const IndexCluster::CentroidList ¢s,
|
||||
std::vector<uint32_t> *out);
|
||||
int label(IndexThreads::Pointer threads,
|
||||
const IndexCluster::CentroidList ¢s,
|
||||
std::vector<uint32_t> *out) override;
|
||||
|
||||
//! Cluster
|
||||
virtual int cluster(IndexThreads::Pointer threads,
|
||||
IndexCluster::CentroidList ¢s) = 0;
|
||||
int cluster(IndexThreads::Pointer threads,
|
||||
IndexCluster::CentroidList ¢s) override = 0;
|
||||
|
||||
//! Cleanup Cluster
|
||||
virtual int cleanup(void);
|
||||
int cleanup(void) override;
|
||||
|
||||
//! Reset Cluster
|
||||
virtual int reset(void);
|
||||
int reset(void) override;
|
||||
|
||||
//! Update Cluster
|
||||
virtual int update(const ailego::Params ¶ms);
|
||||
int update(const ailego::Params ¶ms) override;
|
||||
|
||||
protected:
|
||||
//! Update parameters
|
||||
@@ -498,11 +498,11 @@ class NumericalKmeansAlgorithm : public OptKmeansAlgorithm {
|
||||
NumericalKmeansAlgorithm(void) {}
|
||||
|
||||
//! Destructor
|
||||
virtual ~NumericalKmeansAlgorithm(void) {}
|
||||
~NumericalKmeansAlgorithm(void) override {}
|
||||
|
||||
//! Cluster
|
||||
virtual int cluster(IndexThreads::Pointer threads,
|
||||
IndexCluster::CentroidList ¢s);
|
||||
int cluster(IndexThreads::Pointer threads,
|
||||
IndexCluster::CentroidList ¢s) override;
|
||||
|
||||
protected:
|
||||
void update_centroids(
|
||||
@@ -631,11 +631,11 @@ class NibbleKmeansAlgorithm : public OptKmeansAlgorithm {
|
||||
NibbleKmeansAlgorithm(void) {}
|
||||
|
||||
//! Destructor
|
||||
virtual ~NibbleKmeansAlgorithm(void) {}
|
||||
~NibbleKmeansAlgorithm(void) override {}
|
||||
|
||||
//! Cluster
|
||||
virtual int cluster(IndexThreads::Pointer threads,
|
||||
IndexCluster::CentroidList ¢s);
|
||||
int cluster(IndexThreads::Pointer threads,
|
||||
IndexCluster::CentroidList ¢s) override;
|
||||
|
||||
protected:
|
||||
//! update centroids
|
||||
@@ -765,11 +765,11 @@ class NumericalInnerProductKmeansAlgorithm : public OptKmeansAlgorithm {
|
||||
NumericalInnerProductKmeansAlgorithm(void) {}
|
||||
|
||||
//! Destructor
|
||||
virtual ~NumericalInnerProductKmeansAlgorithm(void) {}
|
||||
~NumericalInnerProductKmeansAlgorithm(void) override {}
|
||||
|
||||
//! Cluster
|
||||
virtual int cluster(IndexThreads::Pointer threads,
|
||||
IndexCluster::CentroidList ¢s);
|
||||
int cluster(IndexThreads::Pointer threads,
|
||||
IndexCluster::CentroidList ¢s) override;
|
||||
|
||||
protected:
|
||||
void update_centroids(
|
||||
@@ -899,11 +899,11 @@ class NibbleInnerProductKmeansAlgorithm : public OptKmeansAlgorithm {
|
||||
NibbleInnerProductKmeansAlgorithm(void) {}
|
||||
|
||||
//! Destructor
|
||||
virtual ~NibbleInnerProductKmeansAlgorithm(void) {}
|
||||
~NibbleInnerProductKmeansAlgorithm(void) override {}
|
||||
|
||||
//! Cluster
|
||||
virtual int cluster(IndexThreads::Pointer threads,
|
||||
IndexCluster::CentroidList ¢s);
|
||||
int cluster(IndexThreads::Pointer threads,
|
||||
IndexCluster::CentroidList ¢s) override;
|
||||
|
||||
protected:
|
||||
//! update centroids
|
||||
@@ -1026,38 +1026,38 @@ class OptKmeansCluster : public IndexCluster {
|
||||
OptKmeansCluster(void) {}
|
||||
|
||||
//! Destructor
|
||||
virtual ~OptKmeansCluster(void) {}
|
||||
~OptKmeansCluster(void) override {}
|
||||
|
||||
//! Initialize Cluster
|
||||
virtual int init(const IndexMeta &meta, const ailego::Params ¶ms);
|
||||
int init(const IndexMeta &meta, const ailego::Params ¶ms) override;
|
||||
|
||||
//! Cleanup Cluster
|
||||
virtual int cleanup(void);
|
||||
int cleanup(void) override;
|
||||
|
||||
//! Reset Cluster
|
||||
virtual int reset(void);
|
||||
int reset(void) override;
|
||||
|
||||
//! Update Cluster
|
||||
virtual int update(const ailego::Params ¶ms);
|
||||
int update(const ailego::Params ¶ms) override;
|
||||
|
||||
//! Suggest dividing to K clusters
|
||||
virtual void suggest(uint32_t k);
|
||||
void suggest(uint32_t k) override;
|
||||
|
||||
//! Mount features
|
||||
virtual int mount(IndexFeatures::Pointer feats);
|
||||
int mount(IndexFeatures::Pointer feats) override;
|
||||
|
||||
//! Cluster
|
||||
virtual int cluster(IndexThreads::Pointer threads,
|
||||
IndexCluster::CentroidList ¢s);
|
||||
int cluster(IndexThreads::Pointer threads,
|
||||
IndexCluster::CentroidList ¢s) override;
|
||||
|
||||
//! Classify
|
||||
virtual int classify(IndexThreads::Pointer threads,
|
||||
IndexCluster::CentroidList ¢s);
|
||||
int classify(IndexThreads::Pointer threads,
|
||||
IndexCluster::CentroidList ¢s) override;
|
||||
|
||||
//! Label
|
||||
virtual int label(IndexThreads::Pointer threads,
|
||||
const IndexCluster::CentroidList ¢s,
|
||||
std::vector<uint32_t> *out);
|
||||
int label(IndexThreads::Pointer threads,
|
||||
const IndexCluster::CentroidList ¢s,
|
||||
std::vector<uint32_t> *out) override;
|
||||
|
||||
protected:
|
||||
//! Members
|
||||
|
||||
@@ -28,40 +28,40 @@ class StratifiedCluster : public IndexCluster {
|
||||
StratifiedCluster(void) {}
|
||||
|
||||
//! Destructor
|
||||
virtual ~StratifiedCluster(void) {}
|
||||
~StratifiedCluster(void) override {}
|
||||
|
||||
//! Initialize Cluster
|
||||
virtual int init(const IndexMeta &meta, const ailego::Params ¶ms) {
|
||||
int init(const IndexMeta &meta, const ailego::Params ¶ms) override {
|
||||
meta_ = meta;
|
||||
this->update_params(params);
|
||||
return 0;
|
||||
}
|
||||
|
||||
//! Cleanup Cluster
|
||||
virtual int cleanup(void) {
|
||||
int cleanup(void) override {
|
||||
features_.reset();
|
||||
return 0;
|
||||
}
|
||||
|
||||
//! Reset Cluster
|
||||
virtual int reset(void) {
|
||||
int reset(void) override {
|
||||
features_.reset();
|
||||
return 0;
|
||||
}
|
||||
|
||||
//! Update Cluster
|
||||
virtual int update(const ailego::Params ¶ms) {
|
||||
int update(const ailego::Params ¶ms) override {
|
||||
this->update_params(params);
|
||||
return 0;
|
||||
}
|
||||
|
||||
//! Suggest dividing to K clusters
|
||||
virtual void suggest(uint32_t k) {
|
||||
void suggest(uint32_t k) override {
|
||||
cluster_count_ = k;
|
||||
}
|
||||
|
||||
//! Mount features
|
||||
virtual int mount(IndexFeatures::Pointer feats) {
|
||||
int mount(IndexFeatures::Pointer feats) override {
|
||||
if (!feats) {
|
||||
return IndexError_InvalidArgument;
|
||||
}
|
||||
@@ -73,17 +73,17 @@ class StratifiedCluster : public IndexCluster {
|
||||
}
|
||||
|
||||
//! Cluster
|
||||
virtual int cluster(IndexThreads::Pointer threads,
|
||||
IndexCluster::CentroidList ¢s);
|
||||
int cluster(IndexThreads::Pointer threads,
|
||||
IndexCluster::CentroidList ¢s) override;
|
||||
|
||||
//! Classify
|
||||
virtual int classify(IndexThreads::Pointer threads,
|
||||
IndexCluster::CentroidList ¢s);
|
||||
int classify(IndexThreads::Pointer threads,
|
||||
IndexCluster::CentroidList ¢s) override;
|
||||
|
||||
//! Label
|
||||
virtual int label(IndexThreads::Pointer threads,
|
||||
const IndexCluster::CentroidList ¢s,
|
||||
std::vector<uint32_t> *out);
|
||||
int label(IndexThreads::Pointer threads,
|
||||
const IndexCluster::CentroidList ¢s,
|
||||
std::vector<uint32_t> *out) override;
|
||||
|
||||
protected:
|
||||
//! Test if it is valid
|
||||
|
||||
Reference in New Issue
Block a user