Menu
▾
▴
[Teem-commit] SF.net SVN: teem:[7377] teem/trunk/src
|
From: <kin...@us...> - 2025-09-09 15:18:10
|
Revision: 7377
http://sourceforge.net/p/teem/code/7377
Author: kindlmann
Date: 2025-09-09 15:18:04 +0000 (Tue, 09 Sep 2025)
Log Message:
-----------
API CHANGE: fixing something (for TeemV2) that has long needed fixing: NrrdKernel->numParm now renamed parmNum to be consistent with naming conventions elsewhere in Teem
Modified Paths:
--------------
teem/trunk/src/TODO.txt
teem/trunk/src/bin/qbert.c
teem/trunk/src/gage/ctx.c
teem/trunk/src/meet/meetNrrd.c
teem/trunk/src/nrrd/kernel.c
teem/trunk/src/nrrd/methodsNrrd.c
teem/trunk/src/nrrd/nrrd.h
teem/trunk/src/nrrd/resampleContext.c
teem/trunk/src/nrrd/resampleNrrd.c
Modified: teem/trunk/src/TODO.txt
===================================================================
--- teem/trunk/src/TODO.txt 2025-09-09 14:43:50 UTC (rev 7376)
+++ teem/trunk/src/TODO.txt 2025-09-09 15:18:04 UTC (rev 7377)
@@ -144,7 +144,6 @@
- add fields for "if I don't interpolate, what's my approximate inverse?"
- add statement of accuracy (in a Taylor series sense)
- add: am I an odd or even function
-******* - rename numParm --> parmNum
******* - fix the kernels that meetNrrdKernelAllCheck revealed to be broken
* with NrrdFormat:
- There is now an available() method, but this is incomplete - EPS is
Modified: teem/trunk/src/bin/qbert.c
===================================================================
--- teem/trunk/src/bin/qbert.c 2025-09-09 14:43:50 UTC (rev 7376)
+++ teem/trunk/src/bin/qbert.c 2025-09-09 15:18:04 UTC (rev 7377)
@@ -54,7 +54,7 @@
fprintf(stderr, "%d --> %s resample\n", need, need ? "WILL" : "won't");
if (need) {
rsi->kernel[i] = uk->kernel;
- memcpy(rsi->parm[i], uk->parm, uk->kernel->numParm * sizeof(double));
+ memcpy(rsi->parm[i], uk->parm, uk->kernel->parmNum * sizeof(double));
if (!AIR_EXISTS(nin->axis[i].min)) {
nin->axis[i].min = 0.0;
}
@@ -144,7 +144,7 @@
char stmp1[AIR_STRLEN_SMALL + 1], stmp2[AIR_STRLEN_SMALL + 1];
need = 1;
rsi->kernel[i] = dk->kernel;
- memcpy(rsi->parm[i], dk->parm, dk->kernel->numParm * sizeof(double));
+ memcpy(rsi->parm[i], dk->parm, dk->kernel->parmNum * sizeof(double));
rsi->samples[i] = sz[i];
if (!AIR_EXISTS(nin->axis[i].min)) {
nin->axis[i].min = 0.0;
Modified: teem/trunk/src/gage/ctx.c
===================================================================
--- teem/trunk/src/gage/ctx.c 2025-09-09 14:43:50 UTC (rev 7376)
+++ teem/trunk/src/gage/ctx.c 2025-09-09 15:18:04 UTC (rev 7377)
@@ -196,7 +196,7 @@
int /* Biff: 1 */
gageKernelSet(gageContext *ctx, int which, const NrrdKernel *k, const double *kparm) {
static const char me[] = "gageKernelSet";
- int numParm;
+ int parmNum;
double support, integral;
if (!(ctx && k && kparm)) {
@@ -211,9 +211,9 @@
if (ctx->verbose) {
fprintf(stderr, "%s: which = %d -> %s\n", me, which, airEnumStr(gageKernel, which));
}
- numParm = k->numParm;
- if (!(AIR_IN_CL(0, numParm, NRRD_KERNEL_PARMS_NUM))) {
- biffAddf(GAGE, "%s: kernel's numParm (%d) not in range [%d,%d]", me, numParm, 0,
+ parmNum = k->parmNum;
+ if (!(AIR_IN_CL(0, parmNum, NRRD_KERNEL_PARMS_NUM))) {
+ biffAddf(GAGE, "%s: kernel's parmNum (%d) not in range [%d,%d]", me, parmNum, 0,
NRRD_KERNEL_PARMS_NUM);
return 1;
}
Modified: teem/trunk/src/meet/meetNrrd.c
===================================================================
--- teem/trunk/src/meet/meetNrrd.c 2025-09-09 14:43:50 UTC (rev 7376)
+++ teem/trunk/src/meet/meetNrrd.c 2025-09-09 15:18:04 UTC (rev 7377)
@@ -273,7 +273,7 @@
}
kj++;
}
- pnum = kk->numParm;
+ pnum = kk->parmNum;
EE = 0;
/* the second argument to CHECK is how much to scale up the
permissible error in kernel evaluations (between float and double)
Modified: teem/trunk/src/nrrd/kernel.c
===================================================================
--- teem/trunk/src/nrrd/kernel.c 2025-09-09 14:43:50 UTC (rev 7376)
+++ teem/trunk/src/nrrd/kernel.c 2025-09-09 15:18:04 UTC (rev 7377)
@@ -26,7 +26,7 @@
** has to be updated to record which kernels (including their derivatives)
** use parm[0] for scale.
- numParm parm[0] parm[1] parm[2]
+ parmNum parm[0] parm[1] parm[2]
nrrdKernelZero 1 scale
nrrdKernelCheap 1 scale
nrrdKernelBox 1 scale
@@ -3128,9 +3128,9 @@
airMopError(mop);
return 1;
}
- if ((*kernelP)->numParm > NRRD_KERNEL_PARMS_NUM) {
+ if ((*kernelP)->parmNum > NRRD_KERNEL_PARMS_NUM) {
biffAddf(NRRD, "%s: kernel \"%s\" requests %d parameters > max %d", me, kstr,
- (*kernelP)->numParm, NRRD_KERNEL_PARMS_NUM);
+ (*kernelP)->parmNum, NRRD_KERNEL_PARMS_NUM);
airMopError(mop);
return 1;
}
@@ -3142,12 +3142,12 @@
|| *kernelP == nrrdKernelCos4SupportDebugDD
|| *kernelP == nrrdKernelCos4SupportDebugDDD) {
/* for these kernels, we need all the parameters given explicitly */
- needParm = (*kernelP)->numParm;
+ needParm = (*kernelP)->parmNum;
} else {
/* For everything else (note that TMF kernels are handled
separately), we can make do with one less than the required,
by using the default spacing */
- needParm = ((*kernelP)->numParm > 0 ? (*kernelP)->numParm - 1 : 0);
+ needParm = ((*kernelP)->parmNum > 0 ? (*kernelP)->parmNum - 1 : 0);
}
if (needParm > 0 && !pstr) {
biffAddf(NRRD,
@@ -3157,7 +3157,7 @@
airMopError(mop);
return 1;
}
- for (haveParm = 0; haveParm < (*kernelP)->numParm; haveParm++) {
+ for (haveParm = 0; haveParm < (*kernelP)->parmNum; haveParm++) {
if (!pstr) break;
if (1 != airSingleSscanf(pstr, "%lg", parm + haveParm)) {
biffAddf(NRRD, "%s: trouble parsing \"%s\" as double (in \"%s\")", me, _pstr,
@@ -3183,7 +3183,7 @@
me, haveParm, needParm, _pstr, _str);
airMopError(mop);
return 1;
- } else if (haveParm == needParm && needParm == (*kernelP)->numParm - 1) {
+ } else if (haveParm == needParm && needParm == (*kernelP)->parmNum - 1) {
/* shift up parsed values, and set parm[0] to default */
for (jj = haveParm; jj >= 1; jj--) {
parm[jj] = parm[jj - 1];
@@ -3192,7 +3192,7 @@
} else {
if (pstr) {
biffAddf(NRRD, "%s: \"%s\" (in \"%s\") has more than %d doubles", me, _pstr,
- _str, (*kernelP)->numParm);
+ _str, (*kernelP)->parmNum);
airMopError(mop);
return 1;
}
@@ -3268,9 +3268,9 @@
}
} else {
strcpy(str, ksp->kernel->name);
- if (ksp->kernel->numParm) {
+ if (ksp->kernel->parmNum) {
unsigned int pi;
- for (pi = 0; pi < ksp->kernel->numParm; pi++) {
+ for (pi = 0; pi < ksp->kernel->parmNum; pi++) {
sprintf(stmp, "%c%.17g", (!pi ? ':' : ','), ksp->parm[pi]);
if (strlen(str) + strlen(stmp) > warnLen) {
biffAddf(NRRD, "%s: kernel parm %u could overflow", me, pi);
@@ -3320,7 +3320,7 @@
}
return 0;
}
- pnum = kernA->numParm;
+ pnum = kernA->parmNum;
if (!pnum) {
/* actually, we're done: no parms and kernels are equal */
*differ = 0;
Modified: teem/trunk/src/nrrd/methodsNrrd.c
===================================================================
--- teem/trunk/src/nrrd/methodsNrrd.c 2025-09-09 14:43:50 UTC (rev 7376)
+++ teem/trunk/src/nrrd/methodsNrrd.c 2025-09-09 15:18:04 UTC (rev 7377)
@@ -426,7 +426,7 @@
if (ksp && k && kparm) {
ksp->kernel = k;
- for (p = 0; p < (k->numParm); p++) {
+ for (p = 0; p < (k->parmNum); p++) {
ksp->parm[p] = kparm[p];
}
}
Modified: teem/trunk/src/nrrd/nrrd.h
===================================================================
--- teem/trunk/src/nrrd/nrrd.h 2025-09-09 14:43:50 UTC (rev 7376)
+++ teem/trunk/src/nrrd/nrrd.h 2025-09-09 15:18:04 UTC (rev 7377)
@@ -512,7 +512,7 @@
char name[AIR_STRLEN_SMALL + 1];
/* number of parameters needed (# elements in parm[] used) */
- unsigned int numParm; /* HEY: should be "parmNum" in standard convention */
+ unsigned int parmNum;
/* smallest x (x > 0) such that k(y) = 0 for all y > x, y < -x */
double (*support)(const double *parm);
Modified: teem/trunk/src/nrrd/resampleContext.c
===================================================================
--- teem/trunk/src/nrrd/resampleContext.c 2025-09-09 14:43:50 UTC (rev 7376)
+++ teem/trunk/src/nrrd/resampleContext.c 2025-09-09 15:18:04 UTC (rev 7377)
@@ -284,7 +284,7 @@
rsmc->axis[axIdx].kernel = kernel;
if (kernel) {
- for (kpIdx = 0; kpIdx < kernel->numParm; kpIdx++) {
+ for (kpIdx = 0; kpIdx < kernel->parmNum; kpIdx++) {
rsmc->axis[axIdx].kparm[kpIdx] = kparm[kpIdx];
}
if (rsmc->verbose) {
@@ -626,7 +626,7 @@
biffAddf(NRRD, "%s: don't have min, max set on axis %u", me, axIdx);
return 1;
}
- for (kpIdx = 0; kpIdx < axis->kernel->numParm; kpIdx++) {
+ for (kpIdx = 0; kpIdx < axis->kernel->parmNum; kpIdx++) {
if (!AIR_EXISTS(axis->kparm[kpIdx])) {
biffAddf(NRRD, "%s: didn't set kernel parm %u on axis %u", me, kpIdx, axIdx);
return 1;
@@ -794,7 +794,7 @@
nrrdKernelParm0IsScale(), we have to do what we probably should have been done
all along: simulating the kernel scaling by pre-processing the evaluation
locations and post-processing the kernel weights */
- if (0 == axis->kernel->numParm || !nrrdKernelParm0IsScale(axis->kernel)) {
+ if (0 == axis->kernel->parmNum || !nrrdKernelParm0IsScale(axis->kernel)) {
size_t nn, ii;
double ratio;
nn = dotLen * axis->samples;
Modified: teem/trunk/src/nrrd/resampleNrrd.c
===================================================================
--- teem/trunk/src/nrrd/resampleNrrd.c 2025-09-09 14:43:50 UTC (rev 7376)
+++ teem/trunk/src/nrrd/resampleNrrd.c 2025-09-09 15:18:04 UTC (rev 7377)
@@ -62,7 +62,7 @@
return 1;
}
- np = kernel->numParm;
+ np = kernel->parmNum;
for (ai = 0; ai < nin->dim; ai++) {
double axmin, axmax;
info->kernel[ai] = kernel;
@@ -162,7 +162,7 @@
biffAddf(NRRD, "%s: info's axis %d min,max not both set", me, ai);
return 1;
}
- np = k->numParm;
+ np = k->parmNum;
for (p = 0; p < np; p++) {
if (!AIR_EXISTS(info->parm[ai][p])) {
biffAddf(NRRD, "%s: didn't set parameter %d (of %d) for axis %d\n", me, p, np,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
