Skip to content

Allow min:max indexing to always succeed if it is an empty selection #3362

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
WardBrian merged 5 commits into from
Oct 9, 2025
+43 −29
Merged

Allow min:max indexing to always succeed if it is an empty selection #3362

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
301e27a
Add test of new behavior
WardBrian Oct 9, 2025
199ca2b
Allow min:max indexing to always succeed if it is an empty selection
WardBrian Oct 9, 2025
43ab47f
[Jenkins] auto-formatting by clang-format version 10.0.0-4ubuntu1
stan-buildbot Oct 9, 2025
5344590
Fix rvalue_varmat tests
WardBrian Oct 9, 2025
b6df552
[Jenkins] auto-formatting by clang-format version 10.0.0-4ubuntu1
stan-buildbot Oct 9, 2025
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
34 changes: 19 additions & 15 deletions src/stan/model/indexing/rvalue.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,14 +185,14 @@ inline auto rvalue(EigVec&& v, const char* name, MultiIndex&& idx) {
template <typename Vec, require_vector_t<Vec>* = nullptr,
require_not_std_vector_t<Vec>* = nullptr>
inline auto rvalue(Vec&& v, const char* name, index_min_max idx) {
math::check_range("vector[min_max] min indexing", name, v.size(), idx.min_);
const Eigen::Index slice_start = idx.min_ - 1;
if (idx.max_ >= idx.min_) {
math::check_range("vector[min_max] min indexing", name, v.size(), idx.min_);
const Eigen::Index slice_start = idx.min_ - 1;
math::check_range("vector[min_max] max indexing", name, v.size(), idx.max_);
const Eigen::Index slice_size = idx.max_ - slice_start;
return v.segment(slice_start, slice_size);
} else {
return v.segment(slice_start, 0);
return v.segment(0, 0);
}
}

Expand Down Expand Up @@ -343,14 +343,14 @@ inline auto rvalue(Mat&& x, const char* name, index_max idx) {
*/
template <typename Mat, require_dense_dynamic_t<Mat>* = nullptr>
inline auto rvalue(Mat&& x, const char* name, index_min_max idx) {
math::check_range("matrix[min_max] min row indexing", name, x.rows(),
idx.min_);
if (idx.max_ >= idx.min_) {
math::check_range("matrix[min_max] min row indexing", name, x.rows(),
idx.min_);
math::check_range("matrix[min_max] max row indexing", name, x.rows(),
idx.max_);
return x.middleRows(idx.min_ - 1, idx.max_ - idx.min_ + 1);
} else {
return x.middleRows(idx.min_ - 1, 0);
return x.middleRows(0, 0);
}
}

Expand All @@ -371,11 +371,11 @@ inline auto rvalue(Mat&& x, const char* name, index_min_max idx) {
template <typename Mat, require_dense_dynamic_t<Mat>* = nullptr>
inline auto rvalue(Mat&& x, const char* name, index_min_max row_idx,
index_min_max col_idx) {
math::check_range("matrix[min_max, min_max] min row indexing", name, x.rows(),
row_idx.min_);
math::check_range("matrix[min_max, min_max] min column indexing", name,
x.cols(), col_idx.min_);
if (row_idx.max_ >= row_idx.min_ && col_idx.max_ >= col_idx.min_) {
math::check_range("matrix[min_max, min_max] min row indexing", name,
x.rows(), row_idx.min_);
math::check_range("matrix[min_max, min_max] min column indexing", name,
x.cols(), col_idx.min_);
math::check_range("matrix[min_max, min_max] max row indexing", name,
x.rows(), row_idx.max_);
math::check_range("matrix[min_max, min_max] max column indexing", name,
Expand All @@ -384,17 +384,21 @@ inline auto rvalue(Mat&& x, const char* name, index_min_max row_idx,
row_idx.max_ - (row_idx.min_ - 1),
col_idx.max_ - (col_idx.min_ - 1));
} else if (row_idx.max_ >= row_idx.min_) {
math::check_range("matrix[min_max, min_max] min row indexing", name,
x.rows(), row_idx.min_);
math::check_range("matrix[min_max, min_max] max row indexing", name,
x.rows(), row_idx.max_);
return x.block(row_idx.min_ - 1, col_idx.min_ - 1,
row_idx.max_ - (row_idx.min_ - 1), 0);
} else if (col_idx.max_ >= col_idx.min_) {
math::check_range("matrix[min_max, min_max] min column indexing", name,
x.cols(), col_idx.min_);
math::check_range("matrix[min_max, min_max] max column indexing", name,
x.cols(), col_idx.max_);
return x.block(row_idx.min_ - 1, col_idx.min_ - 1, 0,
col_idx.max_ - (col_idx.min_ - 1));
} else {
return x.block(row_idx.min_ - 1, col_idx.min_ - 1, 0, 0);
return x.block(0, 0, 0, 0);
}
}

Expand Down Expand Up @@ -684,16 +688,16 @@ inline auto rvalue(Mat&& x, const char* name, Idx&& row_idx,
template <typename Mat, typename Idx, require_dense_dynamic_t<Mat>* = nullptr>
inline auto rvalue(Mat&& x, const char* name, Idx&& row_idx,
index_min_max col_idx) {
math::check_range("matrix[..., min_max] min column indexing", name, x.cols(),
col_idx.min_);
const Eigen::Index col_start = col_idx.min_ - 1;
if (col_idx.max_ >= col_idx.min_) {
math::check_range("matrix[..., min_max] min column indexing", name,
x.cols(), col_idx.min_);
const Eigen::Index col_start = col_idx.min_ - 1;
math::check_range("matrix[..., min_max] max column indexing", name,
x.cols(), col_idx.max_);
return rvalue(x.middleCols(col_start, col_idx.max_ - col_start), name,
std::forward<Idx>(row_idx));
} else {
return rvalue(x.middleCols(col_start, 0), name, std::forward<Idx>(row_idx));
return rvalue(x.middleCols(0, 0), name, std::forward<Idx>(row_idx));
}
}

Expand Down
28 changes: 19 additions & 9 deletions src/test/unit/model/indexing/rvalue_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ TEST(ModelIndexing, rvalue_eigenvec_min_max_nil) {
x(1) = 2.2;
x(2) = 3.3;
x(3) = 4.4;
// min > max
// min < max
for (int mn = 0; mn < 4; ++mn) {
for (int mx = mn; mx < 4; ++mx) {
Eigen::Matrix<double, -1, 1> rx
Expand All @@ -196,21 +196,31 @@ TEST(ModelIndexing, rvalue_eigenvec_min_max_nil) {
}
}

// max > min
for (int mn = 3; mn > -1; --mn) {
for (int mx = mn; mx > -1; --mx) {
// min > max, including min > size
for (int mn = 5; mn > -1; --mn) {
for (int mx = mn - 1; mx > -1; --mx) {
Eigen::Matrix<double, -1, 1> rx
= rvalue(x, "", index_min_max(mn + 1, mx + 1));
if (mn == mx) {
EXPECT_FLOAT_EQ(1, rx.size());
} else {
EXPECT_FLOAT_EQ(0, rx.size());
}
EXPECT_FLOAT_EQ(0, rx.size());
}
}

// min == max
for (int mn = 3; mn > -1; --mn) {
Eigen::Matrix<double, -1, 1> rx
= rvalue(x, "", index_min_max(mn + 1, mn + 1));
EXPECT_FLOAT_EQ(1, rx.size());
}

test_out_of_range(x, index_min_max(0, 2));
test_out_of_range(x, index_min_max(2, 5));

// empty min-max on empty vectors
Eigen::Matrix<double, -1, 1> z(0);
EXPECT_EQ(0, rvalue(z, "", index_min_max(1, 0)).size());
EXPECT_EQ(0,
rvalue(rvalue(x, "", index_min_max(2, 1)), "", index_min_max(1, 0))
.size());
}

TEST(ModelIndexing, rvalue_doubless_uni_uni) {
Expand Down
10 changes: 5 additions & 5 deletions src/test/unit/model/indexing/rvalue_varmat_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ TEST_F(RvalueRev, negative_min_max_vec) {
}
var_value<Eigen::VectorXd> x(x_val);
EXPECT_NO_THROW(rvalue(x, "", index_min_max(2, 0)));
test_throw_out_of_range(x, index_min_max(5, 2));
EXPECT_NO_THROW(rvalue(x, "", index_min_max(5, 2)));
}

auto make_std_varvec() {
Expand Down Expand Up @@ -374,7 +374,7 @@ TEST_F(RvalueRev, uni_stdvec_negative_minmax_vec) {
= rvalue(x, "", index_uni(2), index_min_max(2, 1));
EXPECT_EQ(0U, y.size());
EXPECT_NO_THROW(rvalue(x, "", index_uni(1), index_min_max(3, 0)));
test_throw_out_of_range(x, index_uni(1), index_min_max(15, 2));
EXPECT_NO_THROW(rvalue(x, "", index_uni(1), index_min_max(15, 2)));
}
TEST_F(RvalueRev, uni_stdvec_omni_vec) {
using Eigen::VectorXd;
Expand Down Expand Up @@ -561,7 +561,7 @@ TEST_F(RvalueRev, negative_minmax_uni_matrix) {
EXPECT_EQ(1U, y.cols());
test_throw_out_of_range(x, index_min_max(3, 2), index_uni(0));
test_throw_out_of_range(x, index_min_max(3, 2), index_uni(5));
test_throw_out_of_range(x, index_min_max(6, 1), index_uni(4));
EXPECT_NO_THROW(rvalue(x, "", index_min_max(6, 1), index_uni(4)));
EXPECT_NO_THROW(rvalue(x, "", index_min_max(1, 0), index_uni(4)));
}

Expand Down Expand Up @@ -938,7 +938,7 @@ TEST_F(RvalueRev, negative_min_max_mat) {
EXPECT_EQ(0, y.rows());
EXPECT_EQ(4, y.cols());
EXPECT_NO_THROW(rvalue(x, "", index_min_max(3, 0)));
test_throw_out_of_range(x, index_min_max(15, 2));
EXPECT_NO_THROW(rvalue(x, "", index_min_max(15, 2)));
}

TEST_F(RvalueRev, positive_minmax_positive_minmax_matrix) {
Expand Down Expand Up @@ -1071,7 +1071,7 @@ TEST_F(RvalueRev, uni_negative_minmax_matrix) {
EXPECT_EQ(0U, y.cols());
test_throw_out_of_range(x, index_uni(0), index_min_max(4, 2));
test_throw_out_of_range(x, index_uni(7), index_min_max(4, 2));
test_throw_out_of_range(x, index_uni(2), index_min_max(15, 0));
EXPECT_NO_THROW(rvalue(x, "", index_uni(2), index_min_max(15, 0)));
EXPECT_NO_THROW(rvalue(x, "", index_uni(2), index_min_max(2, 0)));
}

Expand Down