Skip to content

Commit

Permalink
rename collect_main to collect_impl
Browse files Browse the repository at this point in the history
  • Loading branch information
DillonZChen committed Jan 14, 2025
1 parent fce1951 commit 3224370
Show file tree
Hide file tree
Showing 10 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion include/feature_generation/features.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ namespace feature_generation {
void reformat_colour_hash(const std::map<int, int> &remap);

// main collection body
virtual void collect_main(const std::vector<graph::Graph> &graphs) = 0;
virtual void collect_impl(const std::vector<graph::Graph> &graphs) = 0;

public:
Features(const std::string feature_name,
Expand Down
2 changes: 1 addition & 1 deletion include/feature_generation/iwl_features.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ namespace feature_generation {
Embedding embed(const std::shared_ptr<graph::Graph> &graph) override;

protected:
void collect_main(const std::vector<graph::Graph> &graphs) override;
void collect_impl(const std::vector<graph::Graph> &graphs) override;
void refine(const std::shared_ptr<graph::Graph> &graph,
std::vector<int> &colours,
std::vector<int> &colours_tmp);
Expand Down
2 changes: 1 addition & 1 deletion include/feature_generation/kwl2_features.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ namespace feature_generation {
int v,
const std::shared_ptr<graph::Graph> &graph,
const std::vector<int> &pair_to_edge_label);
void collect_main(const std::vector<graph::Graph> &graphs) override;
void collect_impl(const std::vector<graph::Graph> &graphs) override;
void refine(const std::shared_ptr<graph::Graph> &graph,
std::vector<int> &colours,
std::vector<int> &colours_tmp);
Expand Down
2 changes: 1 addition & 1 deletion include/feature_generation/lwl2_features.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ namespace feature_generation {
int v,
const std::shared_ptr<graph::Graph> &graph,
const std::vector<int> &pair_to_edge_label);
void collect_main(const std::vector<graph::Graph> &graphs) override;
void collect_impl(const std::vector<graph::Graph> &graphs) override;
void refine(const std::shared_ptr<graph::Graph> &graph,
std::vector<std::set<int>> &pair_to_neighbours,
std::vector<int> &colours,
Expand Down
2 changes: 1 addition & 1 deletion include/feature_generation/wl_features.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ namespace feature_generation {
Embedding embed(const std::shared_ptr<graph::Graph> &graph) override;

protected:
void collect_main(const std::vector<graph::Graph> &graphs) override;
void collect_impl(const std::vector<graph::Graph> &graphs) override;
void refine(const std::shared_ptr<graph::Graph> &graph,
std::vector<int> &colours,
std::vector<int> &colours_tmp);
Expand Down
2 changes: 1 addition & 1 deletion src/feature_generation/features.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ namespace feature_generation {

collecting = true;

collect_main(graphs);
collect_impl(graphs);

if (pruning == PruningOptions::COLLAPSE_LAYER) {
collapse_pruned = true;
Expand Down
2 changes: 1 addition & 1 deletion src/feature_generation/iwl_features.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ namespace feature_generation {
colours.swap(colours_tmp);
}

void IWLFeatures::collect_main(const std::vector<graph::Graph> &graphs) {
void IWLFeatures::collect_impl(const std::vector<graph::Graph> &graphs) {
// intermediate graph colours during WL and extra memory for WL updates
std::vector<int> colours;
std::vector<int> colours_tmp;
Expand Down
2 changes: 1 addition & 1 deletion src/feature_generation/kwl2_features.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ namespace feature_generation {
return col;
}

void KWL2Features::collect_main(const std::vector<graph::Graph> &graphs) {
void KWL2Features::collect_impl(const std::vector<graph::Graph> &graphs) {
// intermediate graph colours during WL and extra memory for WL updates
std::vector<int> colours;
std::vector<int> colours_tmp;
Expand Down
2 changes: 1 addition & 1 deletion src/feature_generation/lwl2_features.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ namespace feature_generation {
return col;
}

void LWL2Features::collect_main(const std::vector<graph::Graph> &graphs) {
void LWL2Features::collect_impl(const std::vector<graph::Graph> &graphs) {
// intermediate graph colours during WL and extra memory for WL updates
std::vector<int> colours;
std::vector<int> colours_tmp;
Expand Down
2 changes: 1 addition & 1 deletion src/feature_generation/wl_features.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ namespace feature_generation {
colours.swap(colours_tmp);
}

void WLFeatures::collect_main(const std::vector<graph::Graph> &graphs) {
void WLFeatures::collect_impl(const std::vector<graph::Graph> &graphs) {
// intermediate graph colours during WL and extra memory for WL updates
std::vector<std::vector<int>> graph_colours;
std::vector<std::vector<int>> graph_colours_tmp;
Expand Down

0 comments on commit 3224370

Please sign in to comment.