Skip to content

make attribute merging optional #163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nathanhhughes merged 1 commit into from
Jul 30, 2026
Merged

make attribute merging optional #163

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions src/common/graph_update.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ void declare_config(LayerTracker::Config& config) {
field(config.target_layer, "target_layer");
config.matcher.setOptional();
field(config.matcher, "matcher");
config.merger.setOptional();
field(config.merger, "merger");
}

Expand Down Expand Up @@ -212,15 +213,29 @@ void GraphUpdater::computeMergeGroup(spark_dsg::NodeId node_id,
auto& track_ids = tracker.node_to_tracks[node_id];

std::vector<const spark_dsg::NodeAttributes*> attrs;

for (size_t id : track_ids) {
auto it = tracker.attribute_cache.find(id);
if (it != tracker.attribute_cache.end()) {
attrs.push_back(it->second.get());
}
}

auto merged = tracker.merger->merge(attrs);
if (attrs.empty()) {
LOG(ERROR) << "Empty attribute merge group";
return;
}

NodeAttributes::Ptr merged;
if (tracker.merger) {
merged = tracker.merger->merge(attrs);
} else {
merged = attrs.front()->clone();
}

if (!merged) {
LOG(ERROR) << "Failed to create merged attributes";
return;
}

if (config.mark_active) {
merged->is_active = true;
Expand Down