Skip to content
This repository was archived by the owner on Aug 20, 2026. It is now read-only.

fix(regularisers): correct diag_bending/diag_all corner cross-term sign error#49

Closed
balbasty wants to merge 1 commit into from
Closed

fix(regularisers): correct diag_bending/diag_all corner cross-term sign error #49

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
2 changes: 1 addition & 1 deletion regularisers/field/2d.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -461,7 +461,7 @@ struct Kernels<Config<two, _C, T...>>
w11 = kernel[5];
w00 -= w10 * (fx0 + fx1) + w01 * (fy0 + fy1)
+ w20 * (fx00 + fx11) + w02 * (fy00 + fy11)
+ w11 * (fx0*fy0 + fx1*fy0 + fx1*fy0 + fx1*fy1);
+ w11 * (fx0*fy0 + fx1*fy0 + fx0*fy1 + fx1*fy1);
op(out, w00);
};

Expand Down
6 changes: 3 additions & 3 deletions regularisers/field/3d.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -514,9 +514,9 @@ struct Kernels<Config<three, _C, T...>>
w110 = kernel[7], w101 = kernel[8], w011 = kernel[9];
w000 -= w100 * (fx0 + fx1) + w010 * (fy0 + fy1) + w001 * (fz0 + fz1)
+ w200 * (fx00 + fx11) + w020 * (fy00 + fy11) + w002 * (fz00 + fz11)
+ w110 * (fx0*fy0 + fx1*fy0 + fx1*fy0 + fx1*fy1)
+ w101 * (fx0*fz0 + fx1*fz0 + fx1*fz0 + fx1*fz1)
+ w011 * (fy0*fz0 + fy1*fz0 + fy1*fz0 + fy1*fz1);
+ w110 * (fx0*fy0 + fx1*fy0 + fx0*fy1 + fx1*fy1)
+ w101 * (fx0*fz0 + fx1*fz0 + fx0*fz1 + fx1*fz1)
+ w011 * (fy0*fz0 + fy1*fz0 + fy0*fz1 + fy1*fz1);
op(out, w000);
};

Expand Down
4 changes: 2 additions & 2 deletions regularisers/flow/2d.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -402,7 +402,7 @@ struct RegFlow<two, scalar_t, reduce_t, offset_t, BX, BY> {
w110 = kernel[5];
w000 -= w100 * (fx0 + fx1) + w010 * (fy0 + fy1)
+ w200 * (fx00 + fx11) + w020 * (fy00 + fy11)
+ w110 * (fx0*fy0 + fx1*fy0 + fx1*fy0 + fx1*fy1);
+ w110 * (fx0*fy0 + fx1*fy0 + fx0*fy1 + fx1*fy1);
op(out, w000);
};
setdiag(out[0], kernel);
Expand DownExpand Up@@ -681,7 +681,7 @@ struct RegFlow<two, scalar_t, reduce_t, offset_t, BX, BY> {
w110 = kernel[5];
w000 -= w100 * (fx0 + fx1) + w010 * (fy0 + fy1)
+ w200 * (fx00 + fx11) + w020 * (fy00 + fy11)
+ w110 * (fx0*fy0 + fx1*fy0 + fx1*fy0 + fx1*fy1);
+ w110 * (fx0*fy0 + fx1*fy0 + fx0*fy1 + fx1*fy1);
op(*out, w000);
};

Expand Down
12 changes: 6 additions & 6 deletions regularisers/flow/3d.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -523,9 +523,9 @@ struct RegFlow<three, scalar_t, reduce_t, offset_t, BX, BY, BZ> {
w110 = kernel[7], w101 = kernel[8], w011 = kernel[9];
w000 -= w100 * (fx0 + fx1) + w010 * (fy0 + fy1) + w001 * (fz0 + fz1)
+ w200 * (fx00 + fx11) + w020 * (fy00 + fy11) + w002 * (fz00 + fz11)
+ w110 * (fx0*fy0 + fx1*fy0 + fx1*fy0 + fx1*fy1)
+ w101 * (fx0*fz0 + fx1*fz0 + fx1*fz0 + fx1*fz1)
+ w011 * (fy0*fz0 + fy1*fz0 + fy1*fz0 + fy1*fz1);
+ w110 * (fx0*fy0 + fx1*fy0 + fx0*fy1 + fx1*fy1)
+ w101 * (fx0*fz0 + fx1*fz0 + fx0*fz1 + fx1*fz1)
+ w011 * (fy0*fz0 + fy1*fz0 + fy0*fz1 + fy1*fz1);
op(out, w000);
};
setdiag(out[0], kernel);
Expand DownExpand Up@@ -942,9 +942,9 @@ struct RegFlow<three, scalar_t, reduce_t, offset_t, BX, BY, BZ> {
w110 = kernel[7], w101 = kernel[8], w011 = kernel[9];
w000 -= w100 * (fx0 + fx1) + w010 * (fy0 + fy1) + w001 * (fz0 + fz1)
+ w200 * (fx00 + fx11) + w020 * (fy00 + fy11) + w002 * (fz00 + fz11)
+ w110 * (fx0*fy0 + fx1*fy0 + fx1*fy0 + fx1*fy1)
+ w101 * (fx0*fz0 + fx1*fz0 + fx1*fz0 + fx1*fz1)
+ w011 * (fy0*fz0 + fy1*fz0 + fy1*fz0 + fy1*fz1);
+ w110 * (fx0*fy0 + fx1*fy0 + fx0*fy1 + fx1*fy1)
+ w101 * (fx0*fz0 + fx1*fz0 + fx0*fz1 + fx1*fz1)
+ w011 * (fy0*fz0 + fy1*fz0 + fy0*fz1 + fy1*fz1);
op(*out, w000);
};

Expand Down