Skip to content

Clean up graph.hpp and graph.cpp #564

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
arcondello merged 5 commits into from
Jun 18, 2026
Merged

Clean up graph.hpp and graph.cpp #564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
092236b
Refactor graph.hpp and graph.cpp (no functional changes)
arcondello Jun 17, 2026
78f9e2f
Rename Graph protected members
arcondello Jun 17, 2026
3c8068c
Use and/not/or rather than &&/||/! in graph.hpp and graph.cpp
arcondello Jun 17, 2026
6c903bd
Remove unused Graph::add_successor() method
arcondello Jun 17, 2026
5dacdff
Fix docstring format
arcondello Jun 18, 2026
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
12 changes: 6 additions & 6 deletions dwave/optimization/include/dwave-optimization/array.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -654,35 +654,35 @@ class ScalarOutputMixin<Base, true> : public ScalarOutputMixin<Base, false> {

/// @copydoc Array::buff()
double const* buff(const State& state) const final {
return this->template data_ptr<ScalarOutputMixinStateData>(state)->buff();
return this->template data_ptr_<ScalarOutputMixinStateData>(state)->buff();
}

/// @copydoc Node::commit()
void commit(State& state) const final {
this->template data_ptr<ScalarOutputMixinStateData>(state)->commit();
this->template data_ptr_<ScalarOutputMixinStateData>(state)->commit();
}

/// @copydoc Array::diff()
std::span<const Update> diff(const State& state) const final {
return this->template data_ptr<ScalarOutputMixinStateData>(state)->diff();
return this->template data_ptr_<ScalarOutputMixinStateData>(state)->diff();
}

/// @copydoc Node::revert()
void revert(State& state) const final {
this->template data_ptr<ScalarOutputMixinStateData>(state)->revert();
this->template data_ptr_<ScalarOutputMixinStateData>(state)->revert();
}

protected:
using ScalarOutputMixinStateData = ScalarOutputMixin<Base, false>::ScalarOutputMixinStateData;

/// Emplace a state with the given scalar value.
void emplace_state(State& state, double value) const {
this->template emplace_data_ptr<ScalarOutputMixinStateData>(state, value);
this->template emplace_data_ptr_<ScalarOutputMixinStateData>(state, value);
}

/// Update the state value with the given value
void set_state(State& state, double value) const {
this->template data_ptr<ScalarOutputMixinStateData>(state)->set(value);
this->template data_ptr_<ScalarOutputMixinStateData>(state)->set(value);
}
};

Expand Down
321 changes: 181 additions & 140 deletions dwave/optimization/include/dwave-optimization/graph.hpp
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dwave/optimization/include/dwave-optimization/nodes/collections.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ class DisjointBitSetNode : public ArrayOutputMixin<ArrayNode> {

protected:
// This node is a pseudo-decision, so it is not removeable
bool removable() const override { return false; }
bool removable_() const override { return false; }

const DisjointBitSetsNode* disjoint_bit_sets_node_;
const ssize_t set_index_;
Expand Down Expand Up @@ -256,7 +256,7 @@ class DisjointListNode : public ArrayOutputMixin<ArrayNode> {

protected:
// This node is a pseudo-decision, so it is not removeable
bool removable() const override { return false; }
bool removable_() const override { return false; }

const DisjointListsNode* disjoint_list_node_ptr_;
const ssize_t list_index_;
Expand Down
Loading