Skip to content

Fix: Dim 1 not calculating properly #3057

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

Open
heidthecamp wants to merge 3 commits into
base: alpha
Choose a base branch
from
+19 −20
Open

Fix: Dim 1 not calculating properly #3057

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0a377f3
Fix: Dim 1 not calculating properly
heidthecamp Jun 5, 2026
ff2ec0e
Resolved several duplications of the same issue.
heidthecamp Jun 5, 2026
04ae6c7
Fix formatting of table in comments describing how DIMs work.
heidthecamp Jun 10, 2026
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
24 changes: 12 additions & 12 deletions tdishr/TdiMaxVal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ operateIloc(char *start, int testit(const char *, const char *), args_t *a)
int ja, jb, jd;
char *pid, *pib, *pia;
char *pmd, *pmb, *pma;
for (ja = 0; pia = a->inp, pma = a->maskp, ja < a->cnt_aft;
for (ja = 0, pia = a->inp, pma = a->maskp; ja < a->cnt_aft;
ja++, pia += a->stp_aft, pma += a->stpm_aft)
{ // LOOP_AFTER
for (jb = 0, pib = pia, pmb = pma; jb++ < a->cnt_bef;
Expand Down Expand Up @@ -317,7 +317,7 @@ static inline void OperateFloc(char dtype, double start,
int ja, jb, jd;
char *pid, *pib, *pia;
char *pmd, *pmb, *pma;
for (ja = 0; pia = a->inp, pma = a->maskp, ja < a->cnt_aft;
for (ja = 0, pia = a->inp, pma = a->maskp; ja < a->cnt_aft;
ja++, pia += a->stp_aft, pma += a->stpm_aft)
{ // LOOP_AFTER
for (jb = 0, pib = pia, pmb = pma; jb++ < a->cnt_bef;
Expand Down Expand Up @@ -351,7 +351,7 @@ static inline void OperateTloc(int testit(), args_t *a)
int ja, jb, jd;
char *pid, *pib, *pia;
char *pmd, *pmb, *pma;
for (ja = 0; pia = a->inp, pma = a->maskp, ja < a->cnt_aft;
for (ja = 0, pia = a->inp, pma = a->maskp; ja < a->cnt_aft;
ja++, pia += a->stp_aft, pma += a->stpm_aft)
{ // LOOP_AFTER
for (jb = 0, pib = pia, pmb = pma; jb++ < a->cnt_bef;
Expand Down Expand Up @@ -538,7 +538,7 @@ operateIval(char *start, int testit(const char *, const char *), args_t *a)
int ja, jb, jd;
char *pid, *pib, *pia;
char *pmd, *pmb, *pma;
for (ja = 0; pia = a->inp, pma = a->maskp, ja < a->cnt_aft;
for (ja = 0, pia = a->inp, pma = a->maskp; ja < a->cnt_aft;
ja++, pia += a->stp_aft, pma += a->stpm_aft)
{ // LOOP_AFTER
for (jb = 0, pib = pia, pmb = pma; jb < a->cnt_bef; jb++, pib += a->stp_bef,
Expand Down Expand Up @@ -569,7 +569,7 @@ static inline void OperateFval(char dtype, double start,
int ja, jb, jd;
char *pid, *pib, *pia;
char *pmd, *pmb, *pma;
for (ja = 0; pia = a->inp, pma = a->maskp, ja < a->cnt_aft;
for (ja = 0, pia = a->inp, pma = a->maskp; ja < a->cnt_aft;
ja++, pia += a->stp_aft, pma += a->stpm_aft)
{ // LOOP_AFTER
for (jb = 0, pib = pia, pmb = pma; jb < a->cnt_bef; jb++, pib += a->stp_bef,
Expand Down Expand Up @@ -601,7 +601,7 @@ static inline void OperateTval(int testit(), args_t *a)
int ja, jb, jd;
char *pid, *pib, *pia;
char *pmd, *pmb, *pma;
for (ja = 0; pia = a->inp, pma = a->maskp, ja < a->cnt_aft;
for (ja = 0, pia = a->inp, pma = a->maskp; ja < a->cnt_aft;
ja++, pia += a->stp_aft, pma += a->stpm_aft)
{ // LOOP_AFTER
for (jb = 0, pib = pia, pmb = pma; jb < a->cnt_bef; jb++, pib += a->stp_bef,
Expand Down Expand Up @@ -757,7 +757,7 @@ static inline void OperateImean(size_t buflen,
char *pid, *pib, *pia;
char *pmd, *pmb, *pma;
char *buf = malloc(buflen);
for (ja = 0; pia = a->inp, pma = a->maskp, ja < a->cnt_aft;
for (ja = 0, pia = a->inp, pma = a->maskp; ja < a->cnt_aft;
ja++, pia += a->stp_aft, pma += a->stpm_aft)
{ // LOOP_AFTER
for (jb = 0, pib = pia, pmb = pma; jb < a->cnt_bef; jb++, pib += a->stp_bef,
Expand Down Expand Up @@ -788,7 +788,7 @@ static inline void OperateFmean(char dtype, args_t *a)
int ja, jb, jd;
char *pid, *pib, *pia;
char *pmd, *pmb, *pma;
for (ja = 0; pia = a->inp, pma = a->maskp, ja < a->cnt_aft;
for (ja = 0, pia = a->inp, pma = a->maskp; ja < a->cnt_aft;
ja++, pia += a->stp_aft, pma += a->stpm_aft)
{ // LOOP_AFTER
for (jb = 0, pib = pia, pmb = pma; jb < a->cnt_bef; jb++, pib += a->stp_bef,
Expand Down Expand Up @@ -826,7 +826,7 @@ static inline void OperateCmean(char dtype, args_t *a)
int ja, jb, jd;
char *pid, *pib, *pia;
char *pmd, *pmb, *pma;
for (ja = 0; pia = a->inp, pma = a->maskp, ja < a->cnt_aft;
for (ja = 0, pia = a->inp, pma = a->maskp; ja < a->cnt_aft;
ja++, pia += a->stp_aft, pma += a->stpm_aft)
{ // LOOP_AFTER
for (jb = 0, pib = pia, pmb = pma; jb < a->cnt_bef; jb++, pib += a->stp_bef,
Expand Down Expand Up @@ -948,7 +948,7 @@ static inline void OperateIfun(char init,
int ja, jb, jd;
char *pid, *pib, *pia;
char *pmd, *pmb, *pma;
for (ja = 0; pia = a->inp, pma = a->maskp, ja < a->cnt_aft;
for (ja = 0, pia = a->inp, pma = a->maskp; ja < a->cnt_aft;
ja++, pia += a->stp_aft, pma += a->stpm_aft)
{ // LOOP_AFTER
for (jb = 0, pib = pia, pmb = pma; jb < a->cnt_bef; jb++, pib += a->stp_bef,
Expand All @@ -973,7 +973,7 @@ static inline void OperateFfun(double init, char dtype,
int ja, jb, jd;
char *pid, *pib, *pia;
char *pmd, *pmb, *pma;
for (ja = 0; pia = a->inp, pma = a->maskp, ja < a->cnt_aft;
for (ja = 0, pia = a->inp, pma = a->maskp; ja < a->cnt_aft;
ja++, pia += a->stp_aft, pma += a->stpm_aft)
{ // LOOP_AFTER
for (jb = 0, pib = pia, pmb = pma; jb < a->cnt_bef; jb++, pib += a->stp_bef,
Expand Down Expand Up @@ -1010,7 +1010,7 @@ static inline void OperateCfun(double init, char dtype,
int ja, jb, jd;
char *pid, *pib, *pia;
char *pmd, *pmb, *pma;
for (ja = 0; pia = a->inp, pma = a->maskp, ja < a->cnt_aft;
for (ja = 0, pia = a->inp, pma = a->maskp; ja < a->cnt_aft;
ja++, pia += a->stp_aft, pma += a->stpm_aft)
{ // LOOP_AFTER
for (jb = 0, pib = pia, pmb = pma; jb < a->cnt_bef; jb++, pib += a->stp_bef,
Expand Down
15 changes: 7 additions & 8 deletions tdishr/TdiTrans.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
vector offsets from first element.

For logical array V[3,4,5], steps in unit sizes:
loop count @step no DIM DIM=0 optim DIM=1 DIM=2
outer aft 1 @xx 20 @3 1 @xx 5 @12 1 @60 DIM
dimension and number of results middle bef 1 @1 1 @3 20 @3
3 @1 12 @1 product of dims after DIM inner dim 60 @1 3
@1 3 @1 4 @3 5 @12 product of dims before DIM Example, ALL(V,0)
chooses elements: [0,1,2] [3,4,5] ... Example, ALL(V,1) chooses elements:
[0,3,6,9] [1,4,7,10] [2,5,8,11] / [12,15,18,21] ... Example, ALL(V,2) chooses
elements: [0,12,24,36,48] [1,13...], ... [11,...]
loop | count @step | no DIM | DIM=0 | optim | DIM=1 | DIM=2 |
outer | aft | 1 @xx | 20 @3 | 1 @xx | 5 @12 | 1 @60 | DIM dimension and number of results
middle | bef | 1 @1 | 1 @3 | 20 @3 | 3 @1 | 12 @1 | product of dims after DIM
inner | dim | 60 @1 | 3 @1 | 3 @1 | 4 @3 | 5 @12 | product of dims before DIM
Example, ALL(V,0) chooses elements: [0,1,2] [3,4,5] ...
Example, ALL(V,1) chooses elements: [0,3,6,9] [1,4,7,10] [2,5,8,11] / [12,15,18,21] ...
Example, ALL(V,2) chooses elements: [0,12,24,36,48] [1,13...], ... [11,...]

Ken Klare, LANL P-4 (c)1989,1990,1991
NEED units for DERIVATIVE INTEGRAL.
Expand Down