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.

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

WIP: Affine initialization #116

Merged
merged 37 commits into from
Nov 14, 2019
Merged
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
01a9d09
Transform IO
simeks Nov 2, 2019
5db2375
Improvements to parsing
simeks Nov 2, 2019
958eed5
transform_point tests
simeks Nov 2, 2019
b50d139
Extract displacement vector from affine transformation
simeks Nov 2, 2019
d1fd0fe
Fix
simeks Nov 2, 2019
802234b
Adding affine transform to displacement field
simeks Nov 4, 2019
ca1a215
Refactoring, utilize a update field for updates
simeks Nov 4, 2019
4d053fc
Reset update field
simeks Nov 4, 2019
1afa03c
Woops
simeks Nov 4, 2019
811b2d4
Composition
simeks Nov 4, 2019
b962009
Composite
simeks Nov 4, 2019
11d4833
Composition in cost function
simeks Nov 4, 2019
63c05ec
Reset update field
simeks Nov 4, 2019
ee27440
Threaded update
simeks Nov 4, 2019
41f4de9
Test
simeks Nov 4, 2019
28293b4
Affine transform
simeks Nov 4, 2019
95e8bf7
Fix
simeks Nov 4, 2019
6ca0f5c
Bugfix
simeks Nov 4, 2019
b2cf29a
Apply affine in transform_x
simeks Nov 4, 2019
5c5ca5b
Temp
simeks Nov 5, 2019
e99cbc3
Remove `regularize_initial_displacement`
simeks Nov 6, 2019
f9255d3
Fixed test
simeks Nov 6, 2019
49183f5
Optional affine transform added to transform command
simeks Nov 6, 2019
cd0cc3c
Cleanup
simeks Nov 6, 2019
4e168b9
Pretty
simeks Nov 7, 2019
90c1fc5
Affine transform added to command-line interface
simeks Nov 7, 2019
751c3a6
fix
simeks Nov 8, 2019
5b107ff
AffineTransform added to python interface
simeks Nov 11, 2019
bb0e1cd
Apply affine transformation into resulting displacement field
simeks Nov 11, 2019
52043b5
Copy meta data
simeks Nov 11, 2019
64b6e7d
Error handling
simeks Nov 11, 2019
c0db00d
Fix
simeks Nov 11, 2019
275d944
Actually append the affine transformation
simeks Nov 11, 2019
a14cfdc
Fixed composition with affine transform
simeks Nov 11, 2019
71c07cf
WIP: Affine on GPU
simeks Nov 11, 2019
b7abaff
GPU Implementation of affine initialization
simeks Nov 13, 2019
347c5a4
Copy meta data
simeks Nov 14, 2019
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
Prev Previous commit
Next Next commit
Pretty
simeks committed Nov 7, 2019
commit 4e168b93a9d75eb798a284054da300620c94eb0c
12 changes: 5 additions & 7 deletions src/deform_lib/registration/registration_engine.cpp
Original file line number Diff line number Diff line change
@@ -47,14 +47,12 @@ namespace
ASSERT(df.size() == mask.size() && df.size() == values.size());
dim3 dims = df.size();
for (int z = 0; z < int(dims.z); ++z) {
for (int y = 0; y < int(dims.y); ++y) {
for (int x = 0; x < int(dims.x); ++x) {
if (mask(x, y, z) > 0) {
df.set(int3{x,y,z}, values(x, y, z));
}
}
for (int y = 0; y < int(dims.y); ++y) {
for (int x = 0; x < int(dims.x); ++x) {
if (mask(x, y, z) > 0) {
df.set(int3{x,y,z}, values(x, y, z));
}
}
}}}
}

template<typename T>