Skip to content

Commit a1fc599

Browse files
committed
Merge branch 'tg-53-rename-source-feature-ids-method' into 'main'
WIF - Classifiers - Rename sourceFeatureIDs method to getSourceFeatureIDs See merge request feta/wif-group/libwif!37
2 parents e52e5fa + 24b90be commit a1fc599

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

include/wif/classifiers/classifier.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class Classifier {
6060
*
6161
* @return const std::vector<FeatureID>&
6262
*/
63-
const std::vector<FeatureID>& sourceFeatureIDs() const;
63+
const std::vector<FeatureID>& getSourceFeatureIDs() const;
6464

6565
private:
6666
std::vector<FeatureID> m_sourceFeatureIDs;

src/wif/classifiers/alfClassifier.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,12 @@ void AlfClassifier::handleSingleReport(const FlowFeatures flowFeatures, const Cl
7979
m_reporter.onRecordStart();
8080

8181
// Identification fields are reported first
82-
for (const auto id : sourceFeatureIDs()) {
82+
for (const auto id : getSourceFeatureIDs()) {
8383
m_reporter.report(flowFeatures.getRaw(id));
8484
}
8585

8686
// ML features are reported as second
87-
for (const auto id : m_mlClassifier.sourceFeatureIDs()) {
87+
for (const auto id : m_mlClassifier.getSourceFeatureIDs()) {
8888
m_reporter.report(flowFeatures.getRaw(id));
8989
}
9090

src/wif/classifiers/classifier.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ void Classifier::setFeatureSourceIDs(const std::vector<FeatureID>& sourceFeature
1616
m_sourceFeatureIDs = sourceFeatureIDs;
1717
}
1818

19-
const std::vector<FeatureID>& Classifier::sourceFeatureIDs() const
19+
const std::vector<FeatureID>& Classifier::getSourceFeatureIDs() const
2020
{
2121
return m_sourceFeatureIDs;
2222
}

src/wif/classifiers/regexClassifier.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ RegexClassifier::RegexClassifier(
2323
ClfResult RegexClassifier::classify(const FlowFeatures& flowFeatures)
2424
{
2525
std::vector<double> flowFeatureResults;
26-
for (FeatureID featureID : sourceFeatureIDs()) {
26+
for (FeatureID featureID : getSourceFeatureIDs()) {
2727
double matchResult = matchPattern(flowFeatures.get<std::string>(featureID));
2828
flowFeatureResults.emplace_back(matchResult);
2929
}

0 commit comments

Comments
 (0)