Skip to content

Make ScalarOutputMixinStateData available to all classes that inherit from ScalarOutputMixin #276

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 1 commit into from
May 1, 2025
Merged

Make ScalarOutputMixinStateData available to all classes that inherit from ScalarOutputMixin #276

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
35 changes: 20 additions & 15 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 @@ -1089,6 +1089,24 @@ class ScalarOutputMixin<Base, false> : public Base {
constexpr std::span<const ssize_t> strides() const noexcept final { return {}; };

constexpr bool contiguous() const noexcept final { return true; }

protected:
// Even though ScalarOutputMixinStateData is not used when ProvideState is false,
// it still might be useful to inheriting classes who want to customize it.
// So we make it avialable here.
struct ScalarOutputMixinStateData : public NodeStateData {
explicit ScalarOutputMixinStateData(double value) : update(0, value, value) {}

const double* buff() const { return &update.value; }
void commit() { update.old = update.value; }
std::span<const Update> diff() const {
return std::span(&update, update.old != update.value);
}
void revert() { update.value = update.old; }
void set(double value) { update.value = value; }

Update update;
};
};

template <class Base>
Expand Down Expand Up @@ -1118,6 +1136,8 @@ class ScalarOutputMixin<Base, true> : public ScalarOutputMixin<Base, false> {
}

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);
Expand All @@ -1127,21 +1147,6 @@ class ScalarOutputMixin<Base, true> : public ScalarOutputMixin<Base, false> {
void set_state(State& state, double value) const {
this->template data_ptr<ScalarOutputMixinStateData>(state)->set(value);
}

private:
struct ScalarOutputMixinStateData : public NodeStateData {
explicit ScalarOutputMixinStateData(double value) : update(0, value, value) {}

const double* buff() const { return &update.value; }
void commit() { update.old = update.value; }
std::span<const Update> diff() const {
return std::span(&update, update.old != update.value);
}
void revert() { update.value = update.old; }
void set(double value) { update.value = value; }

Update update;
};
};

// Views are printable
Expand Down