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

Jump to bottom

Add macro for concatenating matrices #1080

Closed
wants to merge 13 commits into from
Closed

Add macro for concatenating matrices #1080

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
5f3a748
Add macro for concatenating matrices
birktj Feb 15, 2022
9f3f349
Replace DimUnify with DimEq::representative
birktj Feb 22, 2022
76a15e5
Add some simple cat macro output generation tests
birktj Mar 3, 2022
4aac95a
Fix formatting in cat macro code
birktj Feb 2, 2023
fee8302
Add random prefix to cat macro output
birktj Feb 2, 2023
ad87d00
Add simple quote_spanned for cat macro
birktj Feb 2, 2023
03389ed
Use `generic_view_mut` in cat macro
birktj Feb 2, 2023
e5957f7
Fix clippy lints in cat macro
birktj Feb 2, 2023
c5e4a93
Clean up documentation for cat macro
birktj Feb 2, 2023
578e46a
Remove identity literal from cat macro
birktj Apr 22, 2023
e1add3f
Allow references in input to cat macro
birktj Apr 22, 2023
1cc5772
Rename cat macro to stack
birktj Apr 22, 2023
92d6b84
Add more stack macro tests
birktj Apr 22, 2023
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
18 changes: 9 additions & 9 deletions nalgebra-macros/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,7 +586,7 @@ fn cat_impl(prefix: &str, matrix: Matrix) -> TokenStream2 {
output.extend(std::iter::once(quote! {
let start = (#row_offset, #col_offset);
let shape = (#row_size, #col_size);
let mut slice = matrix.generic_slice_mut(start, shape);
let mut slice = matrix.generic_view_mut(start, shape);
slice.copy_from(&nalgebra::Matrix::identity_generic(shape.0, shape.1));
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rename slice to view

}));
}
Expand All @@ -595,7 +595,7 @@ fn cat_impl(prefix: &str, matrix: Matrix) -> TokenStream2 {
output.extend(std::iter::once(quote! {
let start = (#row_offset, #col_offset);
let shape = (#row_size, #col_size);
let mut slice = matrix.generic_slice_mut(start, shape);
let mut slice = matrix.generic_view_mut(start, shape);
slice.copy_from(#expr_ident);
birktj marked this conversation as resolved.
Show resolved Hide resolved
}));
}
Expand Down Expand Up @@ -643,11 +643,11 @@ mod tests {
);
let start = (_cat_row_0_offset, _cat_col_0_offset);
let shape = (_cat_row_0_size, _cat_col_0_size);
let mut slice = matrix.generic_slice_mut(start, shape);
let mut slice = matrix.generic_view_mut(start, shape);
slice.copy_from(_cat_0_0);
let start = (_cat_row_1_offset, _cat_col_1_offset);
let shape = (_cat_row_1_size, _cat_col_1_size);
let mut slice = matrix.generic_slice_mut(start, shape);
let mut slice = matrix.generic_view_mut(start, shape);
slice.copy_from(_cat_1_1);
matrix
}};
Expand Down Expand Up @@ -700,23 +700,23 @@ mod tests {
);
let start = (_cat_row_0_offset, _cat_col_0_offset);
let shape = (_cat_row_0_size, _cat_col_0_size);
let mut slice = matrix.generic_slice_mut(start, shape);
let mut slice = matrix.generic_view_mut(start, shape);
slice.copy_from(_cat_0_0);
let start = (_cat_row_0_offset, _cat_col_2_offset);
let shape = (_cat_row_0_size, _cat_col_2_size);
let mut slice = matrix.generic_slice_mut(start, shape);
let mut slice = matrix.generic_view_mut(start, shape);
slice.copy_from(_cat_0_2);
let start = (_cat_row_1_offset, _cat_col_1_offset);
let shape = (_cat_row_1_size, _cat_col_1_size);
let mut slice = matrix.generic_slice_mut(start, shape);
let mut slice = matrix.generic_view_mut(start, shape);
slice.copy_from(_cat_1_1);
let start = (_cat_row_1_offset, _cat_col_2_offset);
let shape = (_cat_row_1_size, _cat_col_2_size);
let mut slice = matrix.generic_slice_mut(start, shape);
let mut slice = matrix.generic_view_mut(start, shape);
slice.copy_from(_cat_1_2);
let start = (_cat_row_2_offset, _cat_col_0_offset);
let shape = (_cat_row_2_size, _cat_col_0_size);
let mut slice = matrix.generic_slice_mut(start, shape);
let mut slice = matrix.generic_view_mut(start, shape);
slice.copy_from(_cat_2_0);
matrix
}};
Expand Down