Skip to content
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

Update uses of Eigen::all to Eigen::indexing::all. #64

Closed
wants to merge 1 commit into from
Closed

Update uses of Eigen::all to Eigen::indexing::all. #64

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions src/common/point_source_panner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,9 @@ namespace ear {
Eigen::MatrixXd positions)
: RegionHandler(outputChannels, positions) {
_order = ngonVertexOrder(positions);
Eigen::MatrixXd reorderedPositions = positions(_order, Eigen::all);
Eigen::MatrixXd reorderedPositions = positions(_order, Eigen::indexing::all);
Eigen::MatrixXd reorderedAndShiftedPositions =
reorderedPositions(Eigen::Vector4i{1, 2, 3, 0}, Eigen::all);
reorderedPositions(Eigen::Vector4i{1, 2, 3, 0}, Eigen::indexing::all);
_polyBasisX = _calcPolyBasis(reorderedPositions);
_polyBasisY = _calcPolyBasis(reorderedAndShiftedPositions);
};
Expand Down
8 changes: 4 additions & 4 deletions tests/delay_buffer_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,17 @@ TEST_CASE("delay_buffer") {
Eigen::MatrixXf output = Eigen::MatrixXf::Zero(testlen, 5);
Eigen::MatrixXf expected_output = Eigen::MatrixXf::Zero(testlen, 5);

expected_output(Eigen::seqN(delay, testlen - delay), Eigen::all) =
input(Eigen::seqN(0, testlen - delay), Eigen::all);
expected_output(Eigen::seqN(delay, testlen - delay), Eigen::indexing::all) =
input(Eigen::seqN(0, testlen - delay), Eigen::indexing::all);

PtrAdapter in_ptrs(5), out_ptrs(5);

Eigen::internal::set_is_malloc_allowed(false);
int offset = 0;
for (auto &block_size : block_sizes) {
auto block = Eigen::seqN(offset, block_size);
in_ptrs.set_eigen(input(block, Eigen::all));
out_ptrs.set_eigen(output(block, Eigen::all));
in_ptrs.set_eigen(input(block, Eigen::indexing::all));
out_ptrs.set_eigen(output(block, Eigen::indexing::all));
db.process(block_size, in_ptrs.ptrs(), out_ptrs.ptrs());
offset += block_size;
}
Expand Down
6 changes: 3 additions & 3 deletions tests/gain_interpolator_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@

process(interp_test, 0, input, tmp);

expected_output(Eigen::all, out) += tmp;
expected_output(Eigen::indexing::all, out) += tmp;
};
run_channel(0);
run_channel(1);
Expand Down Expand Up @@ -242,9 +242,9 @@
interp_test.interp_points.emplace_back(100, a[in][out]);
interp_test.interp_points.emplace_back(200, b[in][out]);

process(interp_test, 0, input(Eigen::all, in), tmp);
process(interp_test, 0, input(Eigen::indexing::all, in), tmp);

expected_output(Eigen::all, out) += tmp;
expected_output(Eigen::indexing::all, out) += tmp;
};
run_channel(0, 0);
run_channel(0, 1);
Expand Down Expand Up @@ -281,7 +281,7 @@
for (size_t in_i = 0; in_i < in_channels; in_i++) {
std::vector<float> vec(out_channels);
for (size_t out_i = 0; out_i < out_channels; out_i++) {
vec[out_i] = distribution(generator);

Check warning on line 284 in tests/gain_interpolator_tests.cpp

View workflow job for this annotation

GitHub Actions / windows-latest shared=false Release 

 '=': conversion from 'double' to '_Ty', possible loss of data
}
point.push_back(std::move(vec));
}
Expand Down
8 changes: 4 additions & 4 deletions tests/geom_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,9 +136,9 @@ TEST_CASE("test_order_vertices_random") {
Eigen::VectorXi orderVec =
Eigen::VectorXi::LinSpaced(numberOfNgons, 0, numberOfNgons);
do {
unorderedNgon = orderedNgonRandomized(orderVec, Eigen::all);
unorderedNgon = orderedNgonRandomized(orderVec, Eigen::indexing::all);
indices = ngonVertexOrder(unorderedNgon);
reorderedNgon = unorderedNgon(indices, Eigen::all);
reorderedNgon = unorderedNgon(indices, Eigen::indexing::all);
REQUIRE(inSameOrder(reorderedNgon, orderedNgonRandomized));
} while (std::next_permutation(orderVec.begin(), orderVec.end()));
}
Expand All @@ -158,9 +158,9 @@ TEST_CASE("test_order_vertices_no_random") {
Eigen::VectorXi orderVec = Eigen::VectorXi::LinSpaced(
orderedNgon.rows(), 0, static_cast<int>(orderedNgon.rows()));
do {
unorderedNgon = orderedNgon(orderVec, Eigen::all);
unorderedNgon = orderedNgon(orderVec, Eigen::indexing::all);
indices = ngonVertexOrder(unorderedNgon);
reorderedNgon = unorderedNgon(indices, Eigen::all);
reorderedNgon = unorderedNgon(indices, Eigen::indexing::all);
REQUIRE(inSameOrder(reorderedNgon, orderedNgon));
} while (std::next_permutation(orderVec.begin(), orderVec.end()));
}
Expand Down
Loading