Skip to content

Add scale and offset into the hash and fix ismatch to check these val… #21

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
cianciosa merged 2 commits into from
Jul 13, 2026
Merged

Add scale and offset into the hash and fix ismatch to check these val… #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e61f0b8
Add scale and offset into the hash and fix ismatch to check these val…
Jul 13, 2026
b81eb9c
Arguments should be tested via is_match.
Jul 13, 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
173 changes: 133 additions & 40 deletions graph_framework/piecewise.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,14 +127,20 @@ void compile_index(std::ostringstream &stream,
//------------------------------------------------------------------------------
/// @brief Convert node pointer to a string with the argument.
///
/// @param[in] d Backend buffer.
/// @param[in] x Argument.
/// @param[in] d Backend buffer.
/// @param[in] x Argument.
/// @param[in] scale Scale factor for the argument.
/// @param[in] offset Offset factor for the argument.
/// @return A string rep of the node.
//------------------------------------------------------------------------------
static std::string to_string(const backend::buffer<T> &d,
shared_leaf<T, SAFE_MATH> x) {
shared_leaf<T, SAFE_MATH> x,
const T scale,
const T offset) {
return piecewise_1D_node::to_string(d) +
jit::format_to_string(x->get_hash());
jit::format_to_string(x->get_hash()) +
jit::format_to_string(scale) +
jit::format_to_string(offset);
}

//------------------------------------------------------------------------------
Expand Down Expand Up @@ -177,7 +183,9 @@ void compile_index(std::ostringstream &stream,
shared_leaf<T, SAFE_MATH> x,
const T scale,
const T offset) :
straight_node<T, SAFE_MATH> (x, piecewise_1D_node::to_string(d, x)),
straight_node<T, SAFE_MATH> (x, piecewise_1D_node::to_string(d, x,
scale,
offset)),
data_hash(piecewise_1D_node::hash_data(d)), scale(scale),
offset(offset) {}

Expand Down Expand Up @@ -442,7 +450,7 @@ void compile_index(std::ostringstream &stream,

if (x_cast.get()) {
return this->data_hash == x_cast->data_hash &&
this->arg->is_match(x_cast->get_arg());
this->is_arg_match(x);
}

return false;
Expand Down Expand Up @@ -704,17 +712,29 @@ void compile_index(std::ostringstream &stream,
//------------------------------------------------------------------------------
/// @brief Convert node pointer to a string with the argument.
///
/// @param[in] d Backend buffer.
/// @param[in] x X argument.
/// @param[in] y Y argument.
/// @param[in] d Backend buffer.
/// @param[in] x X argument.
/// @param[in] x_scale Scale factor for the argument.
/// @param[in] x_offset Offset factor for the x argument.
/// @param[in] y Y argument.
/// @param[in] y_scale Scale factor for the y argument.
/// @param[in] y_offset Offset factor for the y argument.
/// @return A string rep of the node.
//------------------------------------------------------------------------------
static std::string to_string(const backend::buffer<T> &d,
shared_leaf<T, SAFE_MATH> x,
shared_leaf<T, SAFE_MATH> y) {
const T x_scale,
const T x_offset,
shared_leaf<T, SAFE_MATH> y,
const T y_scale,
const T y_offset) {
return piecewise_2D_node::to_string(d) +
jit::format_to_string(x->get_hash()) +
jit::format_to_string(y->get_hash());
jit::format_to_string(x_scale) +
jit::format_to_string(x_offset) +
jit::format_to_string(y->get_hash()) +
jit::format_to_string(y_scale) +
jit::format_to_string(y_offset);
}

//------------------------------------------------------------------------------
Expand Down Expand Up @@ -767,7 +787,10 @@ void compile_index(std::ostringstream &stream,
shared_leaf<T, SAFE_MATH> y,
const T y_scale,
const T y_offset) :
branch_node<T, SAFE_MATH> (x, y, piecewise_2D_node::to_string(d, x, y)),
branch_node<T, SAFE_MATH> (x, y,
piecewise_2D_node::to_string(d,
x, x_scale, x_offset,
y, y_scale, y_offset)),
data_hash(piecewise_2D_node::hash_data(d)),
num_columns(n), x_scale(x_scale), x_offset(x_offset), y_scale(y_scale),
y_offset(y_offset) {
Expand Down Expand Up @@ -1196,9 +1219,8 @@ void compile_index(std::ostringstream &stream,
auto x_cast = piecewise_2D_cast(x);

if (x_cast.get()) {
return this->data_hash == x_cast->data_hash &&
this->left->is_match(x_cast->get_left()) &&
this->right->is_match(x_cast->get_right());
return this->data_hash == x_cast->data_hash &&
this->is_arg_match(x);
}

return false;
Expand Down Expand Up @@ -1322,7 +1344,7 @@ void compile_index(std::ostringstream &stream,
return temp.get() &&
this->left->is_match(temp->get_arg()) &&
(temp->get_size() == this->get_num_rows()) &&
(temp->get_scale() == this->x_scale) &&
(temp->get_scale() == this->x_scale) &&
(temp->get_offset() == this->x_offset);
}

Expand All @@ -1339,7 +1361,7 @@ void compile_index(std::ostringstream &stream,
return temp.get() &&
this->right->is_match(temp->get_arg()) &&
(temp->get_size() == this->get_num_columns()) &&
(temp->get_scale() == this->y_scale) &&
(temp->get_scale() == this->y_scale) &&
(temp->get_offset() == this->y_offset);
}
};
Expand Down Expand Up @@ -1433,14 +1455,20 @@ void compile_index(std::ostringstream &stream,
//------------------------------------------------------------------------------
/// @brief Convert node pointer to a string with the argument.
///
/// @param[in] v Value to index.
/// @param[in] x Argument.
/// @param[in] v Value to index.
/// @param[in] x Argument.
/// @param[in] scale Scale factor for the argument.
/// @param[in] offset Offset factor for the argument.
/// @return A string rep of the node.
//------------------------------------------------------------------------------
static std::string to_string(shared_leaf<T, SAFE_MATH> v,
shared_leaf<T, SAFE_MATH> x) {
shared_leaf<T, SAFE_MATH> x,
const T scale,
const T offset) {
return jit::format_to_string(v->get_hash()) + "[" +
jit::format_to_string(x->get_hash()) + "]";
jit::format_to_string(x->get_hash()) +
jit::format_to_string(scale) +
jit::format_to_string(offset) + "]";
}

public:
Expand All @@ -1456,7 +1484,9 @@ void compile_index(std::ostringstream &stream,
shared_leaf<T, SAFE_MATH> x,
const T scale,
const T offset) :
branch_node<T, SAFE_MATH> (var, x, index_1D_node::to_string(var, x)),
branch_node<T, SAFE_MATH> (var, x,
index_1D_node::to_string(var, x,
scale, offset)),
scale(scale), offset(offset) {}

//------------------------------------------------------------------------------
Expand Down Expand Up @@ -1544,6 +1574,25 @@ void compile_index(std::ostringstream &stream,
return this->shared_from_this();
}

//------------------------------------------------------------------------------
/// @brief Query if the nodes match.
///
/// Assumes both arguments are either set or not set.
///
/// @param[in] x Other graph to check if it is a match.
/// @returns True if the nodes are a match.
//------------------------------------------------------------------------------
virtual bool is_match(shared_leaf<T, SAFE_MATH> x) {
auto x_cast = index_1D_cast(x);

if (x_cast.get()) {
return this->left->is_match(x_cast->get_left()) &&
this->is_arg_match(x);
}

return false;
}

//------------------------------------------------------------------------------
/// @brief Convert the node to latex.
//------------------------------------------------------------------------------
Expand Down Expand Up @@ -1623,11 +1672,15 @@ void compile_index(std::ostringstream &stream,
//------------------------------------------------------------------------------
bool is_arg_match(shared_leaf<T, SAFE_MATH> x) {
auto temp = index_1D_cast(x);
return temp.get() &&
this->right->is_match(temp->get_right()) &&
(temp->get_size() == this->get_size()) &&
(temp->get_scale() == this->scale) &&
(temp->get_offset() == this->offset);

if (temp.get()) {
return this->right->is_match(temp->get_right()) &&
(temp->get_size() == this->get_size()) &&
(temp->get_scale() == this->scale) &&
(temp->get_offset() == this->offset);
}

return false;
}

//------------------------------------------------------------------------------
Expand Down Expand Up @@ -1748,17 +1801,29 @@ void compile_index(std::ostringstream &stream,
//------------------------------------------------------------------------------
/// @brief Convert node pointer to a string with the argument.
///
/// @param[in] v Value to index.
/// @param[in] x Argument.
/// @param[in] y Argument.
/// @param[in] v Value to index.
/// @param[in] x Argument.
/// @param[in] x_scale Scale factor for the argument.
/// @param[in] x_offset Offset factor for the x argument.
/// @param[in] y Argument.
/// @param[in] y_scale Scale factor for the y argument.
/// @param[in] y_offset Offset factor for the y argument.
/// @return A string rep of the node.
//------------------------------------------------------------------------------
static std::string to_string(shared_leaf<T, SAFE_MATH> v,
shared_leaf<T, SAFE_MATH> x,
shared_leaf<T, SAFE_MATH> y) {
const T x_scale,
const T x_offset,
shared_leaf<T, SAFE_MATH> y,
const T y_scale,
const T y_offset) {
return jit::format_to_string(v->get_hash()) + "[" +
jit::format_to_string(x->get_hash()) + "," +
jit::format_to_string(y->get_hash()) + "]";
jit::format_to_string(x->get_hash()) +
jit::format_to_string(x_scale) +
jit::format_to_string(x_offset) + "," +
jit::format_to_string(y->get_hash()) +
jit::format_to_string(x_scale) +
jit::format_to_string(x_offset) + "]";
}

public:
Expand All @@ -1782,7 +1847,10 @@ void compile_index(std::ostringstream &stream,
shared_leaf<T, SAFE_MATH> y,
const T y_scale,
const T y_offset) :
triple_node<T, SAFE_MATH> (var, x, y, index_2D_node::to_string(var, x, y)),
triple_node<T, SAFE_MATH> (var, x, y,
index_2D_node::to_string(var,
x, x_scale, x_offset,
y, y_scale, y_offset)),
num_columns(n), x_scale(x_scale), x_offset(x_offset), y_scale(y_scale),
y_offset(y_offset) {
assert(variable_cast(this->left)->size()%n == 0 &&
Expand Down Expand Up @@ -1909,6 +1977,25 @@ void compile_index(std::ostringstream &stream,
return this->shared_from_this();
}

//------------------------------------------------------------------------------
/// @brief Query if the nodes match.
///
/// Assumes both arguments are either set or not set.
///
/// @param[in] x Other graph to check if it is a match.
/// @returns True if the nodes are a match.
//------------------------------------------------------------------------------
virtual bool is_match(shared_leaf<T, SAFE_MATH> x) {
auto x_cast = index_2D_cast(x);

if (x_cast.get()) {
return this->left->is_match(x_cast->get_left()) &&
this->is_arg_match(x);
}

return false;
}

//------------------------------------------------------------------------------
/// @brief Convert the node to latex.
//------------------------------------------------------------------------------
Expand Down Expand Up @@ -1991,12 +2078,18 @@ void compile_index(std::ostringstream &stream,
/// @returns True if the arguments match.
//------------------------------------------------------------------------------
bool is_arg_match(shared_leaf<T, SAFE_MATH> x) {
auto temp = index_1D_cast(x);
return temp.get() &&
this->right->is_match(temp->get_right()) &&
(temp->get_size() == this->get_size()) &&
(temp->get_scale() == this->scale) &&
(temp->get_offset() == this->offset);
auto temp = index_2D_cast(x);

if (temp.get()) {
return this->right->is_match(temp->get_right()) &&
(temp->get_size() == this->get_size()) &&
(temp->get_x_scale() == this->x_scale) &&
(temp->get_x_offset() == this->x_offset) &&
(temp->get_y_scale() == this->y_scale) &&
(temp->get_y_offset() == this->y_offset);
}

return false;
}

//------------------------------------------------------------------------------
Expand Down
44 changes: 44 additions & 0 deletions graph_tests/piecewise_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,19 @@ template<jit::float_scalar T> void piecewise_1D() {
static_cast<T> (4.0),
static_cast<T> (6.0)}),
a, 1.0, 0.0);
auto p4 = graph::piecewise_1D<T> (std::vector<T> ({static_cast<T> (1.0),
static_cast<T> (2.0),
static_cast<T> (3.0)}),
a, 2.0, 3.0);
auto p5 = graph::piecewise_1D<T> (std::vector<T> ({static_cast<T> (1.0),
static_cast<T> (2.0),
static_cast<T> (3.0)}),
a, 1.0, 0.0);

assert(!p1->is_match(p4) && "Expected no match.");
assert(p1.get() != p4.get() && "Expected no match.");
assert(p1->is_match(p5) && "Expected match.");
assert(p1.get() == p5.get() && "Expected match.");

auto c = graph::constant<T> (static_cast<T> (2.5));
auto pconst = graph::piecewise_1D<T> (std::vector<T> ({static_cast<T> (2.0),
Expand Down Expand Up @@ -327,6 +340,20 @@ template<jit::float_scalar T> void piecewise_2D() {
static_cast<T> (2.0), static_cast<T> (4.0)
}), ay, 1.0, 0.0);

auto p6 = graph::piecewise_2D<T> (std::vector<T> ({
static_cast<T> (1.0), static_cast<T> (2.0),
static_cast<T> (3.0), static_cast<T> (4.0)
}), 2, ax, 1.0, 0.0, ay, 1.0, 5.0);
auto p7 = graph::piecewise_2D<T> (std::vector<T> ({
static_cast<T> (1.0), static_cast<T> (2.0),
static_cast<T> (3.0), static_cast<T> (4.0)
}), 2, ax, 1.0, 0.0, ay, 1.0, 0.0);

assert(!p1->is_match(p6) && "Expected no match.");
assert(p1.get() != p6.get() && "Expected no match.");
assert(p1->is_match(p7) && "Expected match.");
assert(p1.get() == p7.get() && "Expected match.");

auto cx = graph::constant<T> (static_cast<T> (0.5));
auto cy = graph::constant<T> (static_cast<T> (1.5));
auto pconst = graph::piecewise_2D<T> (std::vector<T> ({
Expand Down Expand Up @@ -809,6 +836,13 @@ template<jit::float_scalar T> void index_1D() {
auto arg = graph::variable<T> (1, "");

auto index = graph::index_1D<T> (variable, arg, 1.0, 0.0);
auto index2 = graph::index_1D<T> (variable, arg, 1.0, 2.0);
auto index3 = graph::index_1D<T> (variable, arg, 1.0, 0.0);

assert(!index->is_match(index2) && "Expected no match.");
assert(index.get() != index2.get() && "Expected no match.");
assert(index->is_match(index3) && "Expected match.");
assert(index.get() == index3.get() && "Expected match.");

variable->set({0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0});
arg->set(static_cast<T> (3.5));
Expand Down Expand Up @@ -839,6 +873,16 @@ template<jit::float_scalar T> void index_2D() {
auto index = graph::index_2D<T> (variable, 3,
x, 1.0, 0.0,
y, 1.0, 0.0);
auto index2 = graph::index_2D<T> (variable, 3,
x, 1.0, 0.0,
y, 1.0, 2.0);
auto index3 = graph::index_2D<T> (variable, 3,
x, 1.0, 0.0,
y, 1.0, 0.0);
assert(!index->is_match(index2) && "Expected no match.");
assert(index.get() != index2.get() && "Expected no match.");
assert(index->is_match(index3) && "Expected match.");
assert(index.get() == index3.get() && "Expected match.");

variable->set({
1.0, 2.0, 3.0,
Expand Down
Loading