Menu
▾
▴
teem-commit — gets email notification of all Teem svn commits
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(19) |
Nov
(45) |
Dec
(80) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(58) |
Feb
(127) |
Mar
(74) |
Apr
(34) |
May
(117) |
Jun
(14) |
Jul
(26) |
Aug
(13) |
Sep
(1) |
Oct
(38) |
Nov
(13) |
Dec
(5) |
| 2005 |
Jan
(108) |
Feb
(134) |
Mar
(54) |
Apr
(133) |
May
(16) |
Jun
(54) |
Jul
(128) |
Aug
(99) |
Sep
(157) |
Oct
(182) |
Nov
(236) |
Dec
(212) |
| 2006 |
Jan
(86) |
Feb
(76) |
Mar
(121) |
Apr
(27) |
May
(7) |
Jun
(1) |
Jul
(6) |
Aug
(28) |
Sep
(1) |
Oct
(27) |
Nov
(5) |
Dec
|
| 2007 |
Jan
(32) |
Feb
(22) |
Mar
(22) |
Apr
(11) |
May
(3) |
Jun
(12) |
Jul
(11) |
Aug
(9) |
Sep
(37) |
Oct
(4) |
Nov
(9) |
Dec
(51) |
| 2008 |
Jan
(7) |
Feb
(31) |
Mar
(46) |
Apr
(31) |
May
(5) |
Jun
(27) |
Jul
(12) |
Aug
(5) |
Sep
(13) |
Oct
(24) |
Nov
(112) |
Dec
(15) |
| 2009 |
Jan
(6) |
Feb
(103) |
Mar
(66) |
Apr
(9) |
May
(8) |
Jun
(1) |
Jul
(20) |
Aug
(9) |
Sep
(2) |
Oct
(81) |
Nov
(88) |
Dec
(30) |
| 2010 |
Jan
(65) |
Feb
(57) |
Mar
(22) |
Apr
(12) |
May
(4) |
Jun
(12) |
Jul
(43) |
Aug
(6) |
Sep
(6) |
Oct
(4) |
Nov
(6) |
Dec
(3) |
| 2011 |
Jan
(10) |
Feb
(27) |
Mar
(11) |
Apr
(9) |
May
(69) |
Jun
(73) |
Jul
(67) |
Aug
(116) |
Sep
(40) |
Oct
(11) |
Nov
(34) |
Dec
(19) |
| 2012 |
Jan
|
Feb
(4) |
Mar
(28) |
Apr
(18) |
May
(9) |
Jun
(7) |
Jul
(4) |
Aug
(155) |
Sep
(264) |
Oct
(172) |
Nov
(15) |
Dec
(40) |
| 2013 |
Jan
(1) |
Feb
(2) |
Mar
|
Apr
|
May
|
Jun
(20) |
Jul
(76) |
Aug
(67) |
Sep
(49) |
Oct
(27) |
Nov
(3) |
Dec
(3) |
| 2014 |
Jan
(7) |
Feb
(7) |
Mar
(16) |
Apr
|
May
(4) |
Jun
(1) |
Jul
(18) |
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2015 |
Jan
(6) |
Feb
(5) |
Mar
(3) |
Apr
(23) |
May
(5) |
Jun
|
Jul
(2) |
Aug
(4) |
Sep
|
Oct
|
Nov
(2) |
Dec
(4) |
| 2016 |
Jan
(2) |
Feb
(7) |
Mar
(2) |
Apr
(1) |
May
(14) |
Jun
(3) |
Jul
|
Aug
(3) |
Sep
|
Oct
|
Nov
(1) |
Dec
(3) |
| 2017 |
Jan
(6) |
Feb
|
Mar
(3) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(12) |
Sep
(6) |
Oct
|
Nov
(3) |
Dec
|
| 2018 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
(8) |
Sep
|
Oct
|
Nov
|
Dec
(1) |
| 2019 |
Jan
|
Feb
|
Mar
(4) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(3) |
Sep
(8) |
Oct
|
Nov
(2) |
Dec
(25) |
| 2020 |
Jan
|
Feb
(3) |
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
(3) |
Oct
(53) |
Nov
(33) |
Dec
|
| 2021 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
|
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(4) |
Dec
(5) |
| 2022 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
(5) |
Jul
(93) |
Aug
(206) |
Sep
(39) |
Oct
(19) |
Nov
(11) |
Dec
|
| 2023 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(2) |
Jun
(150) |
Jul
(124) |
Aug
(14) |
Sep
(5) |
Oct
|
Nov
(1) |
Dec
|
| 2024 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(12) |
Jul
(62) |
Aug
|
Sep
(7) |
Oct
|
Nov
(7) |
Dec
|
| 2025 |
Jan
|
Feb
|
Mar
|
Apr
(14) |
May
(3) |
Jun
|
Jul
|
Aug
(76) |
Sep
(214) |
Oct
(6) |
Nov
|
Dec
|
|
From: <kin...@us...> - 2023-07-22 04:12:34
|
Revision: 7136
http://sourceforge.net/p/teem/code/7136
Author: kindlmann
Date: 2023-07-22 03:55:59 +0000 (Sat, 22 Jul 2023)
Log Message:
-----------
API CHANGE: adding another field to seekContext, to record the average (world-space) gradient magnitude, over the vertices in an isosurface (when there isn't a gageContext), with the hope that it is useful for some signed distance field computations. Also noting that Thomas Schultz commited some work to this file (other files in seek have a similar copyright attribution)
Modified Paths:
--------------
teem/trunk/src/seek/extract.c
Modified: teem/trunk/src/seek/extract.c
===================================================================
--- teem/trunk/src/seek/extract.c 2023-07-22 03:51:29 UTC (rev 7135)
+++ teem/trunk/src/seek/extract.c 2023-07-22 03:55:59 UTC (rev 7136)
@@ -1,6 +1,7 @@
/*
Teem: Tools to process and visualize scientific data and images
Copyright (C) 2009--2023 University of Chicago
+ Copyright (C) 2009, 2011 Thomas Schultz
Copyright (C) 2005--2008 Gordon Kindlmann
Copyright (C) 1998--2004 University of Utah
@@ -825,6 +826,9 @@
if (sctx->normAns) {
gageProbe(sctx->gctx, tvertB[0], tvertB[1], tvertB[2]);
ELL_3V_SCALE_TT(lpld->norm + 3 * ovi, float, -1, sctx->normAns);
+ /* alas we can't increment sctx->gradMagAvg here because we only have the
+ * already-normalized normal, and updateSeek.c/updateAnswerPointers()
+ * actually prevents us from setting a gradAns if we wanted to */
if (sctx->reverse) {
ELL_3V_SCALE(lpld->norm + 3 * ovi, -1, lpld->norm + 3 * ovi);
}
@@ -832,6 +836,7 @@
ELL_3V_LERP(grad, ww, vgrad[vi0], vgrad[vi1]);
ELL_3MV_MUL(tvec, sctx->txfNormal, grad);
ELL_3V_NORM_TT(lpld->norm + 3 * ovi, float, tvec, tlen);
+ sctx->gradMagAvg += tlen;
}
}
sctx->vertNum++;
@@ -889,6 +894,9 @@
return 1;
}
+ sctx->gradMagAvg = 0; /* initalize per-vert accumulator, even though it will be
+ incremented in a narrow range of circumstances (such as:
+ isocontours without a gageContext) */
if (sctx->verbose > 2) {
fprintf(stderr, "%s: extracting ... ", me);
}
@@ -913,6 +921,9 @@
if (sctx->verbose > 2) {
fprintf(stderr, "%s\n", airDoneStr(0, zi, sz - 2, done));
}
+ if (sctx->vertNum) {
+ sctx->gradMagAvg /= sctx->vertNum;
+ }
/* this cleans up the airArrays in bag */
baggageNix(bag);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kin...@us...> - 2023-07-22 03:51:31
|
Revision: 7135
http://sourceforge.net/p/teem/code/7135
Author: kindlmann
Date: 2023-07-22 03:51:29 +0000 (Sat, 22 Jul 2023)
Log Message:
-----------
fixing some warnings
Modified Paths:
--------------
teem/trunk/src/seek/test/trv.c
Modified: teem/trunk/src/seek/test/trv.c
===================================================================
--- teem/trunk/src/seek/test/trv.c 2023-07-20 22:50:48 UTC (rev 7134)
+++ teem/trunk/src/seek/test/trv.c 2023-07-22 03:51:29 UTC (rev 7135)
@@ -24,15 +24,17 @@
char *info = ("test crease surface extraction.");
int
-probeParseKind(void *ptr, char *str, char err[AIR_STRLEN_HUGE + 1]) {
+probeParseKind(void *ptr, const char *_str, char err[AIR_STRLEN_HUGE + 1]) {
char me[] = "probeParseKind";
gageKind **kindP;
+ char *str;
- if (!(ptr && str)) {
+ if (!(ptr && _str)) {
sprintf(err, "%s: got NULL pointer", me);
return 1;
}
kindP = (gageKind **)ptr;
+ str = airStrdup(_str);
airToLower(str);
if (!strcmp(gageKindScl->name, str)) {
*kindP = gageKindScl;
@@ -40,9 +42,10 @@
*kindP = gageKindVec;
} else {
sprintf(err, "%s: not \"%s\" or \"%s\"", me, gageKindScl->name, gageKindVec->name);
+ free(str);
return 1;
}
-
+ free(str);
return 0;
}
@@ -52,6 +55,7 @@
if (ptr) {
kind = AIR_CAST(gageKind *, ptr);
+ AIR_UNUSED(kind);
}
return NULL;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kin...@us...> - 2023-07-20 22:50:51
|
Revision: 7134
http://sourceforge.net/p/teem/code/7134
Author: kindlmann
Date: 2023-07-20 22:50:48 +0000 (Thu, 20 Jul 2023)
Log Message:
-----------
removing errant slash
Modified Paths:
--------------
teem/trunk/src/unrrdu/grid.c
Modified: teem/trunk/src/unrrdu/grid.c
===================================================================
--- teem/trunk/src/unrrdu/grid.c 2023-07-19 22:57:47 UTC (rev 7133)
+++ teem/trunk/src/unrrdu/grid.c 2023-07-20 22:50:48 UTC (rev 7134)
@@ -173,7 +173,7 @@
airMopAdd(mop, opt, (airMopper)hestParseFree, airMopAlways);
if (!strcmp("-", inS) && isatty(STDIN_FILENO)) {
- fprintf(stderr, "%s: declining to try reading Nrrd from stdin as tty (terminal)\n/",
+ fprintf(stderr, "%s: declining to try reading Nrrd from stdin as tty (terminal)\n",
me);
hestUsage(stderr, opt, me, hparm);
fprintf(stderr, "\nFor more info: \"%s --help\"\n", me);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kin...@us...> - 2023-07-19 22:57:48
|
Revision: 7133
http://sourceforge.net/p/teem/code/7133
Author: kindlmann
Date: 2023-07-19 22:57:47 +0000 (Wed, 19 Jul 2023)
Log Message:
-----------
re-ordering contents
Modified Paths:
--------------
teemdoc/trunk/html/img/graph/teem-graph-gen.py
Modified: teemdoc/trunk/html/img/graph/teem-graph-gen.py
===================================================================
--- teemdoc/trunk/html/img/graph/teem-graph-gen.py 2023-07-19 18:13:25 UTC (rev 7132)
+++ teemdoc/trunk/html/img/graph/teem-graph-gen.py 2023-07-19 22:57:47 UTC (rev 7133)
@@ -3,6 +3,21 @@
import os
import sys
+
+def readlines(fname):
+ with open(fname) as ff:
+ lines = ff.readlines()
+ return lines
+
+
+# teem-graph.dot is manually maintained as original dependency graph,
+# which is then reduced via:
+# tred teem-graph.dot > teem-rgraph.dot
+# rgraph is read; first and last lines are dropped
+origlines = readlines('teem-rgraph.dot')[1:-1]
+outname = 'teem-rgraph'
+
+
header = """digraph G {
concentrate=true;
remincross=true;
@@ -26,20 +41,6 @@
tailer = """ } """
-def readlines(fname):
- ff = open(fname)
- lines = ff.readlines()
- ff.close()
- return lines
-
-
-# teem-graph.dot is manually maintained as original dependency graph,
-# which is then reduced via:
-# tred teem-graph.dot > teem-rgraph.dot
-# rgraph is read; first and last lines are dropped
-origlines = readlines('teem-rgraph.dot')[1:-1]
-outname = 'teem-rgraph'
-
# this may actually not be reproducible ...
sidx = 0
minidx = sidx
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kin...@us...> - 2023-07-19 18:13:27
|
Revision: 7132
http://sourceforge.net/p/teem/code/7132
Author: kindlmann
Date: 2023-07-19 18:13:25 +0000 (Wed, 19 Jul 2023)
Log Message:
-----------
limn does not depend on gage
Modified Paths:
--------------
teemdoc/trunk/html/img/graph/teem-graph.dot
teemdoc/trunk/html/img/graph/teem-rgraph.dot
Modified: teemdoc/trunk/html/img/graph/teem-graph.dot
===================================================================
--- teemdoc/trunk/html/img/graph/teem-graph.dot 2023-07-19 18:12:29 UTC (rev 7131)
+++ teemdoc/trunk/html/img/graph/teem-graph.dot 2023-07-19 18:13:25 UTC (rev 7132)
@@ -36,7 +36,6 @@
bane -> nrrd;
bane -> biff;
bane -> air;
- limn -> gage;
limn -> ell;
limn -> unrrdu;
limn -> nrrd;
Modified: teemdoc/trunk/html/img/graph/teem-rgraph.dot
===================================================================
--- teemdoc/trunk/html/img/graph/teem-rgraph.dot 2023-07-19 18:12:29 UTC (rev 7131)
+++ teemdoc/trunk/html/img/graph/teem-rgraph.dot 2023-07-19 18:13:25 UTC (rev 7132)
@@ -13,10 +13,11 @@
bane -> unrrdu;
bane -> gage;
limn -> unrrdu;
- limn -> gage;
echo -> limn;
hoover -> limn;
+ seek -> gage;
seek -> limn;
+ ten -> gage;
ten -> echo;
elf -> tijk;
elf -> ten;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kin...@us...> - 2023-07-19 18:12:32
|
Revision: 7131
http://sourceforge.net/p/teem/code/7131
Author: kindlmann
Date: 2023-07-19 18:12:29 +0000 (Wed, 19 Jul 2023)
Log Message:
-----------
no, limn does not depend on gage
Modified Paths:
--------------
teem/trunk/src/limn/GNUmakefile
teem/trunk/src/limn/limn.h
Modified: teem/trunk/src/limn/GNUmakefile
===================================================================
--- teem/trunk/src/limn/GNUmakefile 2023-07-19 18:04:20 UTC (rev 7130)
+++ teem/trunk/src/limn/GNUmakefile 2023-07-19 18:12:29 UTC (rev 7131)
@@ -44,7 +44,7 @@
#### Describe library here
####
####
-$(L).NEED = gage ell unrrdu nrrd biff hest air
+$(L).NEED = ell unrrdu nrrd biff hest air
$(L).PUBLIC_HEADERS = limn.h
$(L).PRIVATE_HEADERS = privateLimn.h
$(L).OBJS = defaultsLimn.o qn.o light.o envmap.o cam.o methodsLimn.o \
Modified: teem/trunk/src/limn/limn.h
===================================================================
--- teem/trunk/src/limn/limn.h 2023-07-19 18:04:20 UTC (rev 7130)
+++ teem/trunk/src/limn/limn.h 2023-07-19 18:12:29 UTC (rev 7131)
@@ -31,7 +31,6 @@
#include <teem/hest.h>
#include <teem/ell.h>
#include <teem/nrrd.h>
-#include <teem/gage.h>
#include <teem/unrrdu.h>
#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(TEEM_STATIC)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kin...@us...> - 2023-07-19 18:04:22
|
Revision: 7130
http://sourceforge.net/p/teem/code/7130
Author: kindlmann
Date: 2023-07-19 18:04:20 +0000 (Wed, 19 Jul 2023)
Log Message:
-----------
tweaks
Modified Paths:
--------------
teemdoc/trunk/html/img/graph/teem-graph-gen.py
Modified: teemdoc/trunk/html/img/graph/teem-graph-gen.py
===================================================================
--- teemdoc/trunk/html/img/graph/teem-graph-gen.py 2023-07-19 18:03:42 UTC (rev 7129)
+++ teemdoc/trunk/html/img/graph/teem-graph-gen.py 2023-07-19 18:04:20 UTC (rev 7130)
@@ -6,23 +6,21 @@
header = """digraph G {
concentrate=true;
remincross=true;
- searchsize=30000;
rankdir="BT";
- edge [
- arrowhead="vee";
- ]
+ ranksep=0.5;
+ node [ fontname=Courier, fontsize=16 ];
+ edge [ arrowhead="vee" ];
+ { rank = same; gage; dye; alan; tijk }
+ { rank = same; seek; hoover; echo }
"""
-# { rank = same; unrrdu; ell }
-# { rank = same; moss; gage; dye; alan; tijk }
-# { rank = same; limn; bane }
-# { rank = same; seek; hoover; echo }
-# { rank = same; mite; push; coil; pull }
-# ranksep=0.5;
-# mclimit=0.1;
+# searchsize=30000; # doesn't seem to make a difference at least on rgraph
+# { rank = same; unrrdu; ell } NO not anymore, with "unu ilk"
+# { rank = same; limn; bane } (found anyway)
+# { rank = same; mite; push; coil; pull } (found anyway)
-# needed for the tred graph
+# mclimit=0.1;
tailer = """ } """
@@ -35,12 +33,13 @@
return lines
-# print header;
-# print tailer;
+# teem-graph.dot is manually maintained as original dependency graph,
+# which is then reduced via:
+# tred teem-graph.dot > teem-rgraph.dot
+# rgraph is read; first and last lines are dropped
+origlines = readlines('teem-rgraph.dot')[1:-1]
+outname = 'teem-rgraph'
-origlines = readlines('teem-graph.data')
-outname = 'teem-graph'
-
# this may actually not be reproducible ...
sidx = 0
minidx = sidx
@@ -51,7 +50,7 @@
random.seed(sidx)
lines = origlines
random.shuffle(lines)
- f = open('tmp-info.dot', 'w')
+ f = open('tmp.dot', 'w')
print(f'// The info here was randomized w/ seed {sidx}', file=f)
print(header, file=f)
for l in lines:
@@ -58,15 +57,17 @@
print('%s' % l, file=f)
print(tailer, file=f)
f.close()
- res = subprocess.run('/usr/local/bin/dot tmp-info.dot -Tgif -o tmp-graph.gif'.split())
- sz = os.path.getsize('tmp-graph.gif')
+ res = subprocess.run('/usr/local/bin/dot tmp.dot -Tgif -o tmp.gif'.split())
+ sz = os.path.getsize('tmp.gif')
if sz < minsz:
minidx = sidx
minsz = sz
- subprocess.run(f'mv tmp-info.dot {outname}-{sz}-{sidx}.dot'.split())
- subprocess.run(f'mv tmp-graph.gif {outname}-{sz}-{sidx}.gif'.split())
+ subprocess.run(f'mv tmp.dot {outname}-{sz}-{sidx}.dot'.split())
+ subprocess.run(f'mv tmp.gif {outname}-{sz}-{sidx}.gif'.split())
print(f'\n========== {sidx} -> {sz} (previously {minsz}); see {outname}-{sz}-{sidx}.gif')
else:
# print('(%d)' % sz)
pass
sidx = sidx + 1
+
+# clean up intermediate results: rm -f *-rgraph-*-*.{dot,gif} tmp.{dot,gif}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kin...@us...> - 2023-07-19 18:03:44
|
Revision: 7129
http://sourceforge.net/p/teem/code/7129
Author: kindlmann
Date: 2023-07-19 18:03:42 +0000 (Wed, 19 Jul 2023)
Log Message:
-----------
ten does not depend on dye
Modified Paths:
--------------
teemdoc/trunk/html/img/graph/teem-graph.dot
teemdoc/trunk/html/img/graph/teem-rgraph.dot
Modified: teemdoc/trunk/html/img/graph/teem-graph.dot
===================================================================
--- teemdoc/trunk/html/img/graph/teem-graph.dot 2023-07-19 17:33:03 UTC (rev 7128)
+++ teemdoc/trunk/html/img/graph/teem-graph.dot 2023-07-19 18:03:42 UTC (rev 7129)
@@ -1,5 +1,4 @@
-/* updated by GLK by hand July 2023 */
-digraph G {
+digraph G { /* updated by GLK by hand July 2023 */
hest -> air;
biff -> air;
nrrd -> biff;
@@ -63,7 +62,6 @@
seek -> air;
ten -> echo;
ten -> limn;
- ten -> dye;
ten -> gage;
ten -> unrrdu;
ten -> ell;
Modified: teemdoc/trunk/html/img/graph/teem-rgraph.dot
===================================================================
--- teemdoc/trunk/html/img/graph/teem-rgraph.dot 2023-07-19 17:33:03 UTC (rev 7128)
+++ teemdoc/trunk/html/img/graph/teem-rgraph.dot 2023-07-19 18:03:42 UTC (rev 7129)
@@ -17,7 +17,6 @@
echo -> limn;
hoover -> limn;
seek -> limn;
- ten -> dye;
ten -> echo;
elf -> tijk;
elf -> ten;
@@ -27,6 +26,7 @@
mite -> hoover;
mite -> ten;
meet -> alan;
+ meet -> dye;
meet -> bane;
meet -> seek;
meet -> elf;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kin...@us...> - 2023-07-19 17:33:05
|
Revision: 7128
http://sourceforge.net/p/teem/code/7128
Author: kindlmann
Date: 2023-07-19 17:33:03 +0000 (Wed, 19 Jul 2023)
Log Message:
-----------
weird: ten does not depend on dye
Modified Paths:
--------------
teem/trunk/src/ten/GNUmakefile
teem/trunk/src/ten/ten.h
Modified: teem/trunk/src/ten/GNUmakefile
===================================================================
--- teem/trunk/src/ten/GNUmakefile 2023-07-19 17:12:02 UTC (rev 7127)
+++ teem/trunk/src/ten/GNUmakefile 2023-07-19 17:33:03 UTC (rev 7128)
@@ -44,7 +44,7 @@
#### Describe library here
####
#### tendCalc.o nixed
-$(L).NEED = echo limn gage dye unrrdu ell nrrd biff air
+$(L).NEED = echo limn gage unrrdu ell nrrd biff air
$(L).PUBLIC_HEADERS = ten.h tenMacros.h
$(L).PRIVATE_HEADERS = privateTen.h
$(L).OBJS = tensor.o chan.o aniso.o glyph.o enumsTen.o grads.o miscTen.o \
Modified: teem/trunk/src/ten/ten.h
===================================================================
--- teem/trunk/src/ten/ten.h 2023-07-19 17:12:02 UTC (rev 7127)
+++ teem/trunk/src/ten/ten.h 2023-07-19 17:33:03 UTC (rev 7128)
@@ -29,7 +29,6 @@
#include <teem/ell.h>
#include <teem/nrrd.h>
#include <teem/unrrdu.h>
-#include <teem/dye.h>
#include <teem/gage.h>
#include <teem/limn.h>
#include <teem/echo.h>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kin...@us...> - 2023-07-19 17:12:03
|
Revision: 7127
http://sourceforge.net/p/teem/code/7127
Author: kindlmann
Date: 2023-07-19 17:12:02 +0000 (Wed, 19 Jul 2023)
Log Message:
-----------
no longer need this
Removed Paths:
-------------
teemdoc/trunk/html/img/graph/teem-rgraph.data
Deleted: teemdoc/trunk/html/img/graph/teem-rgraph.data
===================================================================
--- teemdoc/trunk/html/img/graph/teem-rgraph.data 2023-07-19 17:11:22 UTC (rev 7126)
+++ teemdoc/trunk/html/img/graph/teem-rgraph.data 2023-07-19 17:12:02 UTC (rev 7127)
@@ -1,36 +0,0 @@
- unrrdu -> nrrd;
- ell -> nrrd;
- moss -> ell;
- gage -> ell;
- dye -> ell;
- alan -> ell;
- tijk -> ell;
- limn -> unrrdu;
- limn -> gage;
- bane -> unrrdu;
- bane -> gage;
- seek -> limn;
- hoover -> limn;
- echo -> limn;
- mite -> hoover;
- mite -> ten;
- push -> ten;
- coil -> ten;
- pull -> ten;
- hest -> air;
- biff -> air;
- nrrd -> hest;
- nrrd -> biff;
- ten -> dye;
- ten -> echo;
- elf -> tijk;
- elf -> ten;
- meet -> moss;
- meet -> alan;
- meet -> bane;
- meet -> seek;
- meet -> mite;
- meet -> push;
- meet -> coil;
- meet -> pull;
- meet -> elf;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kin...@us...> - 2023-07-19 17:11:23
|
Revision: 7126
http://sourceforge.net/p/teem/code/7126
Author: kindlmann
Date: 2023-07-19 17:11:22 +0000 (Wed, 19 Jul 2023)
Log Message:
-----------
tred teem-graph.dot > teem-rgraph.dot
Added Paths:
-----------
teemdoc/trunk/html/img/graph/teem-rgraph.dot
Added: teemdoc/trunk/html/img/graph/teem-rgraph.dot
===================================================================
--- teemdoc/trunk/html/img/graph/teem-rgraph.dot (rev 0)
+++ teemdoc/trunk/html/img/graph/teem-rgraph.dot 2023-07-19 17:11:22 UTC (rev 7126)
@@ -0,0 +1,37 @@
+digraph G {
+ hest -> air;
+ biff -> air;
+ nrrd -> hest;
+ nrrd -> biff;
+ ell -> nrrd;
+ unrrdu -> moss;
+ moss -> ell;
+ alan -> ell;
+ tijk -> ell;
+ gage -> ell;
+ dye -> ell;
+ bane -> unrrdu;
+ bane -> gage;
+ limn -> unrrdu;
+ limn -> gage;
+ echo -> limn;
+ hoover -> limn;
+ seek -> limn;
+ ten -> dye;
+ ten -> echo;
+ elf -> tijk;
+ elf -> ten;
+ pull -> ten;
+ coil -> ten;
+ push -> ten;
+ mite -> hoover;
+ mite -> ten;
+ meet -> alan;
+ meet -> bane;
+ meet -> seek;
+ meet -> elf;
+ meet -> pull;
+ meet -> coil;
+ meet -> push;
+ meet -> mite;
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kin...@us...> - 2023-07-19 17:09:59
|
Revision: 7125
http://sourceforge.net/p/teem/code/7125
Author: kindlmann
Date: 2023-07-19 17:09:57 +0000 (Wed, 19 Jul 2023)
Log Message:
-----------
teem-graph.dot is now the canonical source of dependency info for this drawing purpose
Removed Paths:
-------------
teemdoc/trunk/html/img/graph/teem-graph.data
Deleted: teemdoc/trunk/html/img/graph/teem-graph.data
===================================================================
--- teemdoc/trunk/html/img/graph/teem-graph.data 2023-07-19 17:09:14 UTC (rev 7124)
+++ teemdoc/trunk/html/img/graph/teem-graph.data 2023-07-19 17:09:57 UTC (rev 7125)
@@ -1,125 +0,0 @@
- hest -> air;
- biff -> air;
- nrrd -> biff;
- nrrd -> hest;
- nrrd -> air;
- ell -> nrrd;
- ell -> biff;
- ell -> air;
- unrrdu -> moss;
- unrrdu -> nrrd;
- unrrdu -> biff;
- unrrdu -> hest;
- unrrdu -> air;
- alan -> air;
- alan -> biff;
- alan -> ell;
- alan -> nrrd;
- moss -> ell;
- moss -> nrrd;
- moss -> biff;
- moss -> hest;
- moss -> air;
- tijk -> ell;
- tijk -> nrrd;
- tijk -> air;
- gage -> ell;
- gage -> nrrd;
- gage -> biff;
- gage -> air;
- dye -> ell;
- dye -> biff;
- dye -> air;
- bane -> gage;
- bane -> unrrdu;
- bane -> nrrd;
- bane -> biff;
- bane -> air;
- limn -> gage;
- limn -> ell;
- limn -> unrrdu;
- limn -> nrrd;
- limn -> biff;
- limn -> hest;
- limn -> air;
- echo -> limn;
- echo -> ell;
- echo -> nrrd;
- echo -> biff;
- echo -> air;
- hoover -> limn;
- hoover -> ell;
- hoover -> nrrd;
- hoover -> biff;
- hoover -> air;
- seek -> limn;
- seek -> gage;
- seek -> ell;
- seek -> nrrd;
- seek -> biff;
- seek -> hest;
- seek -> air;
- ten -> echo;
- ten -> limn;
- ten -> dye;
- ten -> gage;
- ten -> unrrdu;
- ten -> ell;
- ten -> nrrd;
- ten -> biff;
- ten -> air;
- elf -> ten;
- elf -> tijk;
- elf -> limn;
- elf -> ell;
- elf -> nrrd;
- elf -> air;
- pull -> ten;
- pull -> limn;
- pull -> gage;
- pull -> ell;
- pull -> nrrd;
- pull -> biff;
- pull -> hest;
- pull -> air;
- coil -> ten;
- coil -> ell;
- coil -> nrrd;
- coil -> biff;
- coil -> air;
- push -> air;
- push -> biff;
- push -> nrrd;
- push -> ell;
- push -> gage;
- push -> ten;
- mite -> ten;
- mite -> hoover;
- mite -> limn;
- mite -> gage;
- mite -> ell;
- mite -> nrrd;
- mite -> biff;
- mite -> air;
- meet -> mite;
- meet -> push;
- meet -> coil;
- meet -> pull;
- meet -> elf;
- meet -> ten;
- meet -> seek;
- meet -> hoover;
- meet -> echo;
- meet -> limn;
- meet -> bane;
- meet -> dye;
- meet -> gage;
- meet -> tijk;
- meet -> alan;
- meet -> unrrdu;
- meet -> moss;
- meet -> ell;
- meet -> nrrd;
- meet -> biff;
- meet -> hest;
- meet -> air;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kin...@us...> - 2023-07-19 17:09:15
|
Revision: 7124
http://sourceforge.net/p/teem/code/7124
Author: kindlmann
Date: 2023-07-19 17:09:14 +0000 (Wed, 19 Jul 2023)
Log Message:
-----------
oops
Removed Paths:
-------------
teemdoc/trunk/html/img/graph/tmp.data
Deleted: teemdoc/trunk/html/img/graph/tmp.data
===================================================================
--- teemdoc/trunk/html/img/graph/tmp.data 2023-07-19 17:07:26 UTC (rev 7123)
+++ teemdoc/trunk/html/img/graph/tmp.data 2023-07-19 17:09:14 UTC (rev 7124)
@@ -1,125 +0,0 @@
- hest -> air;
- biff -> air;
- nrrd -> biff;
- nrrd -> hest;
- nrrd -> air;
- ell -> nrrd;
- ell -> biff;
- ell -> air;
- unrrdu -> moss;
- unrrdu -> nrrd;
- unrrdu -> biff;
- unrrdu -> hest;
- unrrdu -> air;
- alan -> air;
- alan -> biff;
- alan -> ell;
- alan -> nrrd;
- moss -> ell;
- moss -> nrrd;
- moss -> biff;
- moss -> hest;
- moss -> air;
- tijk -> ell;
- tijk -> nrrd;
- tijk -> air;
- gage -> ell;
- gage -> nrrd;
- gage -> biff;
- gage -> air;
- dye -> ell;
- dye -> biff;
- dye -> air;
- bane -> gage;
- bane -> unrrdu;
- bane -> nrrd;
- bane -> biff;
- bane -> air;
- limn -> gage;
- limn -> ell;
- limn -> unrrdu;
- limn -> nrrd;
- limn -> biff;
- limn -> hest;
- limn -> air;
- echo -> limn;
- echo -> ell;
- echo -> nrrd;
- echo -> biff;
- echo -> air;
- hoover -> limn;
- hoover -> ell;
- hoover -> nrrd;
- hoover -> biff;
- hoover -> air;
- seek -> limn;
- seek -> gage;
- seek -> ell;
- seek -> nrrd;
- seek -> biff;
- seek -> hest;
- seek -> air;
- ten -> echo;
- ten -> limn;
- ten -> dye;
- ten -> gage;
- ten -> unrrdu;
- ten -> ell;
- ten -> nrrd;
- ten -> biff;
- ten -> air;
- elf -> ten;
- elf -> tijk;
- elf -> limn;
- elf -> ell;
- elf -> nrrd;
- elf -> air;
- pull -> ten;
- pull -> limn;
- pull -> gage;
- pull -> ell;
- pull -> nrrd;
- pull -> biff;
- pull -> hest;
- pull -> air;
- coil -> ten;
- coil -> ell;
- coil -> nrrd;
- coil -> biff;
- coil -> air;
- push -> air;
- push -> biff;
- push -> nrrd;
- push -> ell;
- push -> gage;
- push -> ten;
- mite -> ten;
- mite -> hoover;
- mite -> limn;
- mite -> gage;
- mite -> ell;
- mite -> nrrd;
- mite -> biff;
- mite -> air;
- meet -> mite;
- meet -> push;
- meet -> coil;
- meet -> pull;
- meet -> elf;
- meet -> ten;
- meet -> seek;
- meet -> hoover;
- meet -> echo;
- meet -> limn;
- meet -> bane;
- meet -> dye;
- meet -> gage;
- meet -> tijk;
- meet -> alan;
- meet -> unrrdu;
- meet -> moss;
- meet -> ell;
- meet -> nrrd;
- meet -> biff;
- meet -> hest;
- meet -> air;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kin...@us...> - 2023-07-19 17:07:29
|
Revision: 7123
http://sourceforge.net/p/teem/code/7123
Author: kindlmann
Date: 2023-07-19 17:07:26 +0000 (Wed, 19 Jul 2023)
Log Message:
-----------
work on nicely drawing the dependency graph
Added Paths:
-----------
teemdoc/trunk/html/img/graph/
teemdoc/trunk/html/img/graph/save/
teemdoc/trunk/html/img/graph/save/teem-graph-151122-3850.dot
teemdoc/trunk/html/img/graph/save/teem-graph-151122-3850.gif
teemdoc/trunk/html/img/graph/save/teem-graph-154802-3846.dot
teemdoc/trunk/html/img/graph/save/teem-graph-154802-3846.gif
teemdoc/trunk/html/img/graph/save/teem-graph-154880-1418.dot
teemdoc/trunk/html/img/graph/save/teem-graph-154880-1418.gif
teemdoc/trunk/html/img/graph/save/teem-graph-156511-446.dot
teemdoc/trunk/html/img/graph/save/teem-graph-156511-446.gif
teemdoc/trunk/html/img/graph/save/teem-graph-156666-149.dot
teemdoc/trunk/html/img/graph/save/teem-graph-156666-149.gif
teemdoc/trunk/html/img/graph/save/teem-graph-157148-75.dot
teemdoc/trunk/html/img/graph/save/teem-graph-157148-75.gif
teemdoc/trunk/html/img/graph/save/teem-graph-157683-12.dot
teemdoc/trunk/html/img/graph/save/teem-graph-157683-12.gif
teemdoc/trunk/html/img/graph/save/teem-graph-166159-6.dot
teemdoc/trunk/html/img/graph/save/teem-graph-166159-6.gif
teemdoc/trunk/html/img/graph/save/teem-graph-166451-4.dot
teemdoc/trunk/html/img/graph/save/teem-graph-166451-4.gif
teemdoc/trunk/html/img/graph/save/teem-graph-166508-1.dot
teemdoc/trunk/html/img/graph/save/teem-graph-166508-1.gif
teemdoc/trunk/html/img/graph/save/teem-graph-168246-0.dot
teemdoc/trunk/html/img/graph/save/teem-graph-168246-0.gif
teemdoc/trunk/html/img/graph/save/teem-graph-complete.dot
teemdoc/trunk/html/img/graph/save/teem-graph-good.dot
teemdoc/trunk/html/img/graph/save/teem-graph-start.dot
teemdoc/trunk/html/img/graph/save/teem-graph.dot
teemdoc/trunk/html/img/graph/save/teem-graph.gif
teemdoc/trunk/html/img/graph/save/teem-rgraph-35977-0.dot
teemdoc/trunk/html/img/graph/save/teem-rgraph-35977-0.gif
teemdoc/trunk/html/img/graph/save/teem-rgraph.dot
teemdoc/trunk/html/img/graph/save/tmp-graph.gif
teemdoc/trunk/html/img/graph/save/tmp-info.dot
teemdoc/trunk/html/img/graph/teem-graph-gen.py
teemdoc/trunk/html/img/graph/teem-graph.data
teemdoc/trunk/html/img/graph/teem-graph.dot
teemdoc/trunk/html/img/graph/teem-rgraph.data
teemdoc/trunk/html/img/graph/tmp.data
Added: teemdoc/trunk/html/img/graph/save/teem-graph-151122-3850.dot
===================================================================
--- teemdoc/trunk/html/img/graph/save/teem-graph-151122-3850.dot (rev 0)
+++ teemdoc/trunk/html/img/graph/save/teem-graph-151122-3850.dot 2023-07-19 17:07:26 UTC (rev 7123)
@@ -0,0 +1,138 @@
+// The info here was randomized w/ seed 3850
+digraph G {
+ concentrate=true;
+ remincross=true;
+ searchsize=30000;
+ ranksep=1.0;
+ mclimit=0.2;
+ { rank = same; unrrdu; ell }
+ { rank = same; moss; gage; dye; alan; tijk }
+ { rank = same; limn; bane }
+ { rank = same; seek; hoover; echo }
+ { rank = same; mite; push; coil; pull }
+
+ pull -> hest;
+ hoover -> limn;
+ limn -> biff;
+ bane -> air;
+ elf -> ten;
+ pull -> limn;
+ mite -> hoover;
+ meet -> biff;
+ ten -> echo;
+ bane -> gage;
+ seek -> ell;
+ tijk -> nrrd;
+ meet -> echo;
+ ten -> nrrd;
+ unrrdu -> hest;
+ echo -> nrrd;
+ meet -> elf;
+ moss -> ell;
+ ten -> limn;
+ dye -> biff;
+ elf -> air;
+ pull -> biff;
+ coil -> air;
+ seek -> hest;
+ dye -> air;
+ pull -> nrrd;
+ alan -> nrrd;
+ elf -> nrrd;
+ moss -> hest;
+ meet -> gage;
+ meet -> tijk;
+ meet -> alan;
+ pull -> ell;
+ echo -> ell;
+ meet -> push;
+ nrrd -> air;
+ limn -> nrrd;
+ nrrd -> hest;
+ unrrdu -> nrrd;
+ meet -> hest;
+ ten -> biff;
+ seek -> limn;
+ moss -> biff;
+ meet -> air;
+ meet -> nrrd;
+ meet -> coil;
+ biff -> air;
+ meet -> seek;
+ mite -> ten;
+ ten -> dye;
+ bane -> unrrdu;
+ alan -> ell;
+ elf -> ell;
+ meet -> hoover;
+ moss -> air;
+ elf -> limn;
+ push -> ten;
+ ell -> nrrd;
+ mite -> biff;
+ mite -> nrrd;
+ alan -> biff;
+ limn -> hest;
+ mite -> ell;
+ gage -> nrrd;
+ meet -> dye;
+ pull -> gage;
+ gage -> ell;
+ ten -> gage;
+ dye -> ell;
+ mite -> gage;
+ echo -> air;
+ ten -> unrrdu;
+ hoover -> biff;
+ coil -> nrrd;
+ ten -> ell;
+ seek -> biff;
+ echo -> limn;
+ tijk -> ell;
+ hest -> air;
+ meet -> ten;
+ meet -> pull;
+ meet -> moss;
+ mite -> limn;
+ hoover -> nrrd;
+ meet -> bane;
+ meet -> ell;
+ bane -> biff;
+ hoover -> air;
+ unrrdu -> air;
+ tijk -> air;
+ coil -> biff;
+ moss -> nrrd;
+ ell -> biff;
+ echo -> biff;
+ push -> ell;
+ ell -> air;
+ hoover -> ell;
+ gage -> air;
+ unrrdu -> biff;
+ push -> air;
+ meet -> unrrdu;
+ limn -> gage;
+ seek -> nrrd;
+ ten -> air;
+ coil -> ell;
+ coil -> ten;
+ nrrd -> biff;
+ limn -> unrrdu;
+ elf -> tijk;
+ seek -> air;
+ limn -> air;
+ seek -> gage;
+ gage -> biff;
+ mite -> air;
+ push -> gage;
+ push -> nrrd;
+ meet -> mite;
+ pull -> air;
+ pull -> ten;
+ bane -> nrrd;
+ meet -> limn;
+ limn -> ell;
+ push -> biff;
+ alan -> air;
+ }
Added: teemdoc/trunk/html/img/graph/save/teem-graph-151122-3850.gif
===================================================================
(Binary files differ)
Index: teemdoc/trunk/html/img/graph/save/teem-graph-151122-3850.gif
===================================================================
--- teemdoc/trunk/html/img/graph/save/teem-graph-151122-3850.gif 2023-07-17 15:43:00 UTC (rev 7122)
+++ teemdoc/trunk/html/img/graph/save/teem-graph-151122-3850.gif 2023-07-19 17:07:26 UTC (rev 7123)
Property changes on: teemdoc/trunk/html/img/graph/save/teem-graph-151122-3850.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: teemdoc/trunk/html/img/graph/save/teem-graph-154802-3846.dot
===================================================================
--- teemdoc/trunk/html/img/graph/save/teem-graph-154802-3846.dot (rev 0)
+++ teemdoc/trunk/html/img/graph/save/teem-graph-154802-3846.dot 2023-07-19 17:07:26 UTC (rev 7123)
@@ -0,0 +1,138 @@
+// The info here was randomized w/ seed 3846
+digraph G {
+ concentrate=true;
+ remincross=true;
+ searchsize=30000;
+ ranksep=1.0;
+ mclimit=0.2;
+ { rank = same; unrrdu; ell }
+ { rank = same; moss; gage; dye; alan; tijk }
+ { rank = same; limn; bane }
+ { rank = same; seek; hoover; echo }
+ { rank = same; mite; push; coil; pull }
+
+ echo -> biff;
+ limn -> gage;
+ tijk -> air;
+ limn -> unrrdu;
+ mite -> ten;
+ hoover -> air;
+ coil -> ten;
+ hest -> air;
+ elf -> tijk;
+ dye -> air;
+ mite -> biff;
+ seek -> limn;
+ meet -> push;
+ meet -> ell;
+ ten -> gage;
+ ten -> ell;
+ ell -> biff;
+ meet -> hest;
+ ten -> limn;
+ meet -> hoover;
+ ten -> echo;
+ seek -> air;
+ ten -> biff;
+ ell -> air;
+ pull -> hest;
+ coil -> nrrd;
+ echo -> ell;
+ coil -> biff;
+ mite -> nrrd;
+ moss -> air;
+ moss -> biff;
+ gage -> ell;
+ hoover -> limn;
+ push -> nrrd;
+ meet -> bane;
+ push -> ten;
+ pull -> gage;
+ elf -> ell;
+ meet -> unrrdu;
+ pull -> limn;
+ unrrdu -> air;
+ meet -> elf;
+ limn -> biff;
+ ten -> unrrdu;
+ nrrd -> biff;
+ limn -> air;
+ push -> air;
+ bane -> unrrdu;
+ gage -> air;
+ seek -> biff;
+ limn -> nrrd;
+ meet -> nrrd;
+ meet -> coil;
+ ell -> nrrd;
+ elf -> limn;
+ ten -> air;
+ meet -> ten;
+ ten -> nrrd;
+ unrrdu -> nrrd;
+ pull -> nrrd;
+ bane -> biff;
+ echo -> air;
+ bane -> air;
+ ten -> dye;
+ seek -> gage;
+ bane -> gage;
+ meet -> air;
+ mite -> limn;
+ seek -> hest;
+ push -> ell;
+ bane -> nrrd;
+ limn -> hest;
+ tijk -> nrrd;
+ alan -> biff;
+ meet -> echo;
+ nrrd -> hest;
+ moss -> hest;
+ mite -> gage;
+ meet -> alan;
+ gage -> nrrd;
+ push -> biff;
+ push -> gage;
+ biff -> air;
+ hoover -> biff;
+ alan -> nrrd;
+ meet -> gage;
+ dye -> ell;
+ pull -> ell;
+ alan -> ell;
+ meet -> seek;
+ unrrdu -> biff;
+ elf -> ten;
+ unrrdu -> hest;
+ echo -> limn;
+ gage -> biff;
+ elf -> nrrd;
+ pull -> biff;
+ hoover -> ell;
+ meet -> pull;
+ seek -> ell;
+ meet -> mite;
+ echo -> nrrd;
+ moss -> ell;
+ meet -> dye;
+ hoover -> nrrd;
+ coil -> air;
+ pull -> ten;
+ mite -> air;
+ pull -> air;
+ alan -> air;
+ meet -> tijk;
+ limn -> ell;
+ mite -> hoover;
+ meet -> biff;
+ mite -> ell;
+ seek -> nrrd;
+ moss -> nrrd;
+ dye -> biff;
+ meet -> limn;
+ elf -> air;
+ meet -> moss;
+ nrrd -> air;
+ coil -> ell;
+ tijk -> ell;
+ }
Added: teemdoc/trunk/html/img/graph/save/teem-graph-154802-3846.gif
===================================================================
(Binary files differ)
Index: teemdoc/trunk/html/img/graph/save/teem-graph-154802-3846.gif
===================================================================
--- teemdoc/trunk/html/img/graph/save/teem-graph-154802-3846.gif 2023-07-17 15:43:00 UTC (rev 7122)
+++ teemdoc/trunk/html/img/graph/save/teem-graph-154802-3846.gif 2023-07-19 17:07:26 UTC (rev 7123)
Property changes on: teemdoc/trunk/html/img/graph/save/teem-graph-154802-3846.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: teemdoc/trunk/html/img/graph/save/teem-graph-154880-1418.dot
===================================================================
--- teemdoc/trunk/html/img/graph/save/teem-graph-154880-1418.dot (rev 0)
+++ teemdoc/trunk/html/img/graph/save/teem-graph-154880-1418.dot 2023-07-19 17:07:26 UTC (rev 7123)
@@ -0,0 +1,138 @@
+// The info here was randomized w/ seed 1418
+digraph G {
+ concentrate=true;
+ remincross=true;
+ searchsize=30000;
+ ranksep=1.0;
+ mclimit=0.2;
+ { rank = same; unrrdu; ell }
+ { rank = same; moss; gage; dye; alan; tijk }
+ { rank = same; limn; bane }
+ { rank = same; seek; hoover; echo }
+ { rank = same; mite; push; coil; pull }
+
+ ell -> biff;
+ gage -> ell;
+ push -> biff;
+ ten -> air;
+ push -> air;
+ seek -> biff;
+ limn -> hest;
+ limn -> gage;
+ elf -> tijk;
+ unrrdu -> hest;
+ meet -> elf;
+ pull -> biff;
+ dye -> biff;
+ hoover -> nrrd;
+ meet -> moss;
+ ten -> ell;
+ mite -> biff;
+ mite -> air;
+ unrrdu -> nrrd;
+ meet -> push;
+ moss -> ell;
+ tijk -> air;
+ moss -> biff;
+ ten -> echo;
+ push -> gage;
+ hoover -> air;
+ nrrd -> hest;
+ unrrdu -> air;
+ bane -> unrrdu;
+ gage -> biff;
+ echo -> biff;
+ seek -> ell;
+ pull -> nrrd;
+ nrrd -> air;
+ meet -> hoover;
+ ten -> limn;
+ pull -> air;
+ echo -> ell;
+ ell -> nrrd;
+ elf -> ten;
+ mite -> gage;
+ mite -> hoover;
+ meet -> tijk;
+ meet -> unrrdu;
+ push -> ten;
+ coil -> ten;
+ mite -> limn;
+ bane -> air;
+ limn -> biff;
+ limn -> ell;
+ limn -> air;
+ meet -> limn;
+ meet -> pull;
+ ten -> unrrdu;
+ ten -> biff;
+ hoover -> ell;
+ elf -> limn;
+ limn -> unrrdu;
+ meet -> bane;
+ push -> ell;
+ meet -> gage;
+ elf -> nrrd;
+ ell -> air;
+ bane -> nrrd;
+ meet -> alan;
+ bane -> biff;
+ push -> nrrd;
+ seek -> hest;
+ seek -> air;
+ meet -> nrrd;
+ ten -> nrrd;
+ gage -> air;
+ tijk -> nrrd;
+ moss -> nrrd;
+ meet -> ten;
+ alan -> nrrd;
+ hoover -> biff;
+ elf -> air;
+ meet -> mite;
+ meet -> echo;
+ pull -> ell;
+ meet -> seek;
+ echo -> air;
+ nrrd -> biff;
+ seek -> nrrd;
+ echo -> nrrd;
+ limn -> nrrd;
+ mite -> ten;
+ moss -> hest;
+ alan -> air;
+ seek -> limn;
+ bane -> gage;
+ coil -> air;
+ alan -> ell;
+ pull -> limn;
+ pull -> hest;
+ meet -> biff;
+ unrrdu -> biff;
+ ten -> dye;
+ meet -> hest;
+ elf -> ell;
+ meet -> air;
+ meet -> coil;
+ dye -> air;
+ gage -> nrrd;
+ coil -> ell;
+ coil -> nrrd;
+ seek -> gage;
+ hest -> air;
+ meet -> ell;
+ echo -> limn;
+ biff -> air;
+ mite -> nrrd;
+ dye -> ell;
+ tijk -> ell;
+ alan -> biff;
+ hoover -> limn;
+ coil -> biff;
+ meet -> dye;
+ pull -> gage;
+ ten -> gage;
+ moss -> air;
+ mite -> ell;
+ pull -> ten;
+ }
Added: teemdoc/trunk/html/img/graph/save/teem-graph-154880-1418.gif
===================================================================
(Binary files differ)
Index: teemdoc/trunk/html/img/graph/save/teem-graph-154880-1418.gif
===================================================================
--- teemdoc/trunk/html/img/graph/save/teem-graph-154880-1418.gif 2023-07-17 15:43:00 UTC (rev 7122)
+++ teemdoc/trunk/html/img/graph/save/teem-graph-154880-1418.gif 2023-07-19 17:07:26 UTC (rev 7123)
Property changes on: teemdoc/trunk/html/img/graph/save/teem-graph-154880-1418.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: teemdoc/trunk/html/img/graph/save/teem-graph-156511-446.dot
===================================================================
--- teemdoc/trunk/html/img/graph/save/teem-graph-156511-446.dot (rev 0)
+++ teemdoc/trunk/html/img/graph/save/teem-graph-156511-446.dot 2023-07-19 17:07:26 UTC (rev 7123)
@@ -0,0 +1,138 @@
+// The info here was randomized w/ seed 446
+digraph G {
+ concentrate=true;
+ remincross=true;
+ searchsize=30000;
+ ranksep=1.0;
+ mclimit=0.2;
+ { rank = same; unrrdu; ell }
+ { rank = same; moss; gage; dye; alan; tijk }
+ { rank = same; limn; bane }
+ { rank = same; seek; hoover; echo }
+ { rank = same; mite; push; coil; pull }
+
+ moss -> hest;
+ push -> gage;
+ pull -> biff;
+ push -> ten;
+ limn -> air;
+ elf -> limn;
+ nrrd -> biff;
+ alan -> biff;
+ gage -> air;
+ gage -> biff;
+ mite -> ten;
+ dye -> ell;
+ tijk -> ell;
+ unrrdu -> nrrd;
+ pull -> hest;
+ meet -> bane;
+ meet -> air;
+ pull -> limn;
+ mite -> hoover;
+ meet -> ten;
+ hoover -> air;
+ meet -> moss;
+ tijk -> air;
+ meet -> nrrd;
+ hoover -> biff;
+ nrrd -> hest;
+ unrrdu -> air;
+ echo -> biff;
+ meet -> dye;
+ ten -> echo;
+ mite -> biff;
+ mite -> gage;
+ ten -> ell;
+ bane -> biff;
+ moss -> nrrd;
+ hest -> air;
+ limn -> biff;
+ ten -> unrrdu;
+ echo -> limn;
+ seek -> limn;
+ gage -> ell;
+ ell -> air;
+ seek -> biff;
+ bane -> gage;
+ meet -> echo;
+ mite -> air;
+ elf -> air;
+ meet -> mite;
+ seek -> hest;
+ meet -> limn;
+ mite -> nrrd;
+ meet -> hest;
+ push -> ell;
+ tijk -> nrrd;
+ pull -> gage;
+ nrrd -> air;
+ unrrdu -> biff;
+ meet -> biff;
+ elf -> ten;
+ coil -> air;
+ limn -> nrrd;
+ meet -> alan;
+ elf -> tijk;
+ limn -> ell;
+ coil -> ten;
+ hoover -> nrrd;
+ pull -> ten;
+ push -> biff;
+ ten -> dye;
+ seek -> ell;
+ bane -> nrrd;
+ hoover -> ell;
+ meet -> tijk;
+ limn -> unrrdu;
+ unrrdu -> hest;
+ meet -> ell;
+ ten -> limn;
+ elf -> nrrd;
+ bane -> air;
+ ten -> nrrd;
+ push -> air;
+ mite -> limn;
+ alan -> air;
+ meet -> gage;
+ ell -> biff;
+ dye -> biff;
+ coil -> biff;
+ dye -> air;
+ elf -> ell;
+ moss -> air;
+ meet -> push;
+ moss -> ell;
+ seek -> air;
+ limn -> hest;
+ meet -> pull;
+ mite -> ell;
+ pull -> air;
+ push -> nrrd;
+ meet -> seek;
+ ten -> air;
+ meet -> coil;
+ ell -> nrrd;
+ gage -> nrrd;
+ alan -> nrrd;
+ coil -> nrrd;
+ echo -> ell;
+ ten -> gage;
+ echo -> air;
+ biff -> air;
+ coil -> ell;
+ limn -> gage;
+ seek -> gage;
+ pull -> nrrd;
+ meet -> elf;
+ pull -> ell;
+ ten -> biff;
+ meet -> hoover;
+ meet -> unrrdu;
+ seek -> nrrd;
+ echo -> nrrd;
+ moss -> biff;
+ bane -> unrrdu;
+ alan -> ell;
+ hoover -> limn;
+ }
Added: teemdoc/trunk/html/img/graph/save/teem-graph-156511-446.gif
===================================================================
(Binary files differ)
Index: teemdoc/trunk/html/img/graph/save/teem-graph-156511-446.gif
===================================================================
--- teemdoc/trunk/html/img/graph/save/teem-graph-156511-446.gif 2023-07-17 15:43:00 UTC (rev 7122)
+++ teemdoc/trunk/html/img/graph/save/teem-graph-156511-446.gif 2023-07-19 17:07:26 UTC (rev 7123)
Property changes on: teemdoc/trunk/html/img/graph/save/teem-graph-156511-446.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: teemdoc/trunk/html/img/graph/save/teem-graph-156666-149.dot
===================================================================
--- teemdoc/trunk/html/img/graph/save/teem-graph-156666-149.dot (rev 0)
+++ teemdoc/trunk/html/img/graph/save/teem-graph-156666-149.dot 2023-07-19 17:07:26 UTC (rev 7123)
@@ -0,0 +1,138 @@
+// The info here was randomized w/ seed 149
+digraph G {
+ concentrate=true;
+ remincross=true;
+ searchsize=30000;
+ ranksep=1.0;
+ mclimit=0.2;
+ { rank = same; unrrdu; ell }
+ { rank = same; moss; gage; dye; alan; tijk }
+ { rank = same; limn; bane }
+ { rank = same; seek; hoover; echo }
+ { rank = same; mite; push; coil; pull }
+
+ hest -> air;
+ nrrd -> hest;
+ moss -> ell;
+ hoover -> biff;
+ alan -> ell;
+ nrrd -> air;
+ ten -> biff;
+ hoover -> ell;
+ elf -> ell;
+ meet -> hoover;
+ ten -> ell;
+ meet -> pull;
+ pull -> limn;
+ coil -> biff;
+ ten -> nrrd;
+ alan -> nrrd;
+ ten -> dye;
+ meet -> bane;
+ push -> gage;
+ moss -> hest;
+ seek -> air;
+ bane -> air;
+ coil -> air;
+ unrrdu -> air;
+ meet -> gage;
+ dye -> air;
+ dye -> ell;
+ push -> ten;
+ alan -> air;
+ mite -> ten;
+ ell -> air;
+ elf -> limn;
+ gage -> ell;
+ unrrdu -> biff;
+ meet -> echo;
+ meet -> biff;
+ ell -> biff;
+ bane -> unrrdu;
+ elf -> nrrd;
+ unrrdu -> hest;
+ seek -> biff;
+ meet -> moss;
+ gage -> air;
+ moss -> biff;
+ meet -> dye;
+ meet -> nrrd;
+ coil -> ten;
+ elf -> tijk;
+ nrrd -> biff;
+ seek -> hest;
+ meet -> tijk;
+ push -> ell;
+ hoover -> air;
+ dye -> biff;
+ mite -> ell;
+ tijk -> ell;
+ meet -> limn;
+ ten -> limn;
+ pull -> biff;
+ meet -> hest;
+ mite -> nrrd;
+ meet -> ten;
+ ten -> unrrdu;
+ meet -> coil;
+ meet -> ell;
+ mite -> hoover;
+ push -> nrrd;
+ echo -> limn;
+ pull -> nrrd;
+ echo -> ell;
+ seek -> ell;
+ limn -> nrrd;
+ meet -> seek;
+ unrrdu -> nrrd;
+ limn -> biff;
+ moss -> nrrd;
+ limn -> gage;
+ meet -> alan;
+ pull -> hest;
+ tijk -> air;
+ mite -> air;
+ echo -> nrrd;
+ mite -> limn;
+ tijk -> nrrd;
+ pull -> ell;
+ moss -> air;
+ echo -> biff;
+ elf -> air;
+ push -> air;
+ gage -> biff;
+ echo -> air;
+ ell -> nrrd;
+ bane -> biff;
+ alan -> biff;
+ ten -> echo;
+ coil -> ell;
+ bane -> nrrd;
+ bane -> gage;
+ meet -> mite;
+ seek -> nrrd;
+ pull -> ten;
+ seek -> limn;
+ elf -> ten;
+ limn -> hest;
+ push -> biff;
+ hoover -> limn;
+ mite -> biff;
+ coil -> nrrd;
+ pull -> gage;
+ ten -> gage;
+ limn -> air;
+ meet -> push;
+ biff -> air;
+ seek -> gage;
+ meet -> air;
+ gage -> nrrd;
+ mite -> gage;
+ meet -> unrrdu;
+ pull -> air;
+ ten -> air;
+ hoover -> nrrd;
+ meet -> elf;
+ limn -> unrrdu;
+ limn -> ell;
+ }
Added: teemdoc/trunk/html/img/graph/save/teem-graph-156666-149.gif
===================================================================
(Binary files differ)
Index: teemdoc/trunk/html/img/graph/save/teem-graph-156666-149.gif
===================================================================
--- teemdoc/trunk/html/img/graph/save/teem-graph-156666-149.gif 2023-07-17 15:43:00 UTC (rev 7122)
+++ teemdoc/trunk/html/img/graph/save/teem-graph-156666-149.gif 2023-07-19 17:07:26 UTC (rev 7123)
Property changes on: teemdoc/trunk/html/img/graph/save/teem-graph-156666-149.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: teemdoc/trunk/html/img/graph/save/teem-graph-157148-75.dot
===================================================================
--- teemdoc/trunk/html/img/graph/save/teem-graph-157148-75.dot (rev 0)
+++ teemdoc/trunk/html/img/graph/save/teem-graph-157148-75.dot 2023-07-19 17:07:26 UTC (rev 7123)
@@ -0,0 +1,138 @@
+// The info here was randomized w/ seed 75
+digraph G {
+ concentrate=true;
+ remincross=true;
+ searchsize=30000;
+ ranksep=1.0;
+ mclimit=0.2;
+ { rank = same; unrrdu; ell }
+ { rank = same; moss; gage; dye; alan; tijk }
+ { rank = same; limn; bane }
+ { rank = same; seek; hoover; echo }
+ { rank = same; mite; push; coil; pull }
+
+ elf -> ell;
+ meet -> push;
+ meet -> alan;
+ meet -> moss;
+ hoover -> nrrd;
+ meet -> seek;
+ meet -> mite;
+ dye -> ell;
+ nrrd -> air;
+ unrrdu -> biff;
+ biff -> air;
+ ten -> limn;
+ meet -> pull;
+ hoover -> biff;
+ pull -> limn;
+ limn -> air;
+ pull -> air;
+ pull -> ell;
+ meet -> coil;
+ dye -> air;
+ mite -> nrrd;
+ bane -> unrrdu;
+ push -> gage;
+ limn -> biff;
+ hoover -> limn;
+ meet -> air;
+ meet -> unrrdu;
+ push -> air;
+ seek -> gage;
+ push -> ell;
+ unrrdu -> hest;
+ unrrdu -> nrrd;
+ meet -> ten;
+ hest -> air;
+ elf -> ten;
+ mite -> hoover;
+ mite -> ell;
+ ten -> dye;
+ pull -> biff;
+ seek -> limn;
+ meet -> elf;
+ meet -> echo;
+ meet -> ell;
+ seek -> air;
+ alan -> ell;
+ nrrd -> biff;
+ bane -> gage;
+ echo -> biff;
+ meet -> limn;
+ seek -> biff;
+ ell -> biff;
+ dye -> biff;
+ coil -> ten;
+ pull -> hest;
+ mite -> gage;
+ limn -> gage;
+ ten -> ell;
+ ten -> biff;
+ ell -> nrrd;
+ ten -> unrrdu;
+ ten -> gage;
+ meet -> gage;
+ bane -> biff;
+ hoover -> ell;
+ limn -> nrrd;
+ tijk -> nrrd;
+ ten -> echo;
+ seek -> hest;
+ echo -> nrrd;
+ moss -> nrrd;
+ elf -> limn;
+ coil -> air;
+ meet -> tijk;
+ pull -> ten;
+ meet -> bane;
+ tijk -> air;
+ mite -> air;
+ elf -> nrrd;
+ alan -> nrrd;
+ gage -> ell;
+ limn -> unrrdu;
+ seek -> nrrd;
+ ten -> air;
+ push -> ten;
+ meet -> hoover;
+ moss -> ell;
+ elf -> air;
+ hoover -> air;
+ alan -> air;
+ echo -> limn;
+ echo -> air;
+ coil -> ell;
+ gage -> air;
+ push -> nrrd;
+ alan -> biff;
+ meet -> dye;
+ bane -> nrrd;
+ mite -> ten;
+ mite -> limn;
+ pull -> nrrd;
+ mite -> biff;
+ seek -> ell;
+ gage -> nrrd;
+ moss -> biff;
+ limn -> ell;
+ moss -> hest;
+ coil -> nrrd;
+ pull -> gage;
+ elf -> tijk;
+ limn -> hest;
+ meet -> biff;
+ tijk -> ell;
+ unrrdu -> air;
+ ell -> air;
+ bane -> air;
+ ten -> nrrd;
+ nrrd -> hest;
+ meet -> hest;
+ moss -> air;
+ coil -> biff;
+ gage -> biff;
+ push -> biff;
+ echo -> ell;
+ meet -> nrrd;
+ }
Added: teemdoc/trunk/html/img/graph/save/teem-graph-157148-75.gif
===================================================================
(Binary files differ)
Index: teemdoc/trunk/html/img/graph/save/teem-graph-157148-75.gif
===================================================================
--- teemdoc/trunk/html/img/graph/save/teem-graph-157148-75.gif 2023-07-17 15:43:00 UTC (rev 7122)
+++ teemdoc/trunk/html/img/graph/save/teem-graph-157148-75.gif 2023-07-19 17:07:26 UTC (rev 7123)
Property changes on: teemdoc/trunk/html/img/graph/save/teem-graph-157148-75.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: teemdoc/trunk/html/img/graph/save/teem-graph-157683-12.dot
===================================================================
--- teemdoc/trunk/html/img/graph/save/teem-graph-157683-12.dot (rev 0)
+++ teemdoc/trunk/html/img/graph/save/teem-graph-157683-12.dot 2023-07-19 17:07:26 UTC (rev 7123)
@@ -0,0 +1,138 @@
+// The info here was randomized w/ seed 12
+digraph G {
+ concentrate=true;
+ remincross=true;
+ searchsize=30000;
+ ranksep=1.0;
+ mclimit=0.2;
+ { rank = same; unrrdu; ell }
+ { rank = same; moss; gage; dye; alan; tijk }
+ { rank = same; limn; bane }
+ { rank = same; seek; hoover; echo }
+ { rank = same; mite; push; coil; pull }
+
+ elf -> tijk;
+ bane -> air;
+ dye -> air;
+ meet -> nrrd;
+ push -> ell;
+ hoover -> ell;
+ mite -> gage;
+ mite -> limn;
+ elf -> limn;
+ gage -> nrrd;
+ mite -> nrrd;
+ meet -> push;
+ seek -> ell;
+ limn -> unrrdu;
+ dye -> biff;
+ seek -> limn;
+ dye -> ell;
+ meet -> hest;
+ meet -> biff;
+ echo -> nrrd;
+ alan -> nrrd;
+ meet -> pull;
+ limn -> ell;
+ meet -> elf;
+ push -> air;
+ nrrd -> hest;
+ pull -> air;
+ meet -> ell;
+ meet -> hoover;
+ pull -> biff;
+ coil -> nrrd;
+ unrrdu -> air;
+ coil -> ell;
+ ten -> ell;
+ ten -> biff;
+ echo -> air;
+ push -> nrrd;
+ meet -> mite;
+ ten -> echo;
+ coil -> ten;
+ echo -> biff;
+ unrrdu -> nrrd;
+ pull -> ell;
+ alan -> air;
+ pull -> gage;
+ ell -> nrrd;
+ ell -> biff;
+ mite -> hoover;
+ limn -> biff;
+ hoover -> nrrd;
+ mite -> air;
+ meet -> bane;
+ ten -> gage;
+ nrrd -> biff;
+ alan -> ell;
+ mite -> ell;
+ coil -> air;
+ gage -> biff;
+ mite -> biff;
+ moss -> biff;
+ ten -> dye;
+ moss -> nrrd;
+ gage -> air;
+ meet -> ten;
+ elf -> ten;
+ pull -> ten;
+ limn -> nrrd;
+ pull -> nrrd;
+ limn -> gage;
+ seek -> nrrd;
+ meet -> seek;
+ limn -> air;
+ echo -> limn;
+ tijk -> ell;
+ ten -> nrrd;
+ seek -> gage;
+ hest -> air;
+ hoover -> limn;
+ echo -> ell;
+ elf -> nrrd;
+ push -> ten;
+ meet -> coil;
+ bane -> unrrdu;
+ unrrdu -> hest;
+ gage -> ell;
+ bane -> nrrd;
+ hoover -> air;
+ moss -> hest;
+ elf -> ell;
+ limn -> hest;
+ seek -> biff;
+ unrrdu -> biff;
+ meet -> dye;
+ moss -> air;
+ tijk -> nrrd;
+ meet -> tijk;
+ biff -> air;
+ elf -> air;
+ bane -> biff;
+ push -> gage;
+ tijk -> air;
+ pull -> hest;
+ meet -> limn;
+ coil -> biff;
+ bane -> gage;
+ seek -> air;
+ meet -> alan;
+ meet -> air;
+ ell -> air;
+ meet -> gage;
+ moss -> ell;
+ meet -> moss;
+ mite -> ten;
+ hoover -> biff;
+ nrrd -> air;
+ pull -> limn;
+ alan -> biff;
+ ten -> unrrdu;
+ seek -> hest;
+ meet -> echo;
+ push -> biff;
+ ten -> air;
+ meet -> unrrdu;
+ ten -> limn;
+ }
Added: teemdoc/trunk/html/img/graph/save/teem-graph-157683-12.gif
===================================================================
(Binary files differ)
Index: teemdoc/trunk/html/img/graph/save/teem-graph-157683-12.gif
===================================================================
--- teemdoc/trunk/html/img/graph/save/teem-graph-157683-12.gif 2023-07-17 15:43:00 UTC (rev 7122)
+++ teemdoc/trunk/html/img/graph/save/teem-graph-157683-12.gif 2023-07-19 17:07:26 UTC (rev 7123)
Property changes on: teemdoc/trunk/html/img/graph/save/teem-graph-157683-12.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: teemdoc/trunk/html/img/graph/save/teem-graph-166159-6.dot
===================================================================
--- teemdoc/trunk/html/img/graph/save/teem-graph-166159-6.dot (rev 0)
+++ teemdoc/trunk/html/img/graph/save/teem-graph-166159-6.dot 2023-07-19 17:07:26 UTC (rev 7123)
@@ -0,0 +1,138 @@
+// The info here was randomized w/ seed 6
+digraph G {
+ concentrate=true;
+ remincross=true;
+ searchsize=30000;
+ ranksep=1.0;
+ mclimit=0.2;
+ { rank = same; unrrdu; ell }
+ { rank = same; moss; gage; dye; alan; tijk }
+ { rank = same; limn; bane }
+ { rank = same; seek; hoover; echo }
+ { rank = same; mite; push; coil; pull }
+
+ ten -> air;
+ meet -> elf;
+ mite -> biff;
+ pull -> nrrd;
+ ten -> limn;
+ ell -> air;
+ unrrdu -> biff;
+ push -> nrrd;
+ meet -> seek;
+ coil -> air;
+ ell -> nrrd;
+ bane -> unrrdu;
+ meet -> nrrd;
+ push -> gage;
+ hoover -> biff;
+ bane -> biff;
+ dye -> ell;
+ nrrd -> biff;
+ limn -> ell;
+ meet -> dye;
+ mite -> nrrd;
+ nrrd -> air;
+ mite -> ell;
+ elf -> tijk;
+ ten -> biff;
+ moss -> air;
+ seek -> gage;
+ tijk -> ell;
+ meet -> push;
+ tijk -> nrrd;
+ meet -> alan;
+ ten -> echo;
+ limn -> biff;
+ unrrdu -> nrrd;
+ alan -> ell;
+ limn -> nrrd;
+ coil -> biff;
+ gage -> ell;
+ pull -> ell;
+ seek -> ell;
+ alan -> air;
+ pull -> ten;
+ push -> air;
+ ell -> biff;
+ ten -> dye;
+ meet -> hest;
+ echo -> ell;
+ ten -> ell;
+ meet -> pull;
+ meet -> gage;
+ seek -> air;
+ mite -> limn;
+ hoover -> ell;
+ elf -> limn;
+ limn -> hest;
+ bane -> nrrd;
+ mite -> gage;
+ dye -> biff;
+ unrrdu -> air;
+ pull -> limn;
+ moss -> hest;
+ gage -> air;
+ meet -> air;
+ hest -> air;
+ echo -> limn;
+ biff -> air;
+ meet -> echo;
+ elf -> ten;
+ seek -> hest;
+ meet -> coil;
+ push -> ell;
+ mite -> air;
+ meet -> mite;
+ gage -> nrrd;
+ mite -> ten;
+ push -> biff;
+ moss -> biff;
+ meet -> tijk;
+ ten -> gage;
+ echo -> nrrd;
+ gage -> biff;
+ coil -> ell;
+ moss -> nrrd;
+ limn -> gage;
+ tijk -> air;
+ hoover -> air;
+ moss -> ell;
+ meet -> ten;
+ limn -> air;
+ echo -> biff;
+ hoover -> limn;
+ meet -> bane;
+ coil -> ten;
+ bane -> gage;
+ meet -> ell;
+ pull -> gage;
+ unrrdu -> hest;
+ hoover -> nrrd;
+ meet -> unrrdu;
+ nrrd -> hest;
+ dye -> air;
+ mite -> hoover;
+ push -> ten;
+ bane -> air;
+ ten -> nrrd;
+ alan -> nrrd;
+ seek -> limn;
+ seek -> biff;
+ alan -> biff;
+ meet -> moss;
+ ten -> unrrdu;
+ elf -> ell;
+ elf -> nrrd;
+ elf -> air;
+ seek -> nrrd;
+ pull -> air;
+ echo -> air;
+ pull -> hest;
+ limn -> unrrdu;
+ meet -> hoover;
+ coil -> nrrd;
+ meet -> limn;
+ meet -> biff;
+ pull -> biff;
+ }
Added: teemdoc/trunk/html/img/graph/save/teem-graph-166159-6.gif
===================================================================
(Binary files differ)
Index: teemdoc/trunk/html/img/graph/save/teem-graph-166159-6.gif
===================================================================
--- teemdoc/trunk/html/img/graph/save/teem-graph-166159-6.gif 2023-07-17 15:43:00 UTC (rev 7122)
+++ teemdoc/trunk/html/img/graph/save/teem-graph-166159-6.gif 2023-07-19 17:07:26 UTC (rev 7123)
Property changes on: teemdoc/trunk/html/img/graph/save/teem-graph-166159-6.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: teemdoc/trunk/html/img/graph/save/teem-graph-166451-4.dot
===================================================================
--- teemdoc/trunk/html/img/graph/save/teem-graph-166451-4.dot (rev 0)
+++ teemdoc/trunk/html/img/graph/save/teem-graph-166451-4.dot 2023-07-19 17:07:26 UTC (rev 7123)
@@ -0,0 +1,138 @@
+// The info here was randomized w/ seed 4
+digraph G {
+ concentrate=true;
+ remincross=true;
+ searchsize=30000;
+ ranksep=1.0;
+ mclimit=0.2;
+ { rank = same; unrrdu; ell }
+ { rank = same; moss; gage; dye; alan; tijk }
+ { rank = same; limn; bane }
+ { rank = same; seek; hoover; echo }
+ { rank = same; mite; push; coil; pull }
+
+ hoover -> air;
+ pull -> ell;
+ echo -> limn;
+ limn -> hest;
+ ten -> unrrdu;
+ limn -> unrrdu;
+ ell -> nrrd;
+ meet -> seek;
+ meet -> coil;
+ mite -> ten;
+ pull -> hest;
+ meet -> unrrdu;
+ unrrdu -> air;
+ mite -> limn;
+ bane -> unrrdu;
+ meet -> ell;
+ ten -> ell;
+ meet -> dye;
+ meet -> bane;
+ ten -> nrrd;
+ meet -> echo;
+ meet -> limn;
+ push -> air;
+ bane -> gage;
+ unrrdu -> biff;
+ mite -> biff;
+ seek -> ell;
+ meet -> hest;
+ unrrdu -> nrrd;
+ ten -> air;
+ bane -> biff;
+ echo -> ell;
+ alan -> air;
+ biff -> air;
+ push -> ten;
+ pull -> air;
+ meet -> tijk;
+ moss -> biff;
+ ten -> dye;
+ moss -> hest;
+ hoover -> ell;
+ meet -> alan;
+ seek -> hest;
+ push -> gage;
+ push -> nrrd;
+ ten -> gage;
+ ell -> air;
+ mite -> nrrd;
+ pull -> ten;
+ gage -> air;
+ alan -> biff;
+ mite -> ell;
+ moss -> ell;
+ meet -> push;
+ seek -> nrrd;
+ hoover -> limn;
+ ell -> biff;
+ ten -> echo;
+ limn -> biff;
+ seek -> limn;
+ echo -> air;
+ pull -> gage;
+ elf -> limn;
+ seek -> biff;
+ gage -> nrrd;
+ pull -> nrrd;
+ seek -> gage;
+ tijk -> ell;
+ push -> biff;
+ alan -> ell;
+ limn -> air;
+ coil -> nrrd;
+ bane -> nrrd;
+ push -> ell;
+ ten -> biff;
+ bane -> air;
+ dye -> ell;
+ gage -> biff;
+ coil -> air;
+ seek -> air;
+ meet -> mite;
+ meet -> biff;
+ nrrd -> air;
+ moss -> nrrd;
+ tijk -> air;
+ mite -> gage;
+ nrrd -> biff;
+ elf -> nrrd;
+ meet -> air;
+ ten -> limn;
+ dye -> air;
+ moss -> air;
+ meet -> pull;
+ mite -> hoover;
+ echo -> nrrd;
+ echo -> biff;
+ coil -> ten;
+ meet -> moss;
+ dye -> biff;
+ meet -> elf;
+ tijk -> nrrd;
+ meet -> nrrd;
+ meet -> ten;
+ pull -> limn;
+ elf -> tijk;
+ elf -> ell;
+ limn -> ell;
+ gage -> ell;
+ elf -> ten;
+ hoover -> nrrd;
+ meet -> hoover;
+ limn -> gage;
+ pull -> biff;
+ nrrd -> hest;
+ elf -> air;
+ alan -> nrrd;
+ limn -> nrrd;
+ coil -> ell;
+ unrrdu -> hest;
+ hoover -> biff;
+ mite -> air;
+ hest -> air;
+ coil -> biff;
+ meet -> gage;
+ }
Added: teemdoc/trunk/html/img/graph/save/teem-graph-166451-4.gif
===================================================================
(Binary files differ)
Index: teemdoc/trunk/html/img/graph/save/teem-graph-166451-4.gif
===================================================================
--- teemdoc/trunk/html/img/graph/save/teem-graph-166451-4.gif 2023-07-17 15:43:00 UTC (rev 7122)
+++ teemdoc/trunk/html/img/graph/save/teem-graph-166451-4.gif 2023-07-19 17:07:26 UTC (rev 7123)
Property changes on: teemdoc/trunk/html/img/graph/save/teem-graph-166451-4.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: teemdoc/trunk/html/img/graph/save/teem-graph-166508-1.dot
===================================================================
--- teemdoc/trunk/html/img/graph/save/teem-graph-166508-1.dot (rev 0)
+++ teemdoc/trunk/html/img/graph/save/teem-graph-166508-1.dot 2023-07-19 17:07:26 UTC (rev 7123)
@@ -0,0 +1,138 @@
+// The info here was randomized w/ seed 1
+digraph G {
+ concentrate=true;
+ remincross=true;
+ searchsize=30000;
+ ranksep=1.0;
+ mclimit=0.2;
+ { rank = same; unrrdu; ell }
+ { rank = same; moss; gage; dye; alan; tijk }
+ { rank = same; limn; bane }
+ { rank = same; seek; hoover; echo }
+ { rank = same; mite; push; coil; pull }
+
+ limn -> biff;
+ push -> ten;
+ coil -> biff;
+ bane -> gage;
+ pull -> air;
+ ten -> ell;
+ meet -> seek;
+ mite -> nrrd;
+ seek -> hest;
+ meet -> dye;
+ meet -> limn;
+ push -> nrrd;
+ tijk -> nrrd;
+ seek -> nrrd;
+ mite -> air;
+ limn -> hest;
+ nrrd -> hest;
+ unrrdu -> air;
+ elf -> ell;
+ mite -> ell;
+ meet -> gage;
+ mite -> hoover;
+ dye -> ell;
+ echo -> biff;
+ seek -> ell;
+ bane -> biff;
+ push -> air;
+ ten -> limn;
+ elf -> ten;
+ hoover -> limn;
+ pull -> gage;
+ pull -> nrrd;
+ coil -> ten;
+ push -> gage;
+ echo -> nrrd;
+ ten -> unrrdu;
+ limn -> gage;
+ alan -> air;
+ dye -> air;
+ tijk -> air;
+ elf -> limn;
+ meet -> biff;
+ mite -> gage;
+ meet -> ell;
+ gage -> air;
+ gage -> nrrd;
+ meet -> mite;
+ meet -> unrrdu;
+ meet -> nrrd;
+ meet -> air;
+ meet -> moss;
+ ell -> air;
+ biff -> air;
+ mite -> biff;
+ bane -> air;
+ gage -> biff;
+ limn -> ell;
+ dye -> biff;
+ seek -> gage;
+ alan -> biff;
+ elf -> nrrd;
+ limn -> nrrd;
+ moss -> air;
+ meet -> echo;
+ moss -> hest;
+ meet -> ten;
+ meet -> coil;
+ limn -> air;
+ moss -> ell;
+ meet -> tijk;
+ ten -> nrrd;
+ moss -> biff;
+ meet -> pull;
+ hoover -> nrrd;
+ bane -> nrrd;
+ hoover -> air;
+ meet -> alan;
+ ten -> gage;
+ tijk -> ell;
+ ten -> dye;
+ hoover -> ell;
+ gage -> ell;
+ ell -> nrrd;
+ hest -> air;
+ alan -> ell;
+ pull -> ten;
+ ten -> air;
+ mite -> limn;
+ limn -> unrrdu;
+ nrrd -> biff;
+ unrrdu -> biff;
+ push -> biff;
+ hoover -> biff;
+ seek -> air;
+ ten -> echo;
+ pull -> limn;
+ echo -> air;
+ bane -> unrrdu;
+ meet -> elf;
+ pull -> hest;
+ seek -> limn;
+ coil -> nrrd;
+ elf -> air;
+ moss -> nrrd;
+ ten -> biff;
+ meet -> push;
+ push -> ell;
+ alan -> nrrd;
+ meet -> hoover;
+ seek -> biff;
+ unrrdu -> nrrd;
+ elf -> tijk;
+ nrrd -> air;
+ coil -> air;
+ meet -> hest;
+ ell -> biff;
+ pull -> biff;
+ echo -> limn;
+ unrrdu -> hest;
+ pull -> ell;
+ meet -> bane;
+ echo -> ell;
+ mite -> ten;
+ coil -> ell;
+ }
Added: teemdoc/trunk/html/img/graph/save/teem-graph-166508-1.gif
===================================================================
(Binary files differ)
Index: teemdoc/trunk/html/img/graph/save/teem-graph-166508-1.gif
===================================================================
--- teemdoc/trunk/html/img/graph/save/teem-graph-166508-1.gif 2023-07-17 15:43:00 UTC (rev 7122)
+++ teemdoc/trunk/html/img/graph/save/teem-graph-166508-1.gif 2023-07-19 17:07:26 UTC (rev 7123)
Property changes on: teemdoc/trunk/html/img/graph/save/teem-graph-166508-1.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: teemdoc/trunk/html/img/graph/save/teem-graph-168246-0.dot
===================================================================
--- teemdoc/trunk/html/img/graph/save/teem-graph-168246-0.dot (rev 0)
+++ teemdoc/trunk/html/img/graph/save/teem-graph-168246-0.dot 2023-07-19 17:07:26 UTC (rev 7123)
@@ -0,0 +1,138 @@
+// The info here was randomized w/ seed 0
+digraph G {
+ concentrate=true;
+ remincross=true;
+ searchsize=30000;
+ ranksep=1.0;
+ mclimit=0.2;
+ { rank = same; unrrdu; ell }
+ { rank = same; moss; gage; dye; alan; tijk }
+ { rank = same; limn; bane }
+ { rank = same; seek; hoover; echo }
+ { rank = same; mite; push; coil; pull }
+
+ unrrdu -> nrrd;
+ limn -> unrrdu;
+ moss -> nrrd;
+ meet -> hest;
+ meet -> gage;
+ nrrd -> hest;
+ unrrdu -> air;
+ pull -> air;
+ meet -> mite;
+ gage -> ell;
+ ell -> biff;
+ meet -> echo;
+ mite -> hoover;
+ meet -> seek;
+ push -> air;
+ alan -> ell;
+ coil -> ell;
+ mite -> nrrd;
+ meet -> unrrdu;
+ echo -> nrrd;
+ push -> biff;
+ pull -> hest;
+ hoover -> nrrd;
+ gage -> nrrd;
+ alan -> nrrd;
+ seek -> gage;
+ nrrd -> biff;
+ ten -> ell;
+ seek -> hest;
+ dye -> biff;
+ meet -> bane;
+ pull -> gage;
+ meet -> alan;
+ meet -> ell;
+ moss -> air;
+ meet -> tijk;
+ meet -> biff;
+ dye -> air;
+ seek -> limn;
+ dye -> ell;
+ moss -> ell;
+ meet -> elf;
+ pull -> limn;
+ limn -> nrrd;
+ limn -> ell;
+ mite -> gage;
+ limn -> hest;
+ ten -> echo;
+ nrrd -> air;
+ meet -> air;
+ bane -> nrrd;
+ meet -> limn;
+ meet -> ten;
+ unrrdu -> hest;
+ alan -> air;
+ elf -> air;
+ tijk -> ell;
+ ten -> dye;
+ pull -> nrrd;
+ pull -> ell;
+ ten -> nrrd;
+ push -> nrrd;
+ coil -> biff;
+ hoover -> air;
+ mite -> biff;
+ echo -> biff;
+ limn -> gage;
+ ell -> air;
+ ten -> unrrdu;
+ meet -> moss;
+ tijk -> nrrd;
+ ell -> nrrd;
+ meet -> dye;
+ mite -> limn;
+ elf -> ell;
+ moss -> biff;
+ echo -> limn;
+ alan -> biff;
+ meet -> hoover;
+ gage -> biff;
+ moss -> hest;
+ elf -> limn;
+ limn -> biff;
+ hest -> air;
+ seek -> nrrd;
+ elf -> tijk;
+ bane -> biff;
+ ten -> gage;
+ biff -> air;
+ hoover -> ell;
+ elf -> nrrd;
+ tijk -> air;
+ pull -> biff;
+ echo -> ell;
+ mite -> air;
+ coil -> air;
+ seek -> air;
+ limn -> air;
+ unrrdu -> biff;
+ echo -> air;
+ elf -> ten;
+ push -> ell;
+ pull -> ten;
+ bane -> unrrdu;
+ mite -> ten;
+ coil -> nrrd;
+ meet -> pull;
+ mite -> ell;
+ gage -> air;
+ ten -> air;
+ coil -> ten;
+ meet -> nrrd;
+ seek -> biff;
+ meet -> push;
+ ten -> biff;
+ seek -> ell;
+ bane -> air;
+ push -> gage;
+ hoover -> limn;
+ ten -> limn;
+ bane -> gage;
+ hoover -> biff;
+ push -> ten;
+ meet -> coil;
+ }
Added: teemdoc/trunk/html/img/graph/save/teem-graph-168246-0.gif
===================================================================
(Binary files differ)
Index: teemdoc/trunk/html/img/graph/save/teem-graph-168246-0.gif
===================================================================
--- teemdoc/trunk/html/img/graph/save/teem-graph-168246-0.gif 2023-07-17 15:43:00 UTC (rev 7122)
+++ teemdoc/trunk/html/img/graph/save/teem-graph-168246-0.gif 2023-07-19 17:07:26 UTC (rev 7123)
Property changes on: teemdoc/trunk/html/img/graph/save/teem-graph-168246-0.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: teemdoc/trunk/html/img/graph/save/teem-graph-complete.dot
===================================================================
--- teemdoc/trunk/html/img/graph/save/teem-graph-complete.dot (rev 0)
+++ teemdoc/trunk/html/img/graph/save/teem-graph-complete.dot 2023-07-19 17:07:26 UTC (rev 7123)
@@ -0,0 +1,157 @@
+# TEEM_LIB_LIST
+digraph G {
+ concentrate=true;
+ remincross=true;
+ searchsize=30000;
+ { rank = same; unrrdu; ell }
+ { rank = same; moss; gage; dye; alan; tijk }
+ { rank = same; limn; bane }
+ { rank = same; seek; hoover; echo }
+ { rank = same; mite; push; coil; pull }
+
+ hest -> air;
+
+ biff -> air;
+
+ nrrd -> biff;
+ nrrd -> hest;
+ nrrd -> air;
+
+ ell -> nrrd;
+ ell -> biff;
+ ell -> air;
+
+ unrrdu -> nrrd;
+ unrrdu -> biff;
+ unrrdu -> hest;
+ unrrdu -> air;
+
+ alan -> nrrd;
+ alan -> ell;
+ alan -> biff;
+ alan -> air;
+
+ moss -> ell;
+ moss -> nrrd;
+ moss -> biff;
+ moss -> hest;
+ moss -> air;
+
+ tijk -> ell;
+ tijk -> nrrd;
+ tijk -> air;
+
+ gage -> ell;
+ gage -> nrrd;
+ gage -> biff;
+ gage -> air;
+
+ dye -> ell;
+ dye -> biff;
+ dye -> air;
+
+ bane -> gage;
+ bane -> unrrdu;
+ bane -> nrrd;
+ bane -> biff;
+ bane -> air;
+
+ limn -> gage;
+ limn -> ell;
+ limn -> unrrdu;
+ limn -> nrrd;
+ limn -> biff;
+ limn -> hest;
+ limn -> air;
+
+ echo -> limn;
+ echo -> ell;
+ echo -> nrrd;
+ echo -> biff;
+ echo -> air;
+
+ hoover -> limn;
+ hoover -> ell;
+ hoover -> nrrd;
+ hoover -> biff;
+ hoover -> air;
+
+ seek -> limn;
+ seek -> gage;
+ seek -> ell;
+ seek -> nrrd;
+ seek -> biff;
+ seek -> hest;
+ seek -> air;
+
+ ten -> echo;
+ ten -> limn;
+ ten -> dye;
+ ten -> gage;
+ ten -> unrrdu;
+ ten -> ell;
+ ten -> nrrd;
+ ten -> biff;
+ ten -> air;
+
+ elf -> ten;
+ elf -> tijk;
+ elf -> limn;
+ elf -> ell;
+ elf -> nrrd;
+ elf -> air;
+
+ pull -> ten;
+ pull -> limn;
+ pull -> gage;
+ pull -> ell;
+ pull -> nrrd;
+ pull -> biff;
+ pull -> hest;
+ pull -> air;
+
+ coil -> ten;
+ coil -> ell;
+ coil -> nrrd;
+ coil -> biff;
+ coil -> air;
+
+ push -> air;
+ push -> biff;
+ push -> nrrd;
+ push -> ell;
+ push -> gage;
+ push -> ten;
+
+ mite -> ten;
+ mite -> hoover;
+ mite -> limn;
+ mite -> gage;
+ mite -> ell;
+ mite -> nrrd;
+ mite -> biff;
+ mite -> air;
+
+ meet -> mite;
+ meet -> push;
+ meet -> coil;
+ meet -> pull;
+ meet -> elf;
+ meet -> ten;
+ meet -> seek;
+ meet -> hoover;
+ meet -> echo;
+ meet -> limn;
+ meet -> bane;
+ meet -> dye;
+ meet -> gage;
+ meet -> tijk;
+ meet -> moss;
+ meet -> alan;
+ meet -> unrrdu;
+ meet -> ell;
+ meet -> nrrd;
+ meet -> biff;
+ meet -> hest;
+ meet -> air;
+ }
Added: teemdoc/trunk/html/img/graph/save/teem-graph-good.dot
===================================================================
--- teemdoc/trunk/html/img/graph/save/teem-graph-good.dot (rev 0)
+++ teemdoc/trunk/html/img/graph/save/teem-graph-good.dot 2023-07-19 17:07:26 UTC (rev 7123)
@@ -0,0 +1,234 @@
+digraph G {
+ concentrate=true;
+ mclimit=0.1;
+ nslimit=10000;
+ nslimit1=10000;
+ remincross=true;
+ searchsize=3000000;
+ ratio=compress;
+ nodesep=0.2;
+ ten -> ell;
+
+ coil -> nrrd;
+
+ seek -> hest;
+
+ ten -> nrrd;
+
+ push -> gage;
+
+ nrrd -> biff;
+
+ limn -> ell;
+
+ push -> ell;
+
+ mite -> hoover;
+
+ hoover -> ell;
+
+ ten -> echo;
+
+ meet -> gage;
+
+ echo -> air;
+
+ limn -> nrrd;
+
+ meet -> ell;
+
+ unrrdu -> biff;
+
+ ten -> dye;
+
+ alan -> biff;
+
+ limn -> air;
+
+ gage -> air;
+
+ coil -> air;
+
+ hoover -> biff;
+
+ ten -> unrrdu;
+
+ meet -> biff;
+
+ ten -> air;
+
+ bane -> air;
+
+ seek -> gage;
+
+ pull -> air;
+
+ seek -> biff;
+
+ moss -> air;
+
+ unrrdu -> air;
+
+ meet -> push;
+
+ coil -> biff;
+
+ pull -> biff;
+
+ meet -> seek;
+
+ mite -> ell;
+
+ meet -> alan;
+
+ biff -> air;
+
+ seek -> nrrd;
+
+ seek -> limn;
+
+ ten -> limn;
+
+ pull -> nrrd;
+
+ echo -> nrrd;
+
+ nrrd -> air;
+
+ pull -> limn;
+
+ mite -> ten;
+
+ bane -> gage;
+
+ hoover -> limn;
+
+ ten -> biff;
+
+ meet -> hoover;
+
+ ell -> air;
+
+ meet -> moss;
+
+ pull -> gage;
+
+ gage -> biff;
+
+ dye -> ell;
+
+ meet -> hest;
+
+ gage -> ell;
+
+ hest -> air;
+
+ mite -> limn;
+
+ echo -> limn;
+
+ meet -> ten;
+
+ meet -> limn;
+
+ moss -> hest;
+
+ alan -> air;
+
+ alan -> nrrd;
+
+ nrrd -> hest;
+
+ bane -> biff;
+
+ echo -> biff;
+
+ dye -> biff;
+
+ mite -> gage;
+
+ meet -> dye;
+
+ limn -> unrrdu;
+
+ push -> biff;
+
+ mite -> air;
+
+ hoover -> air;
+
+ meet -> coil;
+
+ push -> nrrd;
+
+ bane -> nrrd;
+
+ bane -> unrrdu;
+
+ pull -> ten;
+
+ hoover -> nrrd;
+
+ coil -> ten;
+
+ alan -> ell;
+
+ dye -> air;
+
+ moss -> ell;
+
+ limn -> hest;
+
+ unrrdu -> hest;
+
+ mite -> biff;
+
+ ten -> gage;
+
+ moss -> biff;
+
+ push -> ten;
+
+ meet -> mite;
+
+ limn -> gage;
+
+ limn -> biff;
+
+ mite -> nrrd;
+
+ meet -> pull;
+
+ meet -> unrrdu;
+
+ pull -> ell;
+
+ push -> air;
+
+ meet -> nrrd;
+
+ echo -> ell;
+
+ meet -> air;
+
+ meet -> echo;
+
+ moss -> nrrd;
+
+ gage -> nrrd;
+
+ seek -> ell;
+
+ ell -> nrrd;
+
+ ell -> biff;
+
+ coil -> ell;
+
+ seek -> air;
+
+ meet -> bane;
+
+ unrrdu -> nrrd;
+
+ }
Added: teemdoc/trunk/html/img/graph/save/teem-graph-start.dot
===================================================================
--- teemdoc/trunk/html/img/graph/save/teem-graph-start.dot (rev 0)
+++ teemdoc/trunk/html/img/graph/save/teem-graph-start.dot 2023-07-19 17:07:26 UTC (rev 7123)
@@ -0,0 +1,115 @@
+digraph G {
+ hest -> air;
+ biff -> air;
+ nrrd -> biff;
+ nrrd -> hest;
+ nrrd -> air;
+ ell -> nrrd;
+ ell -> biff;
+ ell -> air;
+ unrrdu -> nrrd;
+ unrrdu -> biff;
+ unrrdu -> hest;
+ unrrdu -> air;
+ dye -> ell;
+ dye -> biff;
+ dye -> air;
+ moss -> ell;
+ moss -> nrrd;
+ moss -> biff;
+ moss -> hest;
+ moss -> air;
+ alan -> air;
+ alan -> biff;
+ alan -> ell;
+ alan -> nrrd;
+ gage -> ell;
+ gage -> nrrd;
+ gage -> biff;
+ gage -> air;
+ bane -> gage;
+ bane -> unrrdu;
+ bane -> nrrd;
+ bane -> biff;
+ bane -> air;
+ limn -> gage;
+ limn -> ell;
+ limn -> unrrdu;
+ limn -> nrrd;
+ limn -> biff;
+ limn -> hest;
+ limn -> air;
+ seek -> gage;
+ seek -> limn;
+ seek -> ell;
+ seek -> nrrd;
+ seek -> biff;
+ seek -> hest;
+ seek -> air;
+ hoover -> limn;
+ hoover -> ell;
+ hoover -> nrrd;
+ hoover -> biff;
+ hoover -> air;
+ echo -> limn;
+ echo -> ell;
+ echo -> nrrd;
+ echo -> biff;
+ echo -> air;
+ ten -> echo;
+ ten -> limn;
+ ten -> gage;
+ ten -> dye;
+ ten -> unrrdu;
+ ten -> ell;
+ ten -> nrrd;
+ ten -> biff;
+ ten -> air;
+ mite -> ten;
+ mite -> hoover;
+ mite -> limn;
+ mite -> gage;
+ mite -> ell;
+ mite -> nrrd;
+ mite -> biff;
+ mite -> air;
+ coil -> ten;
+ coil -> ell;
+ coil -> nrrd;
+ coil -> biff;
+ coil -> air;
+ push -> ten;
+ push -> gage;
+ push -> ell;
+ push -> nrrd;
+ push -> biff;
+ push -> air;
+ pull -> ten;
+ pull -> limn;
+ pull -> gage;
+ pull -> ell;
+ pull -> nrrd;
+ pull -> biff;
+ pull -> hest;
+ pull -> air;
+ meet -> air;
+ meet -> hest;
+ meet -> biff;
+ meet -> nrrd;
+ meet -> ell;
+ meet -> unrrdu;
+ meet -> dye;
+ meet -> moss;
+ meet -> alan;
+ meet -> gage;
+ meet -> bane;
+ meet -> limn;
+ meet -> seek;
+ meet -> hoover;
+ meet -> echo;
+ meet -> ten;
+ meet -> mite;
+ meet -> coil;
+ meet -> push;
+ meet -> pull;
+}
Added: teemdoc/trunk/html/img/graph/save/teem-graph.dot
===================================================================
--- teemdoc/trunk/html/img/graph/save/teem-graph.dot (rev 0)
+++ teemdoc/trunk/html/img/graph/save/teem-graph.dot 2023-07-19 17:07:26 UTC (rev 7123)
@@ -0,0 +1,138 @@
+// The info here was randomized w/ seed 2413
+digraph G {
+ concentrate=true;
+ remincross=true;
+ searchsize=30000;
+ ranksep=1.0;
+ mclimit=0.5;
+ { rank = same; unrrdu; ell }
+ { rank = same; moss; gage; dye; alan; tijk }
+ { rank = same; limn; bane }
+ { rank = same; seek; hoover; echo }
+ { rank = same; mite; push; coil; pull }
+
+ seek -> hest;
+ coil -> biff;
+ meet -> bane;
+ meet -> moss;
+ push -> biff;
+ pull -> air;
+ gage -> biff;
+ elf -> nrrd;
+ bane -> air;
+ meet -> dye;
+ ten -> ell;
+ moss -> air;
+ meet -> tijk;
+ push -> ten;
+ pull -> hest;
+ hest -> air;
+ meet -> elf;
+ echo -> nrrd;
+ meet -> limn;
+ meet -> hest;
+ bane -> unrrdu;
+ push -> gage;
+ elf -> ten;
+ limn -> ell;
+ hoover -> nrrd;
+ echo -> biff;
+ seek -> limn;
+ meet -> pull;
+ unrrdu -> air;
+ mite -> hoover;
+ mite -> limn;
+ hoover -> air;
+ tijk -> air;
+ ell -> biff;
+ bane -> biff;
+ meet -> coil;
+ mite -> biff;
+ ten -> gage;
+ coil -> air;
+ gage -> nrrd;
+ ten -> unrrdu;
+ gage -> air;
+ elf -> ell;
+ limn -> unrrdu;
+ pull -> limn;
+ ell -> air;
+ pull -> ten;
+ elf -> air;
+ tijk -> ell;
+ hoover -> ell;
+ ten -> echo;
+ dye -> air;
+ bane -> nrrd;
+ hoover -> limn;
+ biff -> air;
+ unrrdu -> biff;
+ alan -> ell;
+ ell -> nrrd;
+ push -> ell;
+ moss -> hest;
+ meet -> ell;
+ unrrdu -> nrrd;
+ alan -> biff;
+ push -> nrrd;
+ hoover -> biff;
+ moss -> ell;
+ seek -> gage;
+ seek -> air;
+ limn -> gage;
+ seek -> nrrd;
+ elf -> tijk;
+ mite -> ten;
+ coil -> nrrd;
+ limn -> biff;
+ echo -> air;
+ meet -> seek;
+ mite -> nrrd;
+ elf -> limn;
+ pull -> gage;
+ echo -> ell;
+ ten -> biff;
+ nrrd -> biff;
+ dye -> biff;
+ limn -> air;
+ meet -> nrrd;
+ pull -> ell;
+ mite -> ell;
+ dye -> ell;
+ gage -> ell;
+ ten -> limn;
+ ten -> nrrd;
+ meet -> push;
+ coil -> ell;
+ ten -> dye;
+ echo -> limn;
+ tijk -> nrrd;
+ ten -> air;
+ mite -> gage;
+ meet -> hoover;
+ nrrd -> air;
+ meet -> ten;
+ nrrd -> hest;
+ bane -> gage;
+ alan -> nrrd;
+ meet -> unrrdu;
+ pull -> nrrd;
+ seek -> ell;
+ limn -> hest;
+ meet -> alan;
+ pull -> biff;
+ coil -> ten;
+ meet -> echo;
+ moss -> nrrd;
+ mite -> air;
+ moss -> biff;
+ meet -> biff;
+ meet -> mite;
+ meet -> air;
+ push -> air;
+ unrrdu -> hest;
+ alan -> air;
+ meet -> gage;
+ limn -> nrrd;
+ seek -> biff;
+ }
Added: teemdoc/trunk/html/img/graph/save/teem-graph.gif
===================================================================
(Binary files differ)
Index: teemdoc/trunk/html/img/graph/save/teem-graph.gif
===================================================================
--- teemdoc/trunk/html/img/graph/save/teem-graph.gif 2023-07-17 15:43:00 UTC (rev 7122)
+++ teemdoc/trunk/html/img/graph/save/teem-graph.gif 2023-07-19 17:07:26 UTC (rev 7123)
Property changes on: teemdoc/trunk/html/img/graph/save/teem-graph.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: teemdoc/trunk/html/img/graph/save/teem-rgraph-35977-0.dot
===================================================================
--- teemdoc/trunk/html/img/graph/save/teem-rgraph-35977-0.dot (rev 0)
+++ teemdoc/trunk/html/img/graph/save/teem-rgraph-35977-0.dot 2023-07-19 17:07:26 UTC (rev 7123)
@@ -0,0 +1,49 @@
+// The info here was randomized w/ seed 0
+digraph G {
+ concentrate=true;
+ remincross=true;
+ searchsize=30000;
+ mclimit=0.2;
+ { rank = same; unrrdu; ell }
+ { rank = same; moss; gage; dye; alan; tijk }
+ { rank = same; limn; bane }
+ { rank = same; seek; hoover; echo }
+ { rank = same; mite; push; coil; pull }
+
+ unrrdu -> nrrd;
+ gage -> ell;
+ nrrd -> hest;
+ nrrd -> biff;
+ bane -> unrrdu;
+ moss -> ell;
+ elf -> tijk;
+ limn -> unrrdu;
+ seek -> limn;
+ meet -> mite;
+ ell -> nrrd;
+ biff -> air;
+ meet -> alan;
+ ten -> echo;
+ bane -> gage;
+ dye -> ell;
+ meet -> pull;
+ meet -> coil;
+ hest -> air;
+ pull -> ten;
+ alan -> ell;
+ meet -> moss;
+ coil -> ten;
+ tijk -> ell;
+ meet -> elf;
+ meet -> bane;
+ mite -> ten;
+ echo -> limn;
+ meet -> push;
+ ten -> dye;
+ hoover -> limn;
+ push -> ten;
+ limn -> gage;
+ mite -> hoover;
+ elf -> ten;
+ meet -> seek;
+ }
Added: teemdoc/trunk/html/img/graph/save/teem-rgraph-35977-0.gif
===================================================================
(Binary files differ)
Index: teemdoc/trunk/html/img/graph/save/teem-rgraph-35977-0.gif
===================================================================
--- teemdoc/trunk/html/img/graph/save/teem-rgraph-35977-0.gif 2023-07-17 15:43:00 UTC (rev 7122)
+++ teemdoc/trunk/html/img/graph/save/teem-rgraph-35977-0.gif 2023-07-19 17:07:26 UTC (rev 7123)
Property changes on: teemdoc/trunk/html/img/graph/save/teem-rgraph-35977-0.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: teemdoc/trunk/html/img/graph/save/teem-rgraph.dot
===================================================================
--- teemdoc/trunk/html/img/graph/save/teem-rgraph.dot (rev 0)
+++ teemdoc/trunk/html/img/graph/save/teem-rgraph.dot 2023-07-19 17:07:26 UTC (rev 7123)
@@ -0,0 +1,48 @@
+// The info here was randomized w/ seed 0
+digraph G {
+ concentrate=true;
+ remincross=true;
+ searchsize=30000;
+ { rank = same; unrrdu; ell }
+ { rank = same; moss; gage; dye; alan; tijk }
+ { rank = same; limn; bane }
+ { rank = same; seek; hoover; echo }
+ { rank = same; mite; push; coil; pull }
+
+ unrrdu -> nrrd;
+ gage -> ell;
+ nrrd -> hest;
+ nrrd -> biff;
+ bane -> unrrdu;
+ moss -> ell;
+ elf -> tijk;
+ limn -> unrrdu;
+ seek -> limn;
+ meet -> mite;
+ ell -> nrrd;
+ biff -> air;
+ meet -> alan;
+ ten -> echo;
+ bane -> gage;
+ dye -> ell;
+ meet -> pull;
+ meet -> coil;
+ hest -> air;
+ pull -> ten;
+ alan -> ell;
+ meet -> moss;
+ coil -> ten;
+ tijk -> ell;
+ meet -> elf;
+ meet -> bane;
+ mite -> ten;
+ echo -> limn;
+ meet -> push;
+ ten -> dye;
+ hoover -> limn;
+ push -> ten;
+ limn -> gage;
+ mite -> hoover;
+ elf -> ten;
+ meet -> seek;
+ }
Added: teemdoc/trunk/html/img/graph/save/tmp-graph.gif
===================================================================
Added: teemdoc/trunk/html/img/graph/save/tmp-info.dot
===================================================================
--- teemdoc/trunk/html/img/graph/save/tmp-info.dot (rev 0)
+++ teemdoc/trunk/html/img/graph/save/tmp-info.dot 2023-07-19 17:07:26 UTC (rev 7123)
@@ -0,0 +1,49 @@
+// The info here was randomized w/ seed 154
+digraph G {
+ concentrate=true;
+ remincross=true;
+ searchsize=30000;
+ mclimit=0.2;
+ { rank = same; unrrdu; ell }
+ { rank = same; moss; gage; dye; alan; tijk }
+ { rank = same; limn; bane }
+ { rank = same; seek; hoover; echo }
+ { rank = same; mite; push; coil; pull }
+
+ hoover -> limn;
+ meet -> elf;
+ seek -> limn;
+ gage -> ell;
+ mite -> ten;
+ ell -> nrrd;
+ elf -> tijk;
+ dye -> ell;
+ elf -> ten;
+ meet -> bane;
+ mite -> hoover;
+ nrrd -> biff;
+ pull -> ten;
+ meet -> mite;
+ limn -> unrrdu;
+ push -> ten;
+ meet -> pull;
+ moss -> ell;
+ hest -> air;
+ bane -> gage;
+ biff -> air;
+ ten -> echo;
+ meet -> alan;
+ limn -> gage;
+ meet -> seek;
+ tijk -> ell;
+ alan -> ell;
+ nrrd -> hest;
+ meet -> push;
+ bane -> unrrdu;
+ ten -> dye;
+ meet -> moss;
+ echo -> limn;
+ meet -> coil;
+ coil -> ten;
+ unrrdu -> nrrd;
+ }
Added: teemdoc/trunk/html/img/graph/teem-graph-gen.py
===================================================================
--- teemdoc/trunk/html/img/graph/teem-graph-gen.py (rev 0)
+++ teemdoc/trunk/html/img/graph/teem-graph-gen.py 2023-07-19 17:07:26 UTC (rev 7123)
@@ -0,0 +1,72 @@
+import random
+import subprocess
+import os
+import sys
+
+header = """digraph G {
+ concentrate=true;
+ remincross=true;
+ searchsize=30000;
+ rankdir="BT";
+ edge [
+ arrowhead="vee";
+ ]
+"""
+# { rank = same; unrrdu; ell }
+# { rank = same; moss; gage; dye; alan; tijk }
+# { rank = same; limn; bane }
+# { rank = same; seek; hoover; echo }
+# { rank = same; mite; push; coil; pull }
+
+# ranksep=0.5;
+# mclimit=0.1;
+
+
+# needed for the tred graph
+
+
+tailer = """ } """
+
+
+def readlines(fname):
+ ff = open(fname)
+ lines = ff.readlines()
+ ff.close()
+ return lines
+
+
+# print header;
+# print tailer;
+
+origlines = readlines('teem-graph.data')
+outname = 'teem-graph'
+
+# this may actually not be reproducible ...
+sidx = 0
+minidx = sidx
+minsz = 1000000000
+while 1:
+ print(f' {sidx}', end='')
+ sys.stdout.flush()
+ random.seed(sidx)
+ lines = origlines
+ random.shuffle(lines)
+ f = open('tmp-info.dot', 'w')
+ print(f'// The info here was randomized w/ seed {sidx}', file=f)
+ print(header, file=f)
+ for l in lines:
+ print('%s' % l, file=f)
+ print(tailer, file=f)
+ f.close()
+ res = subprocess.run('/usr/local/bin/dot tmp-info.dot -Tgif -o tmp-graph.gif'.split())
+ sz = os.path.getsize('tmp-graph.gif')
+ if sz < minsz:
+ minidx = sidx
+ minsz = sz
+ subprocess.run(f'mv tmp-info.dot {outname}-{sz}-{sidx}.dot'.split())
+ subprocess.run(f'mv tmp-graph.gif {outname}-{sz}-{sidx}.gif'.split())
+ print(f'\n========== {sidx} -> {sz} (previously {minsz}); see {outname}-{sz}-{sidx}.gif')
+ else:
+ # print('(%d)' % sz)
+ pass
+ sidx = sidx + 1
Added: teemdoc/trunk/html/img/graph/teem-graph.data
===================================================================
--- teemdoc/trunk/html/img/graph/teem-graph.data (rev 0)
+++ teemdoc/trunk/html/img/graph/teem-graph.data 2023-07-19 17:07:26 UTC (rev 7123)
@@ -0,0 +1,125 @@
+ hest -> air;
+ biff -> air;
+ nrrd -> biff;
+ nrrd -> hest;
+ nrrd -> air;
+ ell -> nrrd;
+ ell -> biff;
+ ell -> air;
+ unrrdu -> moss;
+ unrrdu -> nrrd;
+ unrrdu -> biff;
+ unrrdu -> hest;
+ unrrdu -> air;
+ alan -> air;
+ alan -> biff;
+ alan -> ell;
+ alan -> nrrd;
+ moss -> ell;
+ moss -> nrrd;
+ moss -> biff;
+ moss -> hest;
+ moss -> air;
+ tijk -> ell;
+ tijk -> nrrd;
+ tijk -> air;
+ gage -> ell;
+ gage -> nrrd;
+ gage -> biff;
+ gage -> air;
+ dye -> ell;
+ dye -> biff;
+ dye -> air;
+ bane -> gage;
+ bane -> unrrdu;
+ bane -> nrrd;
+ bane -> biff;
+ bane -> air;
+ limn -> gage;
+ limn -> ell;
+ limn -> unrrdu;
+ limn -> nrrd;
+ limn -> biff;
+ limn -> hest;
+ limn -> air;
+ echo -> limn;
+ echo -> ell;
+ echo -> nrrd;
+ echo -> biff;
+ echo -> air;
+ hoover -> limn;
+ hoover -> ell;
+ hoover -> nrrd;
+ hoover -> biff;
+ hoover -> air;
+ seek -> limn;
+ seek -> gage;
+ seek -> ell;
+ seek -> nrrd;
+ seek -> biff;
+ seek -> hest;
+ seek -> air;
+ ten -> echo;
+ ten -> limn;
+ ten -> dye;
+ ten -> gage;
+ ten -> unrrdu;
+ ten -> ell;
+ ten -> nrrd;
+ ten -> biff;
+ ten -> air;
+ elf -> ten;
+ elf -> tijk;
+ elf -> limn;
+ elf -> ell;
+ elf -> nrrd;
+ elf -> air;
+ pull -> ten;
+ pull -> limn;
+ pull -> gage;
+ pull -> ell;
+ pull -> nrrd;
+ pull -> biff;
+ pull -> hest;
+ pull -> air;
+ coil -> ten;
+ coil -> ell;
+ coil -> nrrd;
+ coil -> biff;
+ coil -> air;
+ push -> air;
+ push -> biff;
+ push -> nrrd;
+ push -> ell;
+ push -> gage;
+ push -> ten;
+ mite -> ten;
+ mite -> hoover;
+ mite -> limn;
+ mite -> gage;
+ mite -> ell;
+ mite -> nrrd;
+ mite -> biff;
+ mite -> air;
+ meet -> mite;
+ meet -> push;
+ meet -> coil;
+ meet -> pull;
+ meet -> elf;
+ meet -> ten;
+ meet -> seek;
+ meet -> hoover;
+ meet -> echo;
+ ...
[truncated message content] |
|
From: <kin...@us...> - 2023-07-17 15:43:01
|
Revision: 7122
http://sourceforge.net/p/teem/code/7122
Author: kindlmann
Date: 2023-07-17 15:43:00 +0000 (Mon, 17 Jul 2023)
Log Message:
-----------
about these files
Added Paths:
-----------
teem/trunk/python/cffi/cdef/00-README.txt
Added: teem/trunk/python/cffi/cdef/00-README.txt
===================================================================
--- teem/trunk/python/cffi/cdef/00-README.txt (rev 0)
+++ teem/trunk/python/cffi/cdef/00-README.txt 2023-07-17 15:43:00 UTC (rev 7122)
@@ -0,0 +1,12 @@
+The *.h header files in here document Teem's C API for the sake of Python's
+CFFI. They are created by ../build_teem.py (run periodically to stay in synch
+with Teem source), and read by ../exult.py, which passes their contents to
+cffi.ffi.cdef(), so that CFFI can compile its bridge between Python and C.
+
+They differ from the real teem/*.h header files because CFFI's reader does not
+handle #include, most #define's, or most anything else that hinges on the
+pre-processor.
+
+There is no value in editing these files by hand - it will only cause confusion
+by having a mismatch between the real headers and these for declaring the
+Python bindings.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kin...@us...> - 2023-07-17 15:28:05
|
Revision: 7121
http://sourceforge.net/p/teem/code/7121
Author: kindlmann
Date: 2023-07-17 15:28:04 +0000 (Mon, 17 Jul 2023)
Log Message:
-----------
revisiting what to do for Teem v2
Modified Paths:
--------------
teem/trunk/src/TODO.txt
Modified: teem/trunk/src/TODO.txt
===================================================================
--- teem/trunk/src/TODO.txt 2023-07-17 12:01:37 UTC (rev 7120)
+++ teem/trunk/src/TODO.txt 2023-07-17 15:28:04 UTC (rev 7121)
@@ -186,12 +186,12 @@
* for nrrdCropAuto: consider adding some minimum remaining size requirement,
in addition to offset
* why is _nrrdCheck (different than nrrdCheck) public? Should be renamed?
-* now that we the new NrrdBoundarySpec, it should be used, and used
+******* now that we the new NrrdBoundarySpec, it should be used, and used
consistently, throughout Teem; for example remove
nrrdResampleBoundarySet and nrrdResamplePadValueSet and instead use new
nrrdResampleBoundarySpecSet, and consider using NrrdBoundarySpec
inside of NrrdResampleContext
-* The guts of "unu make" have to be made into a function call. Its crazy
+******* The guts of "unu make" have to be made into a function call. Its crazy
to have all those smarts not more generally available.
* Totally insane that nrrdKeyValueGet can return a char* into the Nrrd*,
depending on the value of nrrdStateKeyValueReturnInternalPointers. Really?
@@ -204,7 +204,7 @@
current working directory, it will exist as a file, and hence be opened by
unu as if it was a nrrd, but doing an fread on it will immediately hit EOF
--> quiet quit, and very confusing.
-* unu dice -ff should change from using %d to %u
+******* unu dice -ff should change from using %d to %u (or at least also support %u)
* in unrrdu/make.c, reconsider the nrrdStateVerboseIO++ before, and the
nrrdStateVerboseIO-- after, the calls to nrrdFormatNRRD->read. You can
set environment variable NRRD_STATE_VERBOSE_IO to 0 thinking this will turn
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kin...@us...> - 2023-07-17 12:01:41
|
Revision: 7120
http://sourceforge.net/p/teem/code/7120
Author: kindlmann
Date: 2023-07-17 12:01:37 +0000 (Mon, 17 Jul 2023)
Log Message:
-----------
clarifying comment
Modified Paths:
--------------
teem/trunk/src/dye/methodsDye.c
Modified: teem/trunk/src/dye/methodsDye.c
===================================================================
--- teem/trunk/src/dye/methodsDye.c 2023-07-16 02:38:23 UTC (rev 7119)
+++ teem/trunk/src/dye/methodsDye.c 2023-07-17 12:01:37 UTC (rev 7120)
@@ -38,10 +38,10 @@
"LCH"
};
-/* NB: the creation of dye in 2001 predates the creation of the airEnum in 2002,
- and when this airEnum was added in 2015, bewildered why it wasn't there already,
- GLK forgot that chronology, but that chronology explains why this airEnum isn't
- used more widely within dye. */
+/* NB: the creation of dye in 2001 predates the creation of the airEnum in 2002.
+GLK forgot that chronology when the dyeSpace airEnum was added belatedly in 2015,
+and was bewildered why it wasn't there already. That chronology explains why this
+airEnum isn't used more widely within dye. */
static const char *
_dyeSpaceDesc[DYE_MAX_SPACE+1] = {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kin...@us...> - 2023-07-16 02:38:25
|
Revision: 7119
http://sourceforge.net/p/teem/code/7119
Author: kindlmann
Date: 2023-07-16 02:38:23 +0000 (Sun, 16 Jul 2023)
Log Message:
-----------
syncing with source
Modified Paths:
--------------
teem/trunk/python/cffi/biffdata/alan.csv
teem/trunk/python/cffi/biffdata/bane.csv
teem/trunk/python/cffi/biffdata/echo.csv
teem/trunk/python/cffi/biffdata/gage.csv
teem/trunk/python/cffi/biffdata/limn.csv
teem/trunk/python/cffi/biffdata/nrrd.csv
teem/trunk/python/cffi/biffdata/pull.csv
teem/trunk/python/cffi/biffdata/seek.csv
teem/trunk/python/cffi/biffdata/ten.csv
teem/trunk/python/cffi/cdef/cdef_air.h
teem/trunk/python/cffi/teem.py
Modified: teem/trunk/python/cffi/biffdata/alan.csv
===================================================================
--- teem/trunk/python/cffi/biffdata/alan.csv 2023-07-16 02:37:05 UTC (rev 7118)
+++ teem/trunk/python/cffi/biffdata/alan.csv 2023-07-16 02:38:23 UTC (rev 7119)
@@ -1,7 +1,7 @@
func_name,return_type,error_val(s),mubi,biff_key,filename:linenumber
alanUpdate,int,1,0,alan,alan/coreAlan.c:60
-alanInit,int,1,0,alan,alan/coreAlan.c:103
-alanRun,int,1,0,alan,alan/coreAlan.c:457
+alanInit,int,1,0,alan,alan/coreAlan.c:99
+alanRun,int,1,0,alan,alan/coreAlan.c:453
alanDimensionSet,int,1,0,alan,alan/methodsAlan.c:104
alan2DSizeSet,int,1,0,alan,alan/methodsAlan.c:119
alan3DSizeSet,int,1,0,alan,alan/methodsAlan.c:139
Modified: teem/trunk/python/cffi/biffdata/bane.csv
===================================================================
--- teem/trunk/python/cffi/biffdata/bane.csv 2023-07-16 02:37:05 UTC (rev 7118)
+++ teem/trunk/python/cffi/biffdata/bane.csv 2023-07-16 02:38:23 UTC (rev 7119)
@@ -3,8 +3,8 @@
baneClipAnswer,int,1,0,bane,bane/clip.c:152
baneClipCopy,baneClip *,NULL,0,bane,bane/clip.c:167
baneFindInclusion,int,1,0,bane,bane/hvol.c:87
-baneMakeHVol,int,1,0,bane,bane/hvol.c:250
-baneGKMSHVol,Nrrd *,NULL,0,bane,bane/hvol.c:449
+baneMakeHVol,int,1,0,bane,bane/hvol.c:248
+baneGKMSHVol,Nrrd *,NULL,0,bane,bane/hvol.c:447
baneIncNew,baneInc *,NULL,0,bane,bane/inc.c:251
baneIncAnswer,int,1,0,bane,bane/inc.c:360
baneIncCopy,baneInc *,NULL,0,bane,bane/inc.c:375
@@ -15,10 +15,10 @@
baneRangeAnswer,int,1,0,bane,bane/rangeBane.c:144
baneRawScatterplots,int,1,0,bane,bane/scat.c:26
baneOpacInfo,int,1,0,bane,bane/trnsf.c:29
-bane1DOpacInfoFrom2D,int,1,0,bane,bane/trnsf.c:145
-baneSigmaCalc,int,1,0,bane,bane/trnsf.c:224
-banePosCalc,int,1,0,bane,bane/trnsf.c:255
-baneOpacCalc,int,1,0,bane,bane/trnsf.c:406
+bane1DOpacInfoFrom2D,int,1,0,bane,bane/trnsf.c:144
+baneSigmaCalc,int,1,0,bane,bane/trnsf.c:222
+banePosCalc,int,1,0,bane,bane/trnsf.c:253
+baneOpacCalc,int,1,0,bane,bane/trnsf.c:403
baneInputCheck,int,1,0,bane,bane/valid.c:26
baneHVolCheck,int,1,0,bane,bane/valid.c:64
baneInfoCheck,int,1,0,bane,bane/valid.c:106
Modified: teem/trunk/python/cffi/biffdata/echo.csv
===================================================================
--- teem/trunk/python/cffi/biffdata/echo.csv 2023-07-16 02:37:05 UTC (rev 7118)
+++ teem/trunk/python/cffi/biffdata/echo.csv 2023-07-16 02:38:23 UTC (rev 7119)
@@ -1,4 +1,4 @@
func_name,return_type,error_val(s),mubi,biff_key,filename:linenumber
echoThreadStateInit,int,1,0,echo,echo/renderEcho.c:26
-echoRTRenderCheck,int,1,0,echo,echo/renderEcho.c:136
-echoRTRender,int,1,0,echo,echo/renderEcho.c:411
+echoRTRenderCheck,int,1,0,echo,echo/renderEcho.c:134
+echoRTRender,int,1,0,echo,echo/renderEcho.c:409
Modified: teem/trunk/python/cffi/biffdata/gage.csv
===================================================================
--- teem/trunk/python/cffi/biffdata/gage.csv 2023-07-16 02:37:05 UTC (rev 7118)
+++ teem/trunk/python/cffi/biffdata/gage.csv 2023-07-16 02:38:23 UTC (rev 7119)
@@ -40,6 +40,6 @@
gageUpdate,int,1,0,gage,gage/update.c:313
gageOptimSigSet,int,1,0,gage,gage/optimsig.c:217
gageOptimSigContextNew,gageOptimSigContext *,NULL,0,gage,gage/optimsig.c:311
-gageOptimSigCalculate,int,1,0,gage,gage/optimsig.c:1092
-gageOptimSigErrorPlot,int,1,0,gage,gage/optimsig.c:1164
-gageOptimSigErrorPlotSliding,int,1,0,gage,gage/optimsig.c:1255
+gageOptimSigCalculate,int,1,0,gage,gage/optimsig.c:1090
+gageOptimSigErrorPlot,int,1,0,gage,gage/optimsig.c:1162
+gageOptimSigErrorPlotSliding,int,1,0,gage,gage/optimsig.c:1253
Modified: teem/trunk/python/cffi/biffdata/limn.csv
===================================================================
--- teem/trunk/python/cffi/biffdata/limn.csv 2023-07-16 02:37:05 UTC (rev 7118)
+++ teem/trunk/python/cffi/biffdata/limn.csv 2023-07-16 02:38:23 UTC (rev 7119)
@@ -21,18 +21,18 @@
limnPolyDataRasterize,int,1,0,limn,limn/polydata.c:631
limnPolyDataSpiralTubeWrap,int,1,0,limn,limn/polyfilter.c:26
limnPolyDataSmoothHC,int,-1,0,limn,limn/polyfilter.c:336
-limnPolyDataVertexWindingFix,int,1,0,limn,limn/polymod.c:1231
-limnPolyDataCCFind,int,1,0,limn,limn/polymod.c:1250
-limnPolyDataPrimitiveSort,int,1,0,limn,limn/polymod.c:1381
-limnPolyDataVertexWindingFlip,int,1,0,limn,limn/polymod.c:1464
-limnPolyDataPrimitiveSelect,int,1,0,limn,limn/polymod.c:1493
-limnPolyDataClipMulti,int,1,0,limn,limn/polymod.c:1708
-limnPolyDataCompress,limnPolyData *,NULL,0,limn,limn/polymod.c:1995
-limnPolyDataJoin,limnPolyData *,NULL,0,limn,limn/polymod.c:2085
-limnPolyDataEdgeHalve,int,1,0,limn,limn/polymod.c:2153
-limnPolyDataNeighborList,int,-1,0,limn,limn/polymod.c:2330
-limnPolyDataNeighborArray,int,-1,0,limn,limn/polymod.c:2426
-limnPolyDataNeighborArrayComp,int,-1,0,limn,limn/polymod.c:2466
+limnPolyDataVertexWindingFix,int,1,0,limn,limn/polymod.c:1230
+limnPolyDataCCFind,int,1,0,limn,limn/polymod.c:1249
+limnPolyDataPrimitiveSort,int,1,0,limn,limn/polymod.c:1380
+limnPolyDataVertexWindingFlip,int,1,0,limn,limn/polymod.c:1463
+limnPolyDataPrimitiveSelect,int,1,0,limn,limn/polymod.c:1492
+limnPolyDataClipMulti,int,1,0,limn,limn/polymod.c:1707
+limnPolyDataCompress,limnPolyData *,NULL,0,limn,limn/polymod.c:1994
+limnPolyDataJoin,limnPolyData *,NULL,0,limn,limn/polymod.c:2084
+limnPolyDataEdgeHalve,int,1,0,limn,limn/polymod.c:2152
+limnPolyDataNeighborList,int,-1,0,limn,limn/polymod.c:2329
+limnPolyDataNeighborArray,int,-1,0,limn,limn/polymod.c:2425
+limnPolyDataNeighborArrayComp,int,-1,0,limn,limn/polymod.c:2465
limnPolyDataCube,int,1,0,limn,limn/polyshapes.c:27
limnPolyDataCubeTriangles,int,1,0,limn,limn/polyshapes.c:137
limnPolyDataOctahedron,int,1,0,limn,limn/polyshapes.c:347
Modified: teem/trunk/python/cffi/biffdata/nrrd.csv
===================================================================
--- teem/trunk/python/cffi/biffdata/nrrd.csv 2023-07-16 02:37:05 UTC (rev 7118)
+++ teem/trunk/python/cffi/biffdata/nrrd.csv 2023-07-16 02:38:23 UTC (rev 7119)
@@ -7,8 +7,8 @@
nrrd1DIrregMapCheck,int,1,0,nrrd,nrrd/apply1D.c:587
nrrd1DIrregAclCheck,int,1,0,nrrd,nrrd/apply1D.c:684
nrrd1DIrregAclGenerate,int,1,0,nrrd,nrrd/apply1D.c:816
-nrrdApply1DIrregMap,int,1,0,nrrd,nrrd/apply1D.c:881
-nrrdApply1DSubstitution,int,1,0,nrrd,nrrd/apply1D.c:1055
+nrrdApply1DIrregMap,int,1,0,nrrd,nrrd/apply1D.c:880
+nrrdApply1DSubstitution,int,1,0,nrrd,nrrd/apply1D.c:1054
nrrdApply2DLut,int,1,0,nrrd,nrrd/apply2D.c:297
nrrdArithGamma,int,1,0,nrrd,nrrd/arith.c:50
nrrdArithSRGBGamma,int,1,0,nrrd,nrrd/arith.c:138
@@ -42,7 +42,7 @@
nrrdDeringThetaNumSet,int,1,0,nrrd,nrrd/deringNrrd.c:252
nrrdDeringRadialKernelSet,int,1,0,nrrd,nrrd/deringNrrd.c:270
nrrdDeringThetaKernelSet,int,1,0,nrrd,nrrd/deringNrrd.c:290
-nrrdDeringExecute,int,1,0,nrrd,nrrd/deringNrrd.c:751
+nrrdDeringExecute,int,1,0,nrrd,nrrd/deringNrrd.c:750
nrrdCheapMedian,int,1,0,nrrd,nrrd/filt.c:407
nrrdDistanceL2,int,1,0,nrrd,nrrd/filt.c:814
nrrdDistanceL2Biased,int,1,0,nrrd,nrrd/filt.c:826
@@ -52,7 +52,7 @@
nrrdHistoDraw,int,1,0,nrrd,nrrd/histogram.c:189
nrrdHistoAxis,int,1,0,nrrd,nrrd/histogram.c:325
nrrdHistoJoint,int,1,0,nrrd,nrrd/histogram.c:439
-nrrdHistoThresholdOtsu,int,1,0,nrrd,nrrd/histogram.c:650
+nrrdHistoThresholdOtsu,int,1,0,nrrd,nrrd/histogram.c:649
nrrdKernelParse,int,1,0,nrrd,nrrd/kernel.c:3032
nrrdKernelSpecParse,int,1,0,nrrd,nrrd/kernel.c:3212
nrrdKernelSpecSprint,int,1,0,nrrd,nrrd/kernel.c:3234
Modified: teem/trunk/python/cffi/biffdata/pull.csv
===================================================================
--- teem/trunk/python/cffi/biffdata/pull.csv 2023-07-16 02:37:05 UTC (rev 7118)
+++ teem/trunk/python/cffi/biffdata/pull.csv 2023-07-16 02:38:23 UTC (rev 7119)
@@ -27,7 +27,7 @@
pullInitUnequalShapesAllowSet,int,1,0,pull,pull/initPull.c:201
pullStart,int,1,0,pull,pull/corePull.c:113
pullFinish,int,1,0,pull,pull/corePull.c:168
-pullRun,int,1,0,pull,pull/corePull.c:336
+pullRun,int,1,0,pull,pull/corePull.c:335
pullEnergySpecParse,int,1,0,pull,pull/energy.c:627
pullInfoSpecAdd,int,1,0,pull,pull/infoPull.c:132
pullInfoGet,int,1,0,pull,pull/infoPull.c:404
Modified: teem/trunk/python/cffi/biffdata/seek.csv
===================================================================
--- teem/trunk/python/cffi/biffdata/seek.csv 2023-07-16 02:37:05 UTC (rev 7118)
+++ teem/trunk/python/cffi/biffdata/seek.csv 2023-07-16 02:38:23 UTC (rev 7119)
@@ -16,4 +16,4 @@
seekIsovalueSet,int,1,0,seek,seek/setSeek.c:414
seekEvalDiffThreshSet,int,1,0,seek,seek/setSeek.c:440
seekVertexStrength,int,1,0,seek,seek/textract.c:1884
-seekUpdate,int,1,0,seek,seek/updateSeek.c:675
+seekUpdate,int,1,0,seek,seek/updateSeek.c:672
Modified: teem/trunk/python/cffi/biffdata/ten.csv
===================================================================
--- teem/trunk/python/cffi/biffdata/ten.csv 2023-07-16 02:37:05 UTC (rev 7118)
+++ teem/trunk/python/cffi/biffdata/ten.csv 2023-07-16 02:38:23 UTC (rev 7119)
@@ -1,8 +1,8 @@
func_name,return_type,error_val(s),mubi,biff_key,filename:linenumber
tenAnisoPlot,int,1,0,ten,ten/aniso.c:1068
-tenAnisoVolume,int,1,0,ten,ten/aniso.c:1128
-tenAnisoHistogram,int,1,0,ten,ten/aniso.c:1200
-tenEvecRGBParmCheck,int,1,0,ten,ten/aniso.c:1315
+tenAnisoVolume,int,1,0,ten,ten/aniso.c:1127
+tenAnisoHistogram,int,1,0,ten,ten/aniso.c:1199
+tenEvecRGBParmCheck,int,1,0,ten,ten/aniso.c:1313
tenEMBimodal,int,1,0,ten,ten/bimod.c:412
tenBVecNonLinearFit,int,1,0,ten,ten/bvec.c:99
tenDWMRIKeyValueParse,int,1,0,ten,ten/chan.c:60
@@ -11,8 +11,8 @@
tenEstimateLinear3D,int,1,0,ten,ten/chan.c:582
tenEstimateLinear4D,int,1,0,ten,ten/chan.c:629
tenSimulate,int,1,0,ten,ten/chan.c:870
-tenEpiRegister3D,int,1,0,ten,ten/epireg.c:1049
-tenEpiRegister4D,int,1,0,ten,ten/epireg.c:1200
+tenEpiRegister3D,int,1,0,ten,ten/epireg.c:1044
+tenEpiRegister4D,int,1,0,ten,ten/epireg.c:1195
tenEstimateMethodSet,int,1,0,ten,ten/estimate.c:283
tenEstimateSigmaSet,int,1,0,ten,ten/estimate.c:305
tenEstimateValueMinSet,int,1,0,ten,ten/estimate.c:323
@@ -54,10 +54,10 @@
tenGlyphGen,int,1,0,ten,ten/glyph.c:173
tenGradientCheck,int,1,0,ten,ten/grads.c:67
tenGradientRandom,int,1,0,ten,ten/grads.c:106
-tenGradientJitter,int,1,0,ten,ten/grads.c:152
-tenGradientBalance,int,1,0,ten,ten/grads.c:374
-tenGradientDistribute,int,1,0,ten,ten/grads.c:459
-tenGradientGenerate,int,1,0,ten,ten/grads.c:652
+tenGradientJitter,int,1,0,ten,ten/grads.c:151
+tenGradientBalance,int,1,0,ten,ten/grads.c:373
+tenGradientDistribute,int,1,0,ten,ten/grads.c:458
+tenGradientGenerate,int,1,0,ten,ten/grads.c:651
tenEvecRGB,int,1,0,ten,ten/miscTen.c:26
tenEvqVolume,int,1,0,ten,ten/miscTen.c:151
tenBMatrixCheck,int,1,0,ten,ten/miscTen.c:212
@@ -74,8 +74,8 @@
tenInterpParmBufferAlloc,int,1,0,ten,ten/path.c:64
tenInterpParmCopy,tenInterpParm *,NULL,0,ten,ten/path.c:123
tenInterpN_d,int,1,0,ten,ten/path.c:305
-tenInterpTwoDiscrete_d,int,1,0,ten,ten/path.c:806
-tenInterpMulti3D,int,1,0,ten,ten/path.c:957
+tenInterpTwoDiscrete_d,int,1,0,ten,ten/path.c:804
+tenInterpMulti3D,int,1,0,ten,ten/path.c:954
tenDwiGageKindSet,int,1,0,ten,ten/tenDwiGage.c:1037
tenDwiGageKindCheck,int,1,0,ten,ten/tenDwiGage.c:1177
tenTensorCheck,int,1,4,ten,ten/tensor.c:54
Modified: teem/trunk/python/cffi/cdef/cdef_air.h
===================================================================
--- teem/trunk/python/cffi/cdef/cdef_air.h 2023-07-16 02:37:05 UTC (rev 7118)
+++ teem/trunk/python/cffi/cdef/cdef_air.h 2023-07-16 02:38:23 UTC (rev 7119)
@@ -619,7 +619,7 @@
** C's "error: parameter name omitted"
*/
/*
-******** AIR_CAST, AIR_UINT, AIR_INT
+******** AIR_CAST, AIR_UINT, AIR_INT, ...
**
** just casts, but with the added ability to grep for them more easily,
** since casts should probably always be revisited and reconsidered.
Modified: teem/trunk/python/cffi/teem.py
===================================================================
--- teem/trunk/python/cffi/teem.py 2023-07-16 02:37:05 UTC (rev 7118)
+++ teem/trunk/python/cffi/teem.py 2023-07-16 02:38:23 UTC (rev 7119)
@@ -130,8 +130,8 @@
'nrrd1DIrregMapCheck': (_equals_one, 0, b'nrrd', 'nrrd/apply1D.c:587'),
'nrrd1DIrregAclCheck': (_equals_one, 0, b'nrrd', 'nrrd/apply1D.c:684'),
'nrrd1DIrregAclGenerate': (_equals_one, 0, b'nrrd', 'nrrd/apply1D.c:816'),
- 'nrrdApply1DIrregMap': (_equals_one, 0, b'nrrd', 'nrrd/apply1D.c:881'),
- 'nrrdApply1DSubstitution': (_equals_one, 0, b'nrrd', 'nrrd/apply1D.c:1055'),
+ 'nrrdApply1DIrregMap': (_equals_one, 0, b'nrrd', 'nrrd/apply1D.c:880'),
+ 'nrrdApply1DSubstitution': (_equals_one, 0, b'nrrd', 'nrrd/apply1D.c:1054'),
'nrrdApply2DLut': (_equals_one, 0, b'nrrd', 'nrrd/apply2D.c:297'),
'nrrdArithGamma': (_equals_one, 0, b'nrrd', 'nrrd/arith.c:50'),
'nrrdArithSRGBGamma': (_equals_one, 0, b'nrrd', 'nrrd/arith.c:138'),
@@ -165,7 +165,7 @@
'nrrdDeringThetaNumSet': (_equals_one, 0, b'nrrd', 'nrrd/deringNrrd.c:252'),
'nrrdDeringRadialKernelSet': (_equals_one, 0, b'nrrd', 'nrrd/deringNrrd.c:270'),
'nrrdDeringThetaKernelSet': (_equals_one, 0, b'nrrd', 'nrrd/deringNrrd.c:290'),
- 'nrrdDeringExecute': (_equals_one, 0, b'nrrd', 'nrrd/deringNrrd.c:751'),
+ 'nrrdDeringExecute': (_equals_one, 0, b'nrrd', 'nrrd/deringNrrd.c:750'),
'nrrdCheapMedian': (_equals_one, 0, b'nrrd', 'nrrd/filt.c:407'),
'nrrdDistanceL2': (_equals_one, 0, b'nrrd', 'nrrd/filt.c:814'),
'nrrdDistanceL2Biased': (_equals_one, 0, b'nrrd', 'nrrd/filt.c:826'),
@@ -175,7 +175,7 @@
'nrrdHistoDraw': (_equals_one, 0, b'nrrd', 'nrrd/histogram.c:189'),
'nrrdHistoAxis': (_equals_one, 0, b'nrrd', 'nrrd/histogram.c:325'),
'nrrdHistoJoint': (_equals_one, 0, b'nrrd', 'nrrd/histogram.c:439'),
- 'nrrdHistoThresholdOtsu': (_equals_one, 0, b'nrrd', 'nrrd/histogram.c:650'),
+ 'nrrdHistoThresholdOtsu': (_equals_one, 0, b'nrrd', 'nrrd/histogram.c:649'),
'nrrdKernelParse': (_equals_one, 0, b'nrrd', 'nrrd/kernel.c:3032'),
'nrrdKernelSpecParse': (_equals_one, 0, b'nrrd', 'nrrd/kernel.c:3212'),
'nrrdKernelSpecSprint': (_equals_one, 0, b'nrrd', 'nrrd/kernel.c:3234'),
@@ -294,8 +294,8 @@
'mossLinearTransform': (_equals_one, 0, b'moss', 'moss/xform.c:140'),
'mossFourPointTransform': (_equals_one, 0, b'moss', 'moss/xform.c:219'),
'alanUpdate': (_equals_one, 0, b'alan', 'alan/coreAlan.c:60'),
- 'alanInit': (_equals_one, 0, b'alan', 'alan/coreAlan.c:103'),
- 'alanRun': (_equals_one, 0, b'alan', 'alan/coreAlan.c:457'),
+ 'alanInit': (_equals_one, 0, b'alan', 'alan/coreAlan.c:99'),
+ 'alanRun': (_equals_one, 0, b'alan', 'alan/coreAlan.c:453'),
'alanDimensionSet': (_equals_one, 0, b'alan', 'alan/methodsAlan.c:104'),
'alan2DSizeSet': (_equals_one, 0, b'alan', 'alan/methodsAlan.c:119'),
'alan3DSizeSet': (_equals_one, 0, b'alan', 'alan/methodsAlan.c:139'),
@@ -342,9 +342,9 @@
'gageUpdate': (_equals_one, 0, b'gage', 'gage/update.c:313'),
'gageOptimSigSet': (_equals_one, 0, b'gage', 'gage/optimsig.c:217'),
'gageOptimSigContextNew': (_equals_null, 0, b'gage', 'gage/optimsig.c:311'),
- 'gageOptimSigCalculate': (_equals_one, 0, b'gage', 'gage/optimsig.c:1092'),
- 'gageOptimSigErrorPlot': (_equals_one, 0, b'gage', 'gage/optimsig.c:1164'),
- 'gageOptimSigErrorPlotSliding': (_equals_one, 0, b'gage', 'gage/optimsig.c:1255'),
+ 'gageOptimSigCalculate': (_equals_one, 0, b'gage', 'gage/optimsig.c:1090'),
+ 'gageOptimSigErrorPlot': (_equals_one, 0, b'gage', 'gage/optimsig.c:1162'),
+ 'gageOptimSigErrorPlotSliding': (_equals_one, 0, b'gage', 'gage/optimsig.c:1253'),
'dyeConvert': (_equals_one, 0, b'dye', 'dye/convertDye.c:351'),
'dyeColorParse': (_equals_one, 0, b'dye', 'dye/methodsDye.c:185'),
'baneClipNew': (_equals_null, 0, b'bane', 'bane/clip.c:102'),
@@ -351,8 +351,8 @@
'baneClipAnswer': (_equals_one, 0, b'bane', 'bane/clip.c:152'),
'baneClipCopy': (_equals_null, 0, b'bane', 'bane/clip.c:167'),
'baneFindInclusion': (_equals_one, 0, b'bane', 'bane/hvol.c:87'),
- 'baneMakeHVol': (_equals_one, 0, b'bane', 'bane/hvol.c:250'),
- 'baneGKMSHVol': (_equals_null, 0, b'bane', 'bane/hvol.c:449'),
+ 'baneMakeHVol': (_equals_one, 0, b'bane', 'bane/hvol.c:248'),
+ 'baneGKMSHVol': (_equals_null, 0, b'bane', 'bane/hvol.c:447'),
'baneIncNew': (_equals_null, 0, b'bane', 'bane/inc.c:251'),
'baneIncAnswer': (_equals_one, 0, b'bane', 'bane/inc.c:360'),
'baneIncCopy': (_equals_null, 0, b'bane', 'bane/inc.c:375'),
@@ -363,10 +363,10 @@
'baneRangeAnswer': (_equals_one, 0, b'bane', 'bane/rangeBane.c:144'),
'baneRawScatterplots': (_equals_one, 0, b'bane', 'bane/scat.c:26'),
'baneOpacInfo': (_equals_one, 0, b'bane', 'bane/trnsf.c:29'),
- 'bane1DOpacInfoFrom2D': (_equals_one, 0, b'bane', 'bane/trnsf.c:145'),
- 'baneSigmaCalc': (_equals_one, 0, b'bane', 'bane/trnsf.c:224'),
- 'banePosCalc': (_equals_one, 0, b'bane', 'bane/trnsf.c:255'),
- 'baneOpacCalc': (_equals_one, 0, b'bane', 'bane/trnsf.c:406'),
+ 'bane1DOpacInfoFrom2D': (_equals_one, 0, b'bane', 'bane/trnsf.c:144'),
+ 'baneSigmaCalc': (_equals_one, 0, b'bane', 'bane/trnsf.c:222'),
+ 'banePosCalc': (_equals_one, 0, b'bane', 'bane/trnsf.c:253'),
+ 'baneOpacCalc': (_equals_one, 0, b'bane', 'bane/trnsf.c:403'),
'baneInputCheck': (_equals_one, 0, b'bane', 'bane/valid.c:26'),
'baneHVolCheck': (_equals_one, 0, b'bane', 'bane/valid.c:64'),
'baneInfoCheck': (_equals_one, 0, b'bane', 'bane/valid.c:106'),
@@ -394,18 +394,18 @@
'limnPolyDataRasterize': (_equals_one, 0, b'limn', 'limn/polydata.c:631'),
'limnPolyDataSpiralTubeWrap': (_equals_one, 0, b'limn', 'limn/polyfilter.c:26'),
'limnPolyDataSmoothHC': ((lambda rv: -1 == rv), 0, b'limn', 'limn/polyfilter.c:336'),
- 'limnPolyDataVertexWindingFix': (_equals_one, 0, b'limn', 'limn/polymod.c:1231'),
- 'limnPolyDataCCFind': (_equals_one, 0, b'limn', 'limn/polymod.c:1250'),
- 'limnPolyDataPrimitiveSort': (_equals_one, 0, b'limn', 'limn/polymod.c:1381'),
- 'limnPolyDataVertexWindingFlip': (_equals_one, 0, b'limn', 'limn/polymod.c:1464'),
- 'limnPolyDataPrimitiveSelect': (_equals_one, 0, b'limn', 'limn/polymod.c:1493'),
- 'limnPolyDataClipMulti': (_equals_one, 0, b'limn', 'limn/polymod.c:1708'),
- 'limnPolyDataCompress': (_equals_null, 0, b'limn', 'limn/polymod.c:1995'),
- 'limnPolyDataJoin': (_equals_null, 0, b'limn', 'limn/polymod.c:2085'),
- 'limnPolyDataEdgeHalve': (_equals_one, 0, b'limn', 'limn/polymod.c:2153'),
- 'limnPolyDataNeighborList': ((lambda rv: -1 == rv), 0, b'limn', 'limn/polymod.c:2330'),
- 'limnPolyDataNeighborArray': ((lambda rv: -1 == rv), 0, b'limn', 'limn/polymod.c:2426'),
- 'limnPolyDataNeighborArrayComp': ((lambda rv: -1 == rv), 0, b'limn', 'limn/polymod.c:2466'),
+ 'limnPolyDataVertexWindingFix': (_equals_one, 0, b'limn', 'limn/polymod.c:1230'),
+ 'limnPolyDataCCFind': (_equals_one, 0, b'limn', 'limn/polymod.c:1249'),
+ 'limnPolyDataPrimitiveSort': (_equals_one, 0, b'limn', 'limn/polymod.c:1380'),
+ 'limnPolyDataVertexWindingFlip': (_equals_one, 0, b'limn', 'limn/polymod.c:1463'),
+ 'limnPolyDataPrimitiveSelect': (_equals_one, 0, b'limn', 'limn/polymod.c:1492'),
+ 'limnPolyDataClipMulti': (_equals_one, 0, b'limn', 'limn/polymod.c:1707'),
+ 'limnPolyDataCompress': (_equals_null, 0, b'limn', 'limn/polymod.c:1994'),
+ 'limnPolyDataJoin': (_equals_null, 0, b'limn', 'limn/polymod.c:2084'),
+ 'limnPolyDataEdgeHalve': (_equals_one, 0, b'limn', 'limn/polymod.c:2152'),
+ 'limnPolyDataNeighborList': ((lambda rv: -1 == rv), 0, b'limn', 'limn/polymod.c:2329'),
+ 'limnPolyDataNeighborArray': ((lambda rv: -1 == rv), 0, b'limn', 'limn/polymod.c:2425'),
+ 'limnPolyDataNeighborArrayComp': ((lambda rv: -1 == rv), 0, b'limn', 'limn/polymod.c:2465'),
'limnPolyDataCube': (_equals_one, 0, b'limn', 'limn/polyshapes.c:27'),
'limnPolyDataCubeTriangles': (_equals_one, 0, b'limn', 'limn/polyshapes.c:137'),
'limnPolyDataOctahedron': (_equals_one, 0, b'limn', 'limn/polyshapes.c:347'),
@@ -443,8 +443,8 @@
'limnObjectSpaceTransform': (_equals_one, 0, b'limn', 'limn/transform.c:210'),
'limnObjectFaceReverse': (_equals_one, 0, b'limn', 'limn/transform.c:335'),
'echoThreadStateInit': (_equals_one, 0, b'echo', 'echo/renderEcho.c:26'),
- 'echoRTRenderCheck': (_equals_one, 0, b'echo', 'echo/renderEcho.c:136'),
- 'echoRTRender': (_equals_one, 0, b'echo', 'echo/renderEcho.c:411'),
+ 'echoRTRenderCheck': (_equals_one, 0, b'echo', 'echo/renderEcho.c:134'),
+ 'echoRTRender': (_equals_one, 0, b'echo', 'echo/renderEcho.c:409'),
'hooverContextCheck': (_equals_one, 0, b'hoover', 'hoover/methodsHoover.c:53'),
'hooverRender': ((lambda rv: _teem.lib.hooverErrInit == rv), 0, b'hoover', 'hoover/rays.c:359'),
'seekExtract': (_equals_one, 0, b'seek', 'seek/extract.c:924'),
@@ -464,11 +464,11 @@
'seekIsovalueSet': (_equals_one, 0, b'seek', 'seek/setSeek.c:414'),
'seekEvalDiffThreshSet': (_equals_one, 0, b'seek', 'seek/setSeek.c:440'),
'seekVertexStrength': (_equals_one, 0, b'seek', 'seek/textract.c:1884'),
- 'seekUpdate': (_equals_one, 0, b'seek', 'seek/updateSeek.c:675'),
+ 'seekUpdate': (_equals_one, 0, b'seek', 'seek/updateSeek.c:672'),
'tenAnisoPlot': (_equals_one, 0, b'ten', 'ten/aniso.c:1068'),
- 'tenAnisoVolume': (_equals_one, 0, b'ten', 'ten/aniso.c:1128'),
- 'tenAnisoHistogram': (_equals_one, 0, b'ten', 'ten/aniso.c:1200'),
- 'tenEvecRGBParmCheck': (_equals_one, 0, b'ten', 'ten/aniso.c:1315'),
+ 'tenAnisoVolume': (_equals_one, 0, b'ten', 'ten/aniso.c:1127'),
+ 'tenAnisoHistogram': (_equals_one, 0, b'ten', 'ten/aniso.c:1199'),
+ 'tenEvecRGBParmCheck': (_equals_one, 0, b'ten', 'ten/aniso.c:1313'),
'tenEMBimodal': (_equals_one, 0, b'ten', 'ten/bimod.c:412'),
'tenBVecNonLinearFit': (_equals_one, 0, b'ten', 'ten/bvec.c:99'),
'tenDWMRIKeyValueParse': (_equals_one, 0, b'ten', 'ten/chan.c:60'),
@@ -477,8 +477,8 @@
'tenEstimateLinear3D': (_equals_one, 0, b'ten', 'ten/chan.c:582'),
'tenEstimateLinear4D': (_equals_one, 0, b'ten', 'ten/chan.c:629'),
'tenSimulate': (_equals_one, 0, b'ten', 'ten/chan.c:870'),
- 'tenEpiRegister3D': (_equals_one, 0, b'ten', 'ten/epireg.c:1049'),
- 'tenEpiRegister4D': (_equals_one, 0, b'ten', 'ten/epireg.c:1200'),
+ 'tenEpiRegister3D': (_equals_one, 0, b'ten', 'ten/epireg.c:1044'),
+ 'tenEpiRegister4D': (_equals_one, 0, b'ten', 'ten/epireg.c:1195'),
'tenEstimateMethodSet': (_equals_one, 0, b'ten', 'ten/estimate.c:283'),
'tenEstimateSigmaSet': (_equals_one, 0, b'ten', 'ten/estimate.c:305'),
'tenEstimateValueMinSet': (_equals_one, 0, b'ten', 'ten/estimate.c:323'),
@@ -520,10 +520,10 @@
'tenGlyphGen': (_equals_one, 0, b'ten', 'ten/glyph.c:173'),
'tenGradientCheck': (_equals_one, 0, b'ten', 'ten/grads.c:67'),
'tenGradientRandom': (_equals_one, 0, b'ten', 'ten/grads.c:106'),
- 'tenGradientJitter': (_equals_one, 0, b'ten', 'ten/grads.c:152'),
- 'tenGradientBalance': (_equals_one, 0, b'ten', 'ten/grads.c:374'),
- 'tenGradientDistribute': (_equals_one, 0, b'ten', 'ten/grads.c:459'),
- 'tenGradientGenerate': (_equals_one, 0, b'ten', 'ten/grads.c:652'),
+ 'tenGradientJitter': (_equals_one, 0, b'ten', 'ten/grads.c:151'),
+ 'tenGradientBalance': (_equals_one, 0, b'ten', 'ten/grads.c:373'),
+ 'tenGradientDistribute': (_equals_one, 0, b'ten', 'ten/grads.c:458'),
+ 'tenGradientGenerate': (_equals_one, 0, b'ten', 'ten/grads.c:651'),
'tenEvecRGB': (_equals_one, 0, b'ten', 'ten/miscTen.c:26'),
'tenEvqVolume': (_equals_one, 0, b'ten', 'ten/miscTen.c:151'),
'tenBMatrixCheck': (_equals_one, 0, b'ten', 'ten/miscTen.c:212'),
@@ -540,8 +540,8 @@
'tenInterpParmBufferAlloc': (_equals_one, 0, b'ten', 'ten/path.c:64'),
'tenInterpParmCopy': (_equals_null, 0, b'ten', 'ten/path.c:123'),
'tenInterpN_d': (_equals_one, 0, b'ten', 'ten/path.c:305'),
- 'tenInterpTwoDiscrete_d': (_equals_one, 0, b'ten', 'ten/path.c:806'),
- 'tenInterpMulti3D': (_equals_one, 0, b'ten', 'ten/path.c:957'),
+ 'tenInterpTwoDiscrete_d': (_equals_one, 0, b'ten', 'ten/path.c:804'),
+ 'tenInterpMulti3D': (_equals_one, 0, b'ten', 'ten/path.c:954'),
'tenDwiGageKindSet': (_equals_one, 0, b'ten', 'ten/tenDwiGage.c:1037'),
'tenDwiGageKindCheck': (_equals_one, 0, b'ten', 'ten/tenDwiGage.c:1177'),
'tenTensorCheck': (_equals_one, 4, b'ten', 'ten/tensor.c:54'),
@@ -590,7 +590,7 @@
'pullInitUnequalShapesAllowSet': (_equals_one, 0, b'pull', 'pull/initPull.c:201'),
'pullStart': (_equals_one, 0, b'pull', 'pull/corePull.c:113'),
'pullFinish': (_equals_one, 0, b'pull', 'pull/corePull.c:168'),
- 'pullRun': (_equals_one, 0, b'pull', 'pull/corePull.c:336'),
+ 'pullRun': (_equals_one, 0, b'pull', 'pull/corePull.c:335'),
'pullEnergySpecParse': (_equals_one, 0, b'pull', 'pull/energy.c:627'),
'pullInfoSpecAdd': (_equals_one, 0, b'pull', 'pull/infoPull.c:132'),
'pullInfoGet': (_equals_one, 0, b'pull', 'pull/infoPull.c:404'),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kin...@us...> - 2023-07-16 02:37:08
|
Revision: 7118
http://sourceforge.net/p/teem/code/7118
Author: kindlmann
Date: 2023-07-16 02:37:05 +0000 (Sun, 16 Jul 2023)
Log Message:
-----------
more use of existing AIR_INT(_) == AIR_CAST(int, _)
Modified Paths:
--------------
teem/trunk/src/hest/methodsHest.c
teem/trunk/src/nrrd/cc.c
teem/trunk/src/nrrd/encodingAscii.c
teem/trunk/src/nrrd/formatPNM.c
teem/trunk/src/nrrd/formatText.c
teem/trunk/src/nrrd/resampleContext.c
teem/trunk/src/nrrd/resampleNrrd.c
teem/trunk/src/nrrd/write.c
teem/trunk/src/ten/epireg.c
teem/trunk/src/ten/fiberMethods.c
teem/trunk/src/ten/tenModel.c
teem/trunk/src/ten/tendEllipse.c
teem/trunk/src/ten/tendFiber.c
teem/trunk/src/ten/tendFlotsam.c
teem/trunk/src/ten/tendPoint.c
Modified: teem/trunk/src/hest/methodsHest.c
===================================================================
--- teem/trunk/src/hest/methodsHest.c 2023-07-16 02:29:25 UTC (rev 7117)
+++ teem/trunk/src/hest/methodsHest.c 2023-07-16 02:37:05 UTC (rev 7118)
@@ -100,7 +100,7 @@
int max;
max = _hestMax(_max);
- if (!(AIR_CAST(int, min) <= max)) {
+ if (!(AIR_INT(min) <= max)) {
/* invalid */
return -1;
}
@@ -115,7 +115,7 @@
return 2;
}
- if (2 <= min && 2 <= max && AIR_CAST(int, min) == max) {
+ if (2 <= min && 2 <= max && AIR_INT(min) == max) {
/* multiple fixed parameters */
return 3;
}
Modified: teem/trunk/src/nrrd/cc.c
===================================================================
--- teem/trunk/src/nrrd/cc.c 2023-07-16 02:29:25 UTC (rev 7117)
+++ teem/trunk/src/nrrd/cc.c 2023-07-16 02:37:05 UTC (rev 7118)
@@ -84,13 +84,13 @@
sx = AIR_UINT(nin->axis[0].size);
sy = AIR_UINT(nin->axis[1].size);
#define GETV_2(x, y) \
- ((AIR_IN_CL(0, AIR_CAST(int, x), AIR_CAST(int, sx - 1)) \
- && AIR_IN_CL(0, AIR_CAST(int, y), AIR_CAST(int, sy - 1))) \
+ ((AIR_IN_CL(0, AIR_INT(x), AIR_INT(sx - 1)) \
+ && AIR_IN_CL(0, AIR_INT(y), AIR_INT(sy - 1))) \
? lup(nin->data, (x) + sx * (y)) \
: 0.5) /* value that can't come from an array of uints */
#define GETI_2(x, y) \
- ((AIR_IN_CL(0, AIR_CAST(int, x), AIR_CAST(int, sx - 1)) \
- && AIR_IN_CL(0, AIR_CAST(int, y), AIR_CAST(int, sy - 1))) \
+ ((AIR_IN_CL(0, AIR_INT(x), AIR_INT(sx - 1)) \
+ && AIR_IN_CL(0, AIR_INT(y), AIR_INT(sy - 1))) \
? out[(x) + sx * (y)] \
: AIR_UINT(-1)) /* CC index (probably!) never assigned */
@@ -178,15 +178,15 @@
sy = AIR_UINT(nin->axis[1].size);
sz = AIR_UINT(nin->axis[2].size);
#define GETV_3(x, y, z) \
- ((AIR_IN_CL(0, AIR_CAST(int, x), AIR_CAST(int, sx - 1)) \
- && AIR_IN_CL(0, AIR_CAST(int, y), AIR_CAST(int, sy - 1)) \
- && AIR_IN_CL(0, AIR_CAST(int, z), AIR_CAST(int, sz - 1))) \
+ ((AIR_IN_CL(0, AIR_INT(x), AIR_INT(sx - 1)) \
+ && AIR_IN_CL(0, AIR_INT(y), AIR_INT(sy - 1)) \
+ && AIR_IN_CL(0, AIR_INT(z), AIR_INT(sz - 1))) \
? lup(nin->data, (x) + sx * ((y) + sy * (z))) \
: 0.5)
#define GETI_3(x, y, z) \
- ((AIR_IN_CL(0, AIR_CAST(int, x), AIR_CAST(int, sx - 1)) \
- && AIR_IN_CL(0, AIR_CAST(int, y), AIR_CAST(int, sy - 1)) \
- && AIR_IN_CL(0, AIR_CAST(int, z), AIR_CAST(int, sz - 1))) \
+ ((AIR_IN_CL(0, AIR_INT(x), AIR_INT(sx - 1)) \
+ && AIR_IN_CL(0, AIR_INT(y), AIR_INT(sy - 1)) \
+ && AIR_IN_CL(0, AIR_INT(z), AIR_INT(sz - 1))) \
? out[(x) + sx * ((y) + sy * (z))] \
: AIR_UINT(-1))
@@ -751,7 +751,7 @@
if (j == _i) {
continue; /* we had no neighbors ?!?! */
}
- if (valDir && (AIR_CAST(int, val[bigi]) - AIR_CAST(int, val[i])) * valDir < 0) {
+ if (valDir && (AIR_INT(val[bigi]) - AIR_INT(val[i])) * valDir < 0) {
continue;
}
/* else all criteria for merging have been met */
Modified: teem/trunk/src/nrrd/encodingAscii.c
===================================================================
--- teem/trunk/src/nrrd/encodingAscii.c 2023-07-16 02:29:25 UTC (rev 7117)
+++ teem/trunk/src/nrrd/encodingAscii.c 2023-07-16 02:37:05 UTC (rev 7118)
@@ -133,7 +133,7 @@
fprintf(file, "%s\n", buff);
newlined = AIR_TRUE;
} else if (nrrd->dim == 2 && nrrd->axis[0].size <= nio->valsPerLine) {
- int nonewline = AIR_CAST(int, (I + 1) % (nrrd->axis[0].size));
+ int nonewline = AIR_INT((I + 1) % (nrrd->axis[0].size));
fprintf(file, "%s%c", buff, nonewline ? ' ' : '\n');
newlined = !nonewline;
} else {
Modified: teem/trunk/src/nrrd/formatPNM.c
===================================================================
--- teem/trunk/src/nrrd/formatPNM.c 2023-07-16 02:29:25 UTC (rev 7117)
+++ teem/trunk/src/nrrd/formatPNM.c 2023-07-16 02:37:05 UTC (rev 7118)
@@ -295,12 +295,12 @@
color = (3 == nrrd->dim);
if (!color) {
magic = (nrrdEncodingAscii == nio->encoding ? 2 : 5);
- sx = AIR_CAST(int, nrrd->axis[0].size);
- sy = AIR_CAST(int, nrrd->axis[1].size);
+ sx = AIR_INT(nrrd->axis[0].size);
+ sy = AIR_INT(nrrd->axis[1].size);
} else {
magic = (nrrdEncodingAscii == nio->encoding ? 3 : 6);
- sx = AIR_CAST(int, nrrd->axis[1].size);
- sy = AIR_CAST(int, nrrd->axis[2].size);
+ sx = AIR_INT(nrrd->axis[1].size);
+ sy = AIR_INT(nrrd->axis[2].size);
}
fprintf(file, "P%d\n", magic);
Modified: teem/trunk/src/nrrd/formatText.c
===================================================================
--- teem/trunk/src/nrrd/formatText.c 2023-07-16 02:29:25 UTC (rev 7117)
+++ teem/trunk/src/nrrd/formatText.c 2023-07-16 02:37:05 UTC (rev 7118)
@@ -97,7 +97,7 @@
/* first, we get through comments */
while (NRRD_COMMENT_CHAR == nio->line[0]) {
nio->pos = 1;
- nio->pos += AIR_CAST(int, strspn(nio->line + nio->pos, _nrrdFieldSep));
+ nio->pos += AIR_INT(strspn(nio->line + nio->pos, _nrrdFieldSep));
fidx = _nrrdReadNrrdParseField(nio, AIR_FALSE);
/* could we parse anything? */
if (!fidx) {
@@ -319,7 +319,7 @@
_nrrdFormatText_write(FILE *file, const Nrrd *nrrd, NrrdIoState *nio) {
char cmt[AIR_STRLEN_SMALL + 1], buff[AIR_STRLEN_SMALL + 1];
size_t I, dsz;
- int i, x, y, sx, sy;
+ int i, x, y, sx, sy; /* HEY unsigned? */
const void *data;
const char *cdata;
float val;
@@ -355,10 +355,10 @@
if (1 == nrrd->dim) {
sx = 1;
- sy = AIR_CAST(int, nrrd->axis[0].size);
+ sy = AIR_INT(nrrd->axis[0].size);
} else {
- sx = AIR_CAST(int, nrrd->axis[0].size);
- sy = AIR_CAST(int, nrrd->axis[1].size);
+ sx = AIR_INT(nrrd->axis[0].size);
+ sy = AIR_INT(nrrd->axis[1].size);
}
data = nrrd->data;
cdata = (const char *)nrrd->data;
Modified: teem/trunk/src/nrrd/resampleContext.c
===================================================================
--- teem/trunk/src/nrrd/resampleContext.c 2023-07-16 02:29:25 UTC (rev 7117)
+++ teem/trunk/src/nrrd/resampleContext.c 2023-07-16 02:37:05 UTC (rev 7118)
@@ -765,7 +765,7 @@
/* figure out what to do with the out-of-range indices */
for (dotIdx = 0; dotIdx < dotLen * axis->samples; dotIdx++) {
rawIdx = indexData[dotIdx];
- if (!AIR_IN_CL(0, rawIdx, AIR_CAST(int, axis->sizeIn) - 1)) {
+ if (!AIR_IN_CL(0, rawIdx, AIR_INT(axis->sizeIn) - 1)) {
switch (rsmc->boundary) {
case nrrdBoundaryPad:
case nrrdBoundaryWeight: /* this will be further handled later */
Modified: teem/trunk/src/nrrd/resampleNrrd.c
===================================================================
--- teem/trunk/src/nrrd/resampleNrrd.c 2023-07-16 02:29:25 UTC (rev 7117)
+++ teem/trunk/src/nrrd/resampleNrrd.c 2023-07-16 02:37:05 UTC (rev 7118)
@@ -308,8 +308,8 @@
}
center = _nrrdCenter(nin->axis[ai].center);
- sizeIn = AIR_CAST(int, nin->axis[ai].size);
- sizeOut = AIR_CAST(int, info->samples[ai]);
+ sizeIn = AIR_INT(nin->axis[ai].size);
+ sizeOut = AIR_INT(info->samples[ai]);
minIn = AIR_CAST(nrrdResample_t, nin->axis[ai].min);
maxIn = AIR_CAST(nrrdResample_t, nin->axis[ai].max);
minOut = AIR_CAST(nrrdResample_t, info->min[ai]);
@@ -680,8 +680,8 @@
numLines *= sz[pi][ai];
}
}
- sizeIn = AIR_CAST(int, sz[pi][topRax]);
- sizeOut = AIR_CAST(int, sz[pi + 1][botRax]);
+ sizeIn = AIR_INT(sz[pi][topRax]);
+ sizeOut = AIR_INT(sz[pi + 1][botRax]);
numOut = numLines * sizeOut;
/* for the rest of the loop body, d is the original "dimension"
for the axis being resampled */
Modified: teem/trunk/src/nrrd/write.c
===================================================================
--- teem/trunk/src/nrrd/write.c 2023-07-16 02:29:25 UTC (rev 7117)
+++ teem/trunk/src/nrrd/write.c 2023-07-16 02:37:05 UTC (rev 7118)
@@ -168,11 +168,11 @@
break;
case nrrdIoStateCharsPerLine:
/* HEY: this cast is a bad because nio->charsPerLine is unsigned */
- value = AIR_CAST(int, nio->charsPerLine);
+ value = AIR_INT(nio->charsPerLine);
break;
case nrrdIoStateValsPerLine:
/* HEY: this cast is a bad because nio->valsPerLine is unsigned */
- value = AIR_CAST(int, nio->valsPerLine);
+ value = AIR_INT(nio->valsPerLine);
break;
case nrrdIoStateSkipData:
value = !!nio->skipData;
Modified: teem/trunk/src/ten/epireg.c
===================================================================
--- teem/trunk/src/ten/epireg.c 2023-07-16 02:29:25 UTC (rev 7117)
+++ teem/trunk/src/ten/epireg.c 2023-07-16 02:37:05 UTC (rev 7118)
@@ -944,7 +944,7 @@
pf = pp - pb;
for (pi = 0; pi < 2 * supp; pi++) {
/* HEY GLK confused about signed-ness of this */
- idx[pi] = AIR_CAST(int, AIR_MIN(pb + pi - (supp - 1), sy - 1));
+ idx[pi] = AIR_INT(AIR_MIN(pb + pi - (supp - 1), sy - 1));
wght[pi] = pi - (supp - 1) - pf;
}
idx += 2 * supp;
Modified: teem/trunk/src/ten/fiberMethods.c
===================================================================
--- teem/trunk/src/ten/fiberMethods.c 2023-07-16 02:29:25 UTC (rev 7117)
+++ teem/trunk/src/ten/fiberMethods.c 2023-07-16 02:37:05 UTC (rev 7118)
@@ -777,7 +777,7 @@
tfx->wPunct = val;
break;
case tenFiberParmVerbose:
- tfx->verbose = AIR_CAST(int, val);
+ tfx->verbose = AIR_INT(val);
break;
default:
fprintf(stderr, "%s: WARNING!!! tenFiberParm %d not handled\n", me, parm);
Modified: teem/trunk/src/ten/tenModel.c
===================================================================
--- teem/trunk/src/ten/tenModel.c 2023-07-16 02:29:25 UTC (rev 7117)
+++ teem/trunk/src/ten/tenModel.c 2023-07-16 02:37:05 UTC (rev 7118)
@@ -275,7 +275,7 @@
/* allocate output (and set axmap) */
for (ii = 0; ii < nparm->dim; ii++) {
szOut[ii] = (!ii ? espec->imgNum : nparm->axis[ii].size);
- axmap[ii] = (!ii ? -1 : AIR_CAST(int, ii));
+ axmap[ii] = (!ii ? -1 : AIR_INT(ii));
}
if (nrrdMaybeAlloc_nva(ndwi, typeOut, nparm->dim, szOut)) {
biffMovef(TEN, NRRD, "%s: couldn't allocate output", me);
@@ -460,9 +460,9 @@
saveParmNum = saveB0 ? model->parmNum : model->parmNum - 1;
for (ii = 0; ii < ndwi->dim; ii++) {
szOut[ii] = (!ii ? saveParmNum : ndwi->axis[ii].size);
- axmap[ii] = (!ii ? -1 : AIR_CAST(int, ii));
+ axmap[ii] = (!ii ? -1 : AIR_INT(ii));
if (ii) {
- erraxmap[ii - 1] = AIR_CAST(int, ii);
+ erraxmap[ii - 1] = AIR_INT(ii);
}
}
if (nrrdMaybeAlloc_nva(nparm, typeOut, ndwi->dim, szOut)) {
@@ -730,7 +730,7 @@
parmNumSrc = AIR_UINT(nparmSrc->axis[0].size);
for (ii = 0; ii < nparmSrc->dim; ii++) {
szOut[ii] = (!ii ? parmNumDst : nparmSrc->axis[ii].size);
- axmap[ii] = (!ii ? -1 : AIR_CAST(int, ii));
+ axmap[ii] = (!ii ? -1 : AIR_INT(ii));
}
if (nrrdMaybeAlloc_nva(nparmDst, nparmSrc->type, nparmSrc->dim, szOut)) {
biffMovef(TEN, NRRD, "%s: couldn't allocate output", me);
Modified: teem/trunk/src/ten/tendEllipse.c
===================================================================
--- teem/trunk/src/ten/tendEllipse.c 2023-07-16 02:29:25 UTC (rev 7117)
+++ teem/trunk/src/ten/tendEllipse.c 2023-07-16 02:37:05 UTC (rev 7118)
@@ -73,9 +73,8 @@
fprintf(file, "%%%%Creator: tend ellipse\n");
fprintf(file, "%%%%Title: blah blah blah\n");
fprintf(file, "%%%%Pages: 1\n");
- fprintf(file, "%%%%BoundingBox: %d %d %d %d\n", AIR_CAST(int, floor(minX)),
- AIR_CAST(int, floor(minY)), AIR_CAST(int, ceil(maxX)),
- AIR_CAST(int, ceil(maxY)));
+ fprintf(file, "%%%%BoundingBox: %d %d %d %d\n", AIR_INT(floor(minX)),
+ AIR_INT(floor(minY)), AIR_INT(ceil(maxX)), AIR_INT(ceil(maxY)));
fprintf(file, "%%%%HiResBoundingBox: %g %g %g %g\n", minX, minY, maxX, maxY);
fprintf(file, "%%%%EndComments\n");
fprintf(file, "%%%%BeginProlog\n");
@@ -103,8 +102,8 @@
py = AIR_AFFINE(min[1], pdata[1], max[1], maxY, minY);
pdata += 2;
} else {
- x = AIR_CAST(int, ti % sx); /* HEY unsigned? */
- y = AIR_CAST(int, ti / sx);
+ x = AIR_INT(ti % sx); /* HEY unsigned? */
+ y = AIR_INT(ti / sx);
px = NRRD_CELL_POS(minX, maxX, sx, x);
py = NRRD_CELL_POS(minY, maxY, sy, sy - 1 - y);
}
@@ -147,8 +146,8 @@
py = AIR_AFFINE(min[1], pdata[1], max[1], maxY, minY);
pdata += 2;
} else {
- x = AIR_CAST(int, ti % sx); /* HEY unsigned? */
- y = AIR_CAST(int, ti / sx);
+ x = AIR_INT(ti % sx); /* HEY unsigned? */
+ y = AIR_INT(ti / sx);
px = NRRD_CELL_POS(minX, maxX, sx, x);
py = NRRD_CELL_POS(minY, maxY, sy, sy - 1 - y);
}
Modified: teem/trunk/src/ten/tendFiber.c
===================================================================
--- teem/trunk/src/ten/tendFiber.c 2023-07-16 02:29:25 UTC (rev 7117)
+++ teem/trunk/src/ten/tendFiber.c 2023-07-16 02:37:05 UTC (rev 7118)
@@ -152,10 +152,10 @@
E = 0;
for (si = 0, stop = _stop; si < stopLen; si++, stop += 3) {
int istop; /* not from Apple */
- istop = AIR_CAST(int, stop[0]);
+ istop = AIR_INT(stop[0]);
switch (istop) {
case tenFiberStopAniso:
- if (!E) E |= tenFiberStopSet(tfx, istop, AIR_CAST(int, stop[1]), stop[2]);
+ if (!E) E |= tenFiberStopSet(tfx, istop, AIR_INT(stop[1]), stop[2]);
break;
case tenFiberStopNumSteps:
case tenFiberStopMinNumSteps:
Modified: teem/trunk/src/ten/tendFlotsam.c
===================================================================
--- teem/trunk/src/ten/tendFlotsam.c 2023-07-16 02:29:25 UTC (rev 7117)
+++ teem/trunk/src/ten/tendFlotsam.c 2023-07-16 02:37:05 UTC (rev 7118)
@@ -68,13 +68,13 @@
}
*opt = '\0';
opt++;
- info[0] = AIR_CAST(int, airEnumVal(tenFiberStop, str));
- if (tenFiberStopUnknown == AIR_CAST(int, info[0])) {
+ info[0] = AIR_INT(airEnumVal(tenFiberStop, str));
+ if (tenFiberStopUnknown == AIR_INT(info[0])) {
sprintf(err, "%s: didn't recognize \"%s\" as %s", me, str, tenFiberStop->name);
airMopError(mop);
return 1;
}
- switch (AIR_CAST(int, info[0])) {
+ switch (AIR_INT(info[0])) {
case tenFiberStopAniso:
/* <aniso>,<level> : tenAniso,double */
opt2 = strchr(opt, ',');
@@ -85,8 +85,8 @@
}
*opt2 = '\0';
opt2++;
- info[1] = AIR_CAST(int, airEnumVal(tenAniso, opt));
- if (tenAnisoUnknown == AIR_CAST(int, info[1])) {
+ info[1] = AIR_INT(airEnumVal(tenAniso, opt));
+ if (tenAnisoUnknown == AIR_INT(info[1])) {
sprintf(err, "%s: didn't recognize \"%s\" as %s", me, opt, tenAniso->name);
airMopError(mop);
return 1;
@@ -98,7 +98,7 @@
}
/*
fprintf(stderr, "!%s: parsed aniso:%s,%g\n", me,
- airEnumStr(tenAniso, AIR_CAST(int, info[1])), info[2]);
+ airEnumStr(tenAniso, AIR_INT(info[1])), info[2]);
*/
break;
case tenFiberStopFraction:
@@ -109,13 +109,13 @@
/* all of these take a single double */
if (1 != sscanf(opt, "%lg", info + 1)) {
sprintf(err, "%s: couldn't parse %s \"%s\" as double", me,
- airEnumStr(tenFiberStop, AIR_CAST(int, info[0])), opt);
+ airEnumStr(tenFiberStop, AIR_INT(info[0])), opt);
airMopError(mop);
return 1;
}
/*
fprintf(stderr, "!%s: parse %s:%g\n", me,
- airEnumStr(tenFiberStop, AIR_CAST(int, info[0])),
+ airEnumStr(tenFiberStop, AIR_INT(info[0])),
info[1]);
*/
break;
@@ -134,7 +134,7 @@
/* moron */
break;
default:
- sprintf(err, "%s: stop method %d not supported", me, AIR_CAST(int, info[0]));
+ sprintf(err, "%s: stop method %d not supported", me, AIR_INT(info[0]));
airMopError(mop);
return 1;
break;
Modified: teem/trunk/src/ten/tendPoint.c
===================================================================
--- teem/trunk/src/ten/tendPoint.c 2023-07-16 02:29:25 UTC (rev 7117)
+++ teem/trunk/src/ten/tendPoint.c 2023-07-16 02:37:05 UTC (rev 7118)
@@ -53,9 +53,9 @@
airMopError(mop);
return 1;
}
- sx = AIR_CAST(int, nin->axis[1].size); /* HEY: unsigned? */
- sy = AIR_CAST(int, nin->axis[2].size);
- sz = AIR_CAST(int, nin->axis[3].size);
+ sx = AIR_INT(nin->axis[1].size); /* HEY: unsigned? */
+ sy = AIR_INT(nin->axis[2].size);
+ sz = AIR_INT(nin->axis[3].size);
if (!(AIR_IN_CL(0, loc[0], sx - 1) && AIR_IN_CL(0, loc[1], sy - 1)
&& AIR_IN_CL(0, loc[2], sz - 1))) {
fprintf(stderr,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kin...@us...> - 2023-07-16 02:29:29
|
Revision: 7117
http://sourceforge.net/p/teem/code/7117
Author: kindlmann
Date: 2023-07-16 02:29:25 +0000 (Sun, 16 Jul 2023)
Log Message:
-----------
use of new AIR_SIZE_T(_) == AIR_CAST(size_t, _), and some over-due clang-format-ing
Modified Paths:
--------------
teem/trunk/src/alan/coreAlan.c
teem/trunk/src/bane/gkmsFlotsam.c
teem/trunk/src/bane/gkmsPvg.c
teem/trunk/src/bane/gkmsTxf.c
teem/trunk/src/bane/hvol.c
teem/trunk/src/bane/inc.c
teem/trunk/src/bane/trnsf.c
teem/trunk/src/bin/emap.c
teem/trunk/src/bin/gprobe.c
teem/trunk/src/bin/mrender.c
teem/trunk/src/bin/pprobe.c
teem/trunk/src/bin/puller-with-Deft.c
teem/trunk/src/bin/qbert.c
teem/trunk/src/bin/vprobe.c
teem/trunk/src/dye/test/mchist.c
teem/trunk/src/echo/renderEcho.c
teem/trunk/src/gage/optimsig.c
teem/trunk/src/gage/st.c
teem/trunk/src/gage/test/genoptsig.c
teem/trunk/src/gage/test/tplot.c
teem/trunk/src/limn/cam.c
teem/trunk/src/limn/envmap.c
teem/trunk/src/limn/polydata.c
teem/trunk/src/limn/polyfilter.c
teem/trunk/src/limn/polymod.c
teem/trunk/src/limn/qn.c
teem/trunk/src/limn/splineMethods.c
teem/trunk/src/make/darwin.mk
teem/trunk/src/meet/test/strace.c
teem/trunk/src/mite/ray.c
teem/trunk/src/mite/renderMite.c
teem/trunk/src/moss/methodsMoss.c
teem/trunk/src/pull/ccPull.c
teem/trunk/src/pull/contextPull.c
teem/trunk/src/pull/corePull.c
teem/trunk/src/pull/pointPull.c
teem/trunk/src/pull/test/circ.c
teem/trunk/src/pull/trace.c
teem/trunk/src/push/action.c
teem/trunk/src/seek/updateSeek.c
teem/trunk/src/ten/aniso.c
teem/trunk/src/ten/bimod.c
teem/trunk/src/ten/chan.c
teem/trunk/src/ten/epireg.c
teem/trunk/src/ten/estimate.c
teem/trunk/src/ten/fiber.c
teem/trunk/src/ten/grads.c
teem/trunk/src/ten/path.c
teem/trunk/src/ten/tendEval.c
teem/trunk/src/ten/tendEvec.c
teem/trunk/src/ten/tendHelix.c
teem/trunk/src/ten/tendSatin.c
teem/trunk/src/ten/tensor.c
teem/trunk/src/ten/test/csim.c
teem/trunk/src/ten/test/odf-hist.c
teem/trunk/src/ten/test/rotedge.c
teem/trunk/src/ten/test/tg.c
teem/trunk/src/ten/test/tt.c
teem/trunk/src/unrrdu/crop.c
teem/trunk/src/unrrdu/ninspect.c
teem/trunk/src/unrrdu/resample.c
teem/trunk/src/unrrdu/vidicon.c
Modified: teem/trunk/src/alan/coreAlan.c
===================================================================
--- teem/trunk/src/alan/coreAlan.c 2023-07-16 02:21:56 UTC (rev 7116)
+++ teem/trunk/src/alan/coreAlan.c 2023-07-16 02:29:25 UTC (rev 7117)
@@ -73,23 +73,19 @@
actx->_nlev[1] = nrrdNew();
actx->nparm = nrrdNew();
if (2 == actx->dim) {
- ret = (nrrdMaybeAlloc_va(actx->_nlev[0], alan_nt, 3, AIR_CAST(size_t, 2),
- AIR_CAST(size_t, actx->size[0]),
- AIR_CAST(size_t, actx->size[1]))
+ ret = (nrrdMaybeAlloc_va(actx->_nlev[0], alan_nt, 3, AIR_SIZE_T(2),
+ AIR_SIZE_T(actx->size[0]), AIR_SIZE_T(actx->size[1]))
|| nrrdCopy(actx->_nlev[1], actx->_nlev[0])
- || nrrdMaybeAlloc_va(actx->nparm, alan_nt, 3, AIR_CAST(size_t, 3),
- AIR_CAST(size_t, actx->size[0]),
- AIR_CAST(size_t, actx->size[1])));
+ || nrrdMaybeAlloc_va(actx->nparm, alan_nt, 3, AIR_SIZE_T(3),
+ AIR_SIZE_T(actx->size[0]), AIR_SIZE_T(actx->size[1])));
} else {
- ret = (nrrdMaybeAlloc_va(actx->_nlev[0], alan_nt, 4, AIR_CAST(size_t, 2),
- AIR_CAST(size_t, actx->size[0]),
- AIR_CAST(size_t, actx->size[1]),
- AIR_CAST(size_t, actx->size[2]))
+ ret = (nrrdMaybeAlloc_va(actx->_nlev[0], alan_nt, 4, AIR_SIZE_T(2),
+ AIR_SIZE_T(actx->size[0]), AIR_SIZE_T(actx->size[1]),
+ AIR_SIZE_T(actx->size[2]))
|| nrrdCopy(actx->_nlev[1], actx->_nlev[0])
- || nrrdMaybeAlloc_va(actx->nparm, alan_nt, 4, AIR_CAST(size_t, 3),
- AIR_CAST(size_t, actx->size[0]),
- AIR_CAST(size_t, actx->size[1]),
- AIR_CAST(size_t, actx->size[2])));
+ || nrrdMaybeAlloc_va(actx->nparm, alan_nt, 4, AIR_SIZE_T(3),
+ AIR_SIZE_T(actx->size[0]), AIR_SIZE_T(actx->size[1]),
+ AIR_SIZE_T(actx->size[2])));
}
if (ret) {
biffMovef(ALAN, NRRD, "%s: trouble allocating buffers", me);
Modified: teem/trunk/src/bane/gkmsFlotsam.c
===================================================================
--- teem/trunk/src/bane/gkmsFlotsam.c 2023-07-16 02:21:56 UTC (rev 7116)
+++ teem/trunk/src/bane/gkmsFlotsam.c 2023-07-16 02:29:25 UTC (rev 7117)
@@ -106,8 +106,7 @@
airMopAdd(mop, *nrrdP = nrrdNew(), (airMopper)nrrdNuke, airMopOnError);
if (4 == sscanf(str, "%g,%g,%g,%g", &shape, &width, ¢, &alpha)) {
/* its a valid BEF specification, we make the nrrd ourselves */
- if (nrrdMaybeAlloc_va(*nrrdP, nrrdTypeFloat, 2, AIR_CAST(size_t, 2),
- AIR_CAST(size_t, 6))) {
+ if (nrrdMaybeAlloc_va(*nrrdP, nrrdTypeFloat, 2, AIR_SIZE_T(2), AIR_SIZE_T(6))) {
airMopAdd(mop, nerr = biffGetDone(NRRD), airFree, airMopOnError);
airStrcpy(err, AIR_STRLEN_HUGE + 1, nerr);
airMopError(mop);
Modified: teem/trunk/src/bane/gkmsPvg.c
===================================================================
--- teem/trunk/src/bane/gkmsPvg.c 2023-07-16 02:21:56 UTC (rev 7116)
+++ teem/trunk/src/bane/gkmsPvg.c 2023-07-16 02:29:25 UTC (rev 7117)
@@ -61,8 +61,8 @@
Nrrd *ret;
float *data;
- if (nrrdMaybeAlloc_va(ret = nrrdNew(), nrrdTypeFloat, 2, AIR_CAST(size_t, 4),
- AIR_CAST(size_t, 23))) {
+ if (nrrdMaybeAlloc_va(ret = nrrdNew(), nrrdTypeFloat, 2, AIR_SIZE_T(4),
+ AIR_SIZE_T(23))) {
biffAddf(BANE, "%s: can't create output", me);
return NULL;
}
Modified: teem/trunk/src/bane/gkmsTxf.c
===================================================================
--- teem/trunk/src/bane/gkmsTxf.c 2023-07-16 02:21:56 UTC (rev 7116)
+++ teem/trunk/src/bane/gkmsTxf.c 2023-07-16 02:29:25 UTC (rev 7117)
@@ -77,8 +77,8 @@
airMopAdd(mop, nout, (airMopper)nrrdNuke, airMopAlways);
E = 0;
if (!E)
- E |= nrrdMaybeAlloc_va(nout, nrrdTypeFloat, 3, AIR_CAST(size_t, 1),
- AIR_CAST(size_t, res[0]), AIR_CAST(size_t, res[1]));
+ E |= nrrdMaybeAlloc_va(nout, nrrdTypeFloat, 3, AIR_SIZE_T(1), AIR_SIZE_T(res[0]),
+ AIR_SIZE_T(res[1]));
if (!E) E |= !(nout->axis[0].label = airStrdup("A"));
if (!E) E |= !(nout->axis[1].label = airStrdup("gage(scalar:v)"));
if (!E)
Modified: teem/trunk/src/bane/hvol.c
===================================================================
--- teem/trunk/src/bane/hvol.c 2023-07-16 02:21:56 UTC (rev 7116)
+++ teem/trunk/src/bane/hvol.c 2023-07-16 02:29:25 UTC (rev 7117)
@@ -133,9 +133,8 @@
incPass[0], incPass[1], incPass[2]);
*/
if (hvp->makeMeasrVol && !hvp->measrVol) {
- if (nrrdMaybeAlloc_va(hvp->measrVol = nrrdNew(), nrrdTypeFloat, 4,
- AIR_CAST(size_t, 3), AIR_CAST(size_t, sx),
- AIR_CAST(size_t, sy), AIR_CAST(size_t, sz))) {
+ if (nrrdMaybeAlloc_va(hvp->measrVol = nrrdNew(), nrrdTypeFloat, 4, AIR_SIZE_T(3),
+ AIR_SIZE_T(sx), AIR_SIZE_T(sy), AIR_SIZE_T(sz))) {
biffMovef(BANE, NRRD, "%s: couldn't allocate 3x%dx%dx%d VGH volume", me, sx, sy,
sz);
return 1;
@@ -177,9 +176,8 @@
}
if (inc[0]->process[1] || inc[1]->process[1] || inc[2]->process[1]) {
if (hvp->makeMeasrVol && !hvp->measrVol) {
- if (nrrdMaybeAlloc_va(hvp->measrVol = nrrdNew(), nrrdTypeFloat, 4,
- AIR_CAST(size_t, 3), AIR_CAST(size_t, sx),
- AIR_CAST(size_t, sy), AIR_CAST(size_t, sz))) {
+ if (nrrdMaybeAlloc_va(hvp->measrVol = nrrdNew(), nrrdTypeFloat, 4, AIR_SIZE_T(3),
+ AIR_SIZE_T(sx), AIR_SIZE_T(sy), AIR_SIZE_T(sz))) {
biffMovef(BANE, NRRD, "%s: couldn't allocate 3x%dx%dx%d VGH volume", me, sx, sy,
sz);
return 1;
@@ -347,8 +345,8 @@
shx = hvp->axis[0].res;
shy = hvp->axis[1].res;
shz = hvp->axis[2].res;
- if (nrrdMaybeAlloc_va(rawhvol = nrrdNew(), nrrdTypeInt, 3, AIR_CAST(size_t, shx),
- AIR_CAST(size_t, shy), AIR_CAST(size_t, shz))) {
+ if (nrrdMaybeAlloc_va(rawhvol = nrrdNew(), nrrdTypeInt, 3, AIR_SIZE_T(shx),
+ AIR_SIZE_T(shy), AIR_SIZE_T(shz))) {
biffMovef(BANE, NRRD, "%s: couldn't allocate raw histovol (%dx%dx%d)", me, shx, shy,
shz);
airMopError(mop);
@@ -407,8 +405,8 @@
fprintf(stderr, "%s: creating 8-bit histogram volume ... ", me);
fflush(stderr);
}
- if (nrrdMaybeAlloc_va(hvol, nrrdTypeUChar, 3, AIR_CAST(size_t, shx),
- AIR_CAST(size_t, shy), AIR_CAST(size_t, shz))) {
+ if (nrrdMaybeAlloc_va(hvol, nrrdTypeUChar, 3, AIR_SIZE_T(shx), AIR_SIZE_T(shy),
+ AIR_SIZE_T(shz))) {
biffMovef(BANE, NRRD, "%s: couldn't alloc finished histovol", me);
airMopError(mop);
return 1;
@@ -500,9 +498,9 @@
msr = baneMeasr[measr];
if (nrrdMaybeAlloc_va(nout, nrrdTypeFloat, 3,
- AIR_CAST(size_t, sx),
- AIR_CAST(size_t, sy),
- AIR_CAST(size_t, sz))) {
+ AIR_SIZE_T(sx),
+ AIR_SIZE_T(sy),
+ AIR_SIZE_T(sz))) {
biffMovef(BANE, NRRD, "%s: couldn't alloc output nrrd", me);
return 1;
}
Modified: teem/trunk/src/bane/inc.c
===================================================================
--- teem/trunk/src/bane/inc.c 2023-07-16 02:21:56 UTC (rev 7116)
+++ teem/trunk/src/bane/inc.c 2023-07-16 02:29:25 UTC (rev 7117)
@@ -314,7 +314,7 @@
return NULL;
}
inc->parm[0] = parm[0]; /* size of histogram */
- if (nrrdMaybeAlloc_va(inc->nhist, nrrdTypeInt, 1, AIR_CAST(size_t, parm[0]))) {
+ if (nrrdMaybeAlloc_va(inc->nhist, nrrdTypeInt, 1, AIR_SIZE_T(parm[0]))) {
biffMovef(BANE, NRRD, "%s: couldn't allocate histogram", me);
baneIncNix(inc);
return NULL;
Modified: teem/trunk/src/bane/trnsf.c
===================================================================
--- teem/trunk/src/bane/trnsf.c 2023-07-16 02:21:56 UTC (rev 7116)
+++ teem/trunk/src/bane/trnsf.c 2023-07-16 02:29:25 UTC (rev 7117)
@@ -52,8 +52,7 @@
}
if (1 == dim) {
len = AIR_INT(hvol->axis[2].size); /* HEY should be unsigned */
- if (nrrdMaybeAlloc_va(info, nrrdTypeFloat, 2, AIR_CAST(size_t, 2),
- AIR_CAST(size_t, len))) {
+ if (nrrdMaybeAlloc_va(info, nrrdTypeFloat, 2, AIR_SIZE_T(2), AIR_SIZE_T(len))) {
biffMovef(BANE, NRRD, BIFF_NRRDALLOC, me);
return 1;
}
@@ -97,8 +96,8 @@
/* hvol axes: 0: grad, 1: 2nd deriv: 2: data value */
sv = AIR_INT(hvol->axis[2].size); /* HEY should be unsigned */
sg = AIR_INT(hvol->axis[0].size); /* HEY should be unsigned */
- if (nrrdMaybeAlloc_va(info, nrrdTypeFloat, 3, AIR_CAST(size_t, 2),
- AIR_CAST(size_t, sv), AIR_CAST(size_t, sg))) {
+ if (nrrdMaybeAlloc_va(info, nrrdTypeFloat, 3, AIR_SIZE_T(2), AIR_SIZE_T(sv),
+ AIR_SIZE_T(sg))) {
biffMovef(BANE, NRRD, BIFF_NRRDALLOC, me);
return 1;
}
@@ -167,8 +166,7 @@
return 1;
}
- if (nrrdMaybeAlloc_va(info1D, nrrdTypeFloat, 2, AIR_CAST(size_t, 2),
- AIR_CAST(size_t, len))) {
+ if (nrrdMaybeAlloc_va(info1D, nrrdTypeFloat, 2, AIR_SIZE_T(2), AIR_SIZE_T(len))) {
biffMovef(BANE, NRRD, BIFF_NRRDALLOC, me);
return 1;
}
@@ -268,7 +266,7 @@
d = info->dim - 1;
if (1 == d) {
len = AIR_INT(info->axis[1].size); /* HEY should be unsigned */
- if (nrrdMaybeAlloc_va(pos, nrrdTypeFloat, 1, AIR_CAST(size_t, len))) {
+ if (nrrdMaybeAlloc_va(pos, nrrdTypeFloat, 1, AIR_SIZE_T(len))) {
biffMovef(BANE, NRRD, BIFF_NRRDALLOC, me);
return 1;
}
@@ -291,8 +289,7 @@
/* 2 == d */
sv = AIR_INT(info->axis[1].size); /* HEY should be unsigned */
sg = AIR_INT(info->axis[2].size); /* HEY should be unsigned */
- if (nrrdMaybeAlloc_va(pos, nrrdTypeFloat, 2, AIR_CAST(size_t, sv),
- AIR_CAST(size_t, sg))) {
+ if (nrrdMaybeAlloc_va(pos, nrrdTypeFloat, 2, AIR_SIZE_T(sv), AIR_SIZE_T(sg))) {
biffMovef(BANE, NRRD, BIFF_NRRDALLOC, me);
return 1;
}
@@ -423,7 +420,7 @@
dim = pos->dim;
if (1 == dim) {
len = AIR_INT(pos->axis[0].size); /* HEY should be unsigned */
- if (nrrdMaybeAlloc_va(opac, nrrdTypeFloat, 1, AIR_CAST(size_t, len))) {
+ if (nrrdMaybeAlloc_va(opac, nrrdTypeFloat, 1, AIR_SIZE_T(len))) {
biffMovef(BANE, NRRD, BIFF_NRRDALLOC, me);
return 1;
}
@@ -437,8 +434,7 @@
} else {
sv = AIR_INT(pos->axis[0].size); /* HEY should be unsigned */
sg = AIR_INT(pos->axis[1].size); /* HEY should be unsigned */
- if (nrrdMaybeAlloc_va(opac, nrrdTypeFloat, 2, AIR_CAST(size_t, sv),
- AIR_CAST(size_t, sg))) {
+ if (nrrdMaybeAlloc_va(opac, nrrdTypeFloat, 2, AIR_SIZE_T(sv), AIR_SIZE_T(sg))) {
biffMovef(BANE, NRRD, BIFF_NRRDALLOC, me);
return 1;
}
Modified: teem/trunk/src/bin/emap.c
===================================================================
--- teem/trunk/src/bin/emap.c 2023-07-16 02:21:56 UTC (rev 7116)
+++ teem/trunk/src/bin/emap.c 2023-07-16 02:29:25 UTC (rev 7117)
@@ -188,8 +188,8 @@
if (airStrlen(debugS)) {
ELL_34M_EXTRACT(V2W, cam->V2W);
ndebug = nrrdNew();
- nrrdMaybeAlloc_va(ndebug, nrrdTypeFloat, 3, AIR_CAST(size_t, 3),
- AIR_CAST(size_t, 1024), AIR_CAST(size_t, 512));
+ nrrdMaybeAlloc_va(ndebug, nrrdTypeFloat, 3, AIR_SIZE_T(3), AIR_SIZE_T(1024),
+ AIR_SIZE_T(512));
airMopAdd(mop, ndebug, (airMopper)nrrdNuke, airMopAlways);
debug = (float *)ndebug->data;
for (vi = 0; vi <= 511; vi++) {
Modified: teem/trunk/src/bin/gprobe.c
===================================================================
--- teem/trunk/src/bin/gprobe.c 2023-07-16 02:21:56 UTC (rev 7116)
+++ teem/trunk/src/bin/gprobe.c 2023-07-16 02:29:25 UTC (rev 7117)
@@ -666,8 +666,7 @@
nout = nrrdNew();
airMopAdd(mop, nout, AIR_CAST(airMopper, nrrdNuke), airMopAlways);
if (nrrdConvert(npos, _npos, nrrdTypeDouble)
- || nrrdMaybeAlloc_va(nout, otype, 2, AIR_CAST(size_t, ansLen),
- AIR_CAST(size_t, NN))) {
+ || nrrdMaybeAlloc_va(nout, otype, 2, AIR_SIZE_T(ansLen), AIR_SIZE_T(NN))) {
airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
fprintf(stderr, "%s: trouble with npos or nout:\n%s\n", me, err);
airMopError(mop);
@@ -733,9 +732,9 @@
dsix = AIR_CAST(double, six);
dsiy = AIR_CAST(double, siy);
dsiz = AIR_CAST(double, siz);
- sox = AIR_CAST(size_t, scale[0] * dsix);
- soy = AIR_CAST(size_t, scale[1] * dsiy);
- soz = AIR_CAST(size_t, scale[2] * dsiz);
+ sox = AIR_SIZE_T(scale[0] * dsix);
+ soy = AIR_SIZE_T(scale[1] * dsiy);
+ soz = AIR_SIZE_T(scale[2] * dsiz);
dsox = AIR_CAST(double, sox);
dsoy = AIR_CAST(double, soy);
dsoz = AIR_CAST(double, soz);
Modified: teem/trunk/src/bin/mrender.c
===================================================================
--- teem/trunk/src/bin/mrender.c 2023-07-16 02:21:56 UTC (rev 7116)
+++ teem/trunk/src/bin/mrender.c 2023-07-16 02:29:25 UTC (rev 7117)
@@ -197,8 +197,8 @@
fprintf(stderr, "%s: kernel support = %d^3 samples\n", me, 2 * uu->gctx0->radius);
if (nrrdMaybeAlloc_va((*rrP)->nout = nrrdNew(), nrrdTypeDouble, 2,
- AIR_CAST(size_t, uu->hctx->imgSize[0]),
- AIR_CAST(size_t, uu->hctx->imgSize[1]))) {
+ AIR_SIZE_T(uu->hctx->imgSize[0]),
+ AIR_SIZE_T(uu->hctx->imgSize[1]))) {
biffMovef(MREND, NRRD, "%s: nrrd trouble", me);
return 1;
}
Modified: teem/trunk/src/bin/pprobe.c
===================================================================
--- teem/trunk/src/bin/pprobe.c 2023-07-16 02:21:56 UTC (rev 7116)
+++ teem/trunk/src/bin/pprobe.c 2023-07-16 02:29:25 UTC (rev 7117)
@@ -290,10 +290,10 @@
nout = nrrdNew();
airMopAdd(mop, nout, (airMopper)nrrdNuke, airMopAlways);
if (1 == ansLen) {
- E = nrrdAlloc_va(nout, nrrdTypeDouble, 1, AIR_CAST(size_t, lpld->xyzwNum));
+ E = nrrdAlloc_va(nout, nrrdTypeDouble, 1, AIR_SIZE_T(lpld->xyzwNum));
} else {
- E = nrrdAlloc_va(nout, nrrdTypeDouble, 2, AIR_CAST(size_t, ansLen),
- AIR_CAST(size_t, lpld->xyzwNum));
+ E = nrrdAlloc_va(nout, nrrdTypeDouble, 2, AIR_SIZE_T(ansLen),
+ AIR_SIZE_T(lpld->xyzwNum));
}
if (E) {
airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
@@ -328,10 +328,10 @@
nout = nrrdNew();
airMopAdd(mop, nout, (airMopper)nrrdNuke, airMopAlways);
if (1 == ansLen) {
- E = nrrdAlloc_va(nout, nrrdTypeDouble, 1, AIR_CAST(size_t, lineStepNum));
+ E = nrrdAlloc_va(nout, nrrdTypeDouble, 1, AIR_SIZE_T(lineStepNum));
} else {
- E = nrrdAlloc_va(nout, nrrdTypeDouble, 2, AIR_CAST(size_t, ansLen),
- AIR_CAST(size_t, lineStepNum));
+ E = nrrdAlloc_va(nout, nrrdTypeDouble, 2, AIR_SIZE_T(ansLen),
+ AIR_SIZE_T(lineStepNum));
}
if (E) {
airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
Modified: teem/trunk/src/bin/puller-with-Deft.c
===================================================================
--- teem/trunk/src/bin/puller-with-Deft.c 2023-07-16 02:21:56 UTC (rev 7116)
+++ teem/trunk/src/bin/puller-with-Deft.c 2023-07-16 02:29:25 UTC (rev 7117)
@@ -267,7 +267,7 @@
AIR_UINT(bag->nPosOut->axis[1].size), first);
*/
if (first) {
- if (nrrdMaybeAlloc_va(bag->nrgb, nrrdTypeFloat, 2, AIR_CAST(size_t, 3),
+ if (nrrdMaybeAlloc_va(bag->nrgb, nrrdTypeFloat, 2, AIR_SIZE_T(3),
bag->nPosOut->axis[1].size)) {
err = biffGetDone(NRRD);
fprintf(stderr, "%s: error creating RGB:\n%s\n", me, err);
@@ -443,8 +443,8 @@
bag->ccSelect->range(0, bag->pctx->CCNum - 1);
if (bag->nccrgb->axis[1].size != bag->pctx->CCNum) {
airSrandMT(AIR_UINT(airTime()));
- if (nrrdMaybeAlloc_va(bag->nccrgb, nrrdTypeFloat, 2, AIR_CAST(size_t, 3),
- AIR_CAST(size_t, bag->pctx->CCNum))) {
+ if (nrrdMaybeAlloc_va(bag->nccrgb, nrrdTypeFloat, 2, AIR_SIZE_T(3),
+ AIR_SIZE_T(bag->pctx->CCNum))) {
char *err = biffGetDone(NRRD);
fprintf(stderr, "%s: problem alloc'ing cc rgb:\n%s", me, err);
free(err);
@@ -627,12 +627,11 @@
count += !!ten[0];
ten += 7;
}
- nrrdMaybeAlloc_va(nPosSel, nrrdTypeDouble, 2, AIR_CAST(size_t, 4),
- AIR_CAST(size_t, count));
+ nrrdMaybeAlloc_va(nPosSel, nrrdTypeDouble, 2, AIR_SIZE_T(4), AIR_SIZE_T(count));
posAll = AIR_CAST(double *, bag->nPosOut->data);
posSel = AIR_CAST(double *, nPosSel->data);
if (bag->nstrn) {
- nrrdMaybeAlloc_va(nStrnSel, nrrdTypeDouble, 1, AIR_CAST(size_t, count));
+ nrrdMaybeAlloc_va(nStrnSel, nrrdTypeDouble, 1, AIR_SIZE_T(count));
strnAll = AIR_CAST(double *, bag->nstrn->data);
strnSel = AIR_CAST(double *, nStrnSel->data);
} else {
Modified: teem/trunk/src/bin/qbert.c
===================================================================
--- teem/trunk/src/bin/qbert.c 2023-07-16 02:21:56 UTC (rev 7116)
+++ teem/trunk/src/bin/qbert.c 2023-07-16 02:29:25 UTC (rev 7117)
@@ -245,9 +245,8 @@
val = gageAnswerPointer(ctx, pvl, gageSclValue);
gmag = gageAnswerPointer(ctx, pvl, gageSclGradMag);
scnd = gageAnswerPointer(ctx, pvl, gageScl2ndDD);
- if (nrrdMaybeAlloc_va(nout, nrrdTypeFloat, 4, AIR_CAST(size_t, 2 + doH),
- AIR_CAST(size_t, sz[0]), AIR_CAST(size_t, sz[1]),
- AIR_CAST(size_t, sz[2]))) {
+ if (nrrdMaybeAlloc_va(nout, nrrdTypeFloat, 4, AIR_SIZE_T(2 + doH), AIR_SIZE_T(sz[0]),
+ AIR_SIZE_T(sz[1]), AIR_SIZE_T(sz[2]))) {
biffMovef(QBERT, NRRD, "%s: couldn't allocate floating point VG%s volume", me,
doH ? "H" : "");
airMopError(mop);
@@ -337,10 +336,10 @@
}
fprintf(stderr, "%s: using %d-bin histograms\n", me, bins);
E = 0;
- if (!E) E |= nrrdMaybeAlloc_va(nvhist, nrrdTypeInt, 1, AIR_CAST(size_t, bins));
- if (!E) E |= nrrdMaybeAlloc_va(nghist, nrrdTypeInt, 1, AIR_CAST(size_t, bins));
+ if (!E) E |= nrrdMaybeAlloc_va(nvhist, nrrdTypeInt, 1, AIR_SIZE_T(bins));
+ if (!E) E |= nrrdMaybeAlloc_va(nghist, nrrdTypeInt, 1, AIR_SIZE_T(bins));
if (doH) {
- if (!E) E |= nrrdMaybeAlloc_va(nhhist, nrrdTypeInt, 1, AIR_CAST(size_t, bins));
+ if (!E) E |= nrrdMaybeAlloc_va(nhhist, nrrdTypeInt, 1, AIR_SIZE_T(bins));
}
if (E) {
biffMovef(QBERT, NRRD, "%s: couldn't allocate %d %d-bin histograms", me, nval, bins);
@@ -455,9 +454,8 @@
fprintf(stderr, "%s: putting 2ndDD in range 1 to 169 (0.0 -> 85)\n", me);
}
- if (nrrdMaybeAlloc_va(nvgh, nrrdTypeUChar, 4, AIR_CAST(size_t, nval),
- AIR_CAST(size_t, sz[0]), AIR_CAST(size_t, sz[1]),
- AIR_CAST(size_t, sz[2]))) {
+ if (nrrdMaybeAlloc_va(nvgh, nrrdTypeUChar, 4, AIR_SIZE_T(nval), AIR_SIZE_T(sz[0]),
+ AIR_SIZE_T(sz[1]), AIR_SIZE_T(sz[2]))) {
biffMovef(QBERT, NRRD, "%s: couldn't allocate 8-bit VG%s volume", me,
doH ? "H" : "");
return 1;
Modified: teem/trunk/src/bin/vprobe.c
===================================================================
--- teem/trunk/src/bin/vprobe.c 2023-07-16 02:21:56 UTC (rev 7116)
+++ teem/trunk/src/bin/vprobe.c 2023-07-16 02:29:25 UTC (rev 7117)
@@ -336,9 +336,9 @@
dsix = AIR_CAST(double, six);
dsiy = AIR_CAST(double, siy);
dsiz = AIR_CAST(double, siz);
- sox = AIR_CAST(size_t, scale[0] * dsix);
- soy = AIR_CAST(size_t, scale[1] * dsiy);
- soz = AIR_CAST(size_t, scale[2] * dsiz);
+ sox = AIR_SIZE_T(scale[0] * dsix);
+ soy = AIR_SIZE_T(scale[1] * dsiy);
+ soz = AIR_SIZE_T(scale[2] * dsiz);
dsox = AIR_CAST(double, sox);
dsoy = AIR_CAST(double, soy);
dsoz = AIR_CAST(double, soz);
Modified: teem/trunk/src/dye/test/mchist.c
===================================================================
--- teem/trunk/src/dye/test/mchist.c 2023-07-16 02:21:56 UTC (rev 7116)
+++ teem/trunk/src/dye/test/mchist.c 2023-07-16 02:29:25 UTC (rev 7117)
@@ -19,7 +19,6 @@
Fifth Floor, Boston, MA 02110-1301 USA
*/
-
#include "../dye.h"
/*
@@ -27,9 +26,9 @@
** hist[1]: hue vs val
*/
void
-imageProc(Nrrd *nhproj[3], Nrrd *nhist[2], unsigned int sH,
- float *rgb, unsigned int size0, unsigned int sXY,
- unsigned int overSampleNum, float overSampleScale) {
+imageProc(Nrrd *nhproj[3], Nrrd *nhist[2], unsigned int sH, float *rgb,
+ unsigned int size0, unsigned int sXY, unsigned int overSampleNum,
+ float overSampleScale) {
unsigned int xyi, hi, si, vi, oi;
float rr, gg, bb, hh, ss, vv, *hist[2];
double rndA, rndB;
@@ -38,7 +37,7 @@
nrrdZeroSet(nhist[1]);
hist[0] = AIR_CAST(float *, nhist[0]->data);
hist[1] = AIR_CAST(float *, nhist[1]->data);
- for (xyi=0; xyi<sXY; xyi++) {
+ for (xyi = 0; xyi < sXY; xyi++) {
rr = AIR_CLAMP(0, rgb[0], 255);
gg = AIR_CLAMP(0, rgb[1], 255);
bb = AIR_CLAMP(0, rgb[2], 255);
@@ -49,10 +48,10 @@
si = airIndexClamp(0, ss, 1, sH);
vi = airIndexClamp(0, vv, 1, sH);
-#define UPDATE_HIST(rnd) \
- hi = airIndexClamp(0, hh + overSampleScale*(1-ss)*(rnd), 1, sH); \
- hist[0][hi + sH*si] += 1.0f/overSampleNum; \
- hist[1][hi + sH*vi] += 1.0f/overSampleNum
+#define UPDATE_HIST(rnd) \
+ hi = airIndexClamp(0, hh + overSampleScale * (1 - ss) * (rnd), 1, sH); \
+ hist[0][hi + sH * si] += 1.0f / overSampleNum; \
+ hist[1][hi + sH * vi] += 1.0f / overSampleNum
if (overSampleNum % 2 == 1) {
airNormalRand(&rndA, NULL);
@@ -59,7 +58,7 @@
UPDATE_HIST(rndA);
overSampleNum -= 1;
}
- for (oi=0; oi<overSampleNum; oi+=2) {
+ for (oi = 0; oi < overSampleNum; oi += 2) {
airNormalRand(&rndA, &rndB);
UPDATE_HIST(rndA);
UPDATE_HIST(rndB);
@@ -83,8 +82,7 @@
char **ninStr, *err, *outS, doneStr[13];
Nrrd *nin0, *nin, *nrgb, *nout, *nhist[2], *npreout, *nhproj[3];
float *rgb;
- float *out, *preout, *hist[2], maxSum,
- upSample, overSampleScale;
+ float *out, *preout, *hist[2], maxSum, upSample, overSampleScale;
unsigned int size0, sX, sY, sH, ninLen, ti, overSampleNum;
NrrdResampleContext *rsmc;
NrrdKernelSpec *ksp;
@@ -97,25 +95,23 @@
hparm->respFileEnable = AIR_TRUE;
hestOptAdd(&hopt, "i", "images", airTypeString, 1, -1, &ninStr, NULL,
"input image sequence", &ninLen, NULL, NULL);
- hestOptAdd(&hopt, "sh", "histo size", airTypeUInt, 1, 1, &sH, "500",
- "histogram size");
- hestOptAdd(&hopt, "k", "kern", airTypeOther, 1, 1, &ksp,
- "tent", "kernel for upsampling images",
- NULL, NULL, nrrdHestKernelSpec);
- hestOptAdd(&hopt, "us", "upsampling", airTypeFloat, 1, 1, &upSample,
- "1", "amount of upsampling of image");
- hestOptAdd(&hopt, "osn", "# oversmp", airTypeUInt, 1, 1, &overSampleNum,
- "1", "number of sample per (upsampled) pixel");
- hestOptAdd(&hopt, "osc", "scaling", airTypeFloat, 1, 1, &overSampleScale,
- "1", "scaling with oversampling");
- hestOptAdd(&hopt, "ms", "max sum", airTypeFloat, 1, 1, &maxSum,
- "10", "per-hue histogram summation is non-linearly and "
+ hestOptAdd(&hopt, "sh", "histo size", airTypeUInt, 1, 1, &sH, "500", "histogram size");
+ hestOptAdd(&hopt, "k", "kern", airTypeOther, 1, 1, &ksp, "tent",
+ "kernel for upsampling images", NULL, NULL, nrrdHestKernelSpec);
+ hestOptAdd(&hopt, "us", "upsampling", airTypeFloat, 1, 1, &upSample, "1",
+ "amount of upsampling of image");
+ hestOptAdd(&hopt, "osn", "# oversmp", airTypeUInt, 1, 1, &overSampleNum, "1",
+ "number of sample per (upsampled) pixel");
+ hestOptAdd(&hopt, "osc", "scaling", airTypeFloat, 1, 1, &overSampleScale, "1",
+ "scaling with oversampling");
+ hestOptAdd(&hopt, "ms", "max sum", airTypeFloat, 1, 1, &maxSum, "10",
+ "per-hue histogram summation is non-linearly and "
"asymptotically clamped to this maximum");
- hestOptAdd(&hopt, "o", "nout", airTypeString, 1, 1, &outS, "-",
- "output filename", NULL);
+ hestOptAdd(&hopt, "o", "nout", airTypeString, 1, 1, &outS, "-", "output filename",
+ NULL);
- hestParseOrDie(hopt, argc-1, argv+1, hparm,
- me, mchistInfo, AIR_TRUE, AIR_TRUE, AIR_TRUE);
+ hestParseOrDie(hopt, argc - 1, argv + 1, hparm, me, mchistInfo, AIR_TRUE, AIR_TRUE,
+ AIR_TRUE);
airMopAdd(mop, hopt, (airMopper)hestOptFree, airMopAlways);
airMopAdd(mop, hopt, (airMopper)hestParseFree, airMopAlways);
@@ -127,18 +123,17 @@
nin0 = nrrdNew();
airMopAdd(mop, nin0, (airMopper)nrrdNuke, airMopAlways);
if (nrrdLoad(nin0, ninStr[0], NULL)) {
- airMopAdd(mop, err=biffGetDone(NRRD), airFree, airMopAlways);
+ airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
fprintf(stderr, "%s: couldn't load first image:\n%s", me, err);
airMopError(mop);
return 1;
}
- if (!( (3 == nin0->axis[0].size || 4 == nin0->axis[0].size)
- && 3 == nin0->dim
- && nrrdTypeUChar == nin0->type )) {
- fprintf(stderr, "%s: 1st image not 3D (3-or-4)-by-X-by-Y %s array "
- "(got %u-D %s array)\n", me,
- airEnumStr(nrrdType, nrrdTypeUChar),
- nin0->dim,
+ if (!((3 == nin0->axis[0].size || 4 == nin0->axis[0].size) && 3 == nin0->dim
+ && nrrdTypeUChar == nin0->type)) {
+ fprintf(stderr,
+ "%s: 1st image not 3D (3-or-4)-by-X-by-Y %s array "
+ "(got %u-D %s array)\n",
+ me, airEnumStr(nrrdType, nrrdTypeUChar), nin0->dim,
airEnumStr(nrrdType, nin0->type));
airMopError(mop);
return 1;
@@ -146,8 +141,8 @@
rsmc = nrrdResampleContextNew();
airMopAdd(mop, rsmc, (airMopper)nrrdResampleContextNix, airMopAlways);
size0 = AIR_UINT(nin0->axis[0].size);
- sX = AIR_UINT(upSample*nin0->axis[1].size);
- sY = AIR_UINT(upSample*nin0->axis[2].size);
+ sX = AIR_UINT(upSample * nin0->axis[1].size);
+ sY = AIR_UINT(upSample * nin0->axis[2].size);
nrgb = nrrdNew();
airMopAdd(mop, nrgb, (airMopper)nrrdNuke, airMopAlways);
if (nrrdResampleDefaultCenterSet(rsmc, nrrdCenterCell)
@@ -154,14 +149,11 @@
|| nrrdResampleInputSet(rsmc, nin0)
|| nrrdResampleKernelSet(rsmc, 1, ksp->kernel, ksp->parm)
|| nrrdResampleKernelSet(rsmc, 2, ksp->kernel, ksp->parm)
- || nrrdResampleSamplesSet(rsmc, 1, sX)
- || nrrdResampleSamplesSet(rsmc, 2, sY)
- || nrrdResampleRangeFullSet(rsmc, 1)
- || nrrdResampleRangeFullSet(rsmc, 2)
+ || nrrdResampleSamplesSet(rsmc, 1, sX) || nrrdResampleSamplesSet(rsmc, 2, sY)
+ || nrrdResampleRangeFullSet(rsmc, 1) || nrrdResampleRangeFullSet(rsmc, 2)
|| nrrdResampleTypeOutSet(rsmc, nrrdTypeFloat)
- || nrrdResampleRenormalizeSet(rsmc, AIR_TRUE)
- || nrrdResampleExecute(rsmc, nrgb)) {
- airMopAdd(mop, err=biffGetDone(NRRD), airFree, airMopAlways);
+ || nrrdResampleRenormalizeSet(rsmc, AIR_TRUE) || nrrdResampleExecute(rsmc, nrgb)) {
+ airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
fprintf(stderr, "%s: error resampling slice:\n%s", me, err);
airMopError(mop);
return 1;
@@ -171,13 +163,9 @@
airMopAdd(mop, nhist[0], (airMopper)nrrdNuke, airMopAlways);
nhist[1] = nrrdNew();
airMopAdd(mop, nhist[1], (airMopper)nrrdNuke, airMopAlways);
- if (nrrdMaybeAlloc_va(nhist[0], nrrdTypeFloat, 2,
- AIR_CAST(size_t, sH),
- AIR_CAST(size_t, sH))
- || nrrdMaybeAlloc_va(nhist[1], nrrdTypeFloat, 2,
- AIR_CAST(size_t, sH),
- AIR_CAST(size_t, sH))) {
- airMopAdd(mop, err=biffGetDone(NRRD), airFree, airMopAlways);
+ if (nrrdMaybeAlloc_va(nhist[0], nrrdTypeFloat, 2, AIR_SIZE_T(sH), AIR_SIZE_T(sH))
+ || nrrdMaybeAlloc_va(nhist[1], nrrdTypeFloat, 2, AIR_SIZE_T(sH), AIR_SIZE_T(sH))) {
+ airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
fprintf(stderr, "%s: error allocating histos:\n%s", me, err);
airMopError(mop);
return 1;
@@ -200,60 +188,55 @@
airMopAdd(mop, nin, (airMopper)nrrdNuke, airMopAlways);
npreout = nrrdNew();
airMopAdd(mop, npreout, (airMopper)nrrdNuke, airMopAlways);
- if (nrrdMaybeAlloc_va(npreout, nrrdTypeFloat, 3,
- AIR_CAST(size_t, 3),
- AIR_CAST(size_t, sH),
- AIR_CAST(size_t, ninLen))) {
- airMopAdd(mop, err=biffGetDone(NRRD), airFree, airMopAlways);
+ if (nrrdMaybeAlloc_va(npreout, nrrdTypeFloat, 3, AIR_SIZE_T(3), AIR_SIZE_T(sH),
+ AIR_SIZE_T(ninLen))) {
+ airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
fprintf(stderr, "%s: error allocating pre-output:\n%s", me, err);
airMopError(mop);
return 1;
}
preout = AIR_CAST(float *, npreout->data);
- for (ti=0; ti<ninLen; ti++) {
- printf("%s", airDoneStr(0, ti, ninLen, doneStr)); fflush(stdout);
+ for (ti = 0; ti < ninLen; ti++) {
+ printf("%s", airDoneStr(0, ti, ninLen, doneStr));
+ fflush(stdout);
if (nrrdLoad(nin, ninStr[ti], NULL)) {
- airMopAdd(mop, err=biffGetDone(NRRD), airFree, airMopAlways);
+ airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
fprintf(stderr, "%s: couldn't load image[%u]:\n%s", me, ti, err);
airMopError(mop);
return 1;
}
if (!nrrdSameSize(nin0, nin, AIR_TRUE)) {
- airMopAdd(mop, err=biffGetDone(NRRD), airFree, airMopAlways);
+ airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
fprintf(stderr, "%s: nin[%u] not like nin[0]:\n%s", me, ti, err);
airMopError(mop);
return 1;
}
- if (nrrdResampleInputSet(rsmc, nin)
- || nrrdResampleExecute(rsmc, nrgb)) {
- airMopAdd(mop, err=biffGetDone(NRRD), airFree, airMopAlways);
+ if (nrrdResampleInputSet(rsmc, nin) || nrrdResampleExecute(rsmc, nrgb)) {
+ airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
fprintf(stderr, "%s: trouble resampling nin[%u]:\n%s", me, ti, err);
airMopError(mop);
return 1;
}
- if (nrrdWrap_va(nhproj[0], preout + 0*sH, nrrdTypeFloat, 1, AIR_CAST(size_t, sH)) ||
- nrrdWrap_va(nhproj[1], preout + 1*sH, nrrdTypeFloat, 1, AIR_CAST(size_t, sH)) ||
- nrrdWrap_va(nhproj[2], preout + 2*sH, nrrdTypeFloat, 1, AIR_CAST(size_t, sH))) {
- airMopAdd(mop, err=biffGetDone(NRRD), airFree, airMopAlways);
+ if (nrrdWrap_va(nhproj[0], preout + 0 * sH, nrrdTypeFloat, 1, AIR_SIZE_T(sH))
+ || nrrdWrap_va(nhproj[1], preout + 1 * sH, nrrdTypeFloat, 1, AIR_SIZE_T(sH))
+ || nrrdWrap_va(nhproj[2], preout + 2 * sH, nrrdTypeFloat, 1, AIR_SIZE_T(sH))) {
+ airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
fprintf(stderr, "%s: trouble wrapping output[%u]:\n%s", me, ti, err);
airMopError(mop);
return 1;
}
rgb = AIR_CAST(float *, nrgb->data);
- imageProc(nhproj, nhist, sH,
- rgb, size0, sX*sY,
- overSampleNum, overSampleScale);
- preout += 3*sH;
+ imageProc(nhproj, nhist, sH, rgb, size0, sX * sY, overSampleNum, overSampleScale);
+ preout += 3 * sH;
}
- printf("%s\n", airDoneStr(0, ti, ninLen, doneStr)); fflush(stdout);
+ printf("%s\n", airDoneStr(0, ti, ninLen, doneStr));
+ fflush(stdout);
nout = nrrdNew();
airMopAdd(mop, nout, (airMopper)nrrdNuke, airMopAlways);
- if (nrrdMaybeAlloc_va(nout, nrrdTypeFloat, 3,
- AIR_CAST(size_t, 3),
- AIR_CAST(size_t, sH),
- AIR_CAST(size_t, ninLen))) {
- airMopAdd(mop, err=biffGetDone(NRRD), airFree, airMopAlways);
+ if (nrrdMaybeAlloc_va(nout, nrrdTypeFloat, 3, AIR_SIZE_T(3), AIR_SIZE_T(sH),
+ AIR_SIZE_T(ninLen))) {
+ airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
fprintf(stderr, "%s: error allocating output:\n%s", me, err);
airMopError(mop);
return 1;
@@ -260,27 +243,27 @@
}
out = AIR_CAST(float *, nout->data);
preout = AIR_CAST(float *, npreout->data);
- for (ti=0; ti<ninLen; ti++) {
+ for (ti = 0; ti < ninLen; ti++) {
unsigned int hi;
float hh, vv, ss, scl;
- for (hi=0; hi<sH; hi++) {
+ for (hi = 0; hi < sH; hi++) {
hh = (float)AIR_AFFINE(0, hi, sH, 0, 1);
- if (!preout[hi + 2*sH]) {
- ELL_3V_SET(out + 3*hi, 0, 0, 0);
+ if (!preout[hi + 2 * sH]) {
+ ELL_3V_SET(out + 3 * hi, 0, 0, 0);
} else {
- ss = preout[hi + 2*sH];
- scl = ss/(maxSum + ss);
- vv = scl*preout[hi + 1*sH];
- dyeHSVtoRGB(out + 0 + 3*hi, out + 1 + 3*hi, out + 2 + 3*hi,
- hh, preout[hi + 0*sH], vv);
+ ss = preout[hi + 2 * sH];
+ scl = ss / (maxSum + ss);
+ vv = scl * preout[hi + 1 * sH];
+ dyeHSVtoRGB(out + 0 + 3 * hi, out + 1 + 3 * hi, out + 2 + 3 * hi, hh,
+ preout[hi + 0 * sH], vv);
}
}
- out += 3*sH;
- preout += 3*sH;
+ out += 3 * sH;
+ preout += 3 * sH;
}
if (nrrdSave(outS, nout, NULL)) {
- airMopAdd(mop, err=biffGetDone(NRRD), airFree, airMopAlways);
+ airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
fprintf(stderr, "%s: error saving output:\n%s", me, err);
airMopError(mop);
return 1;
Modified: teem/trunk/src/echo/renderEcho.c
===================================================================
--- teem/trunk/src/echo/renderEcho.c 2023-07-16 02:21:56 UTC (rev 7116)
+++ teem/trunk/src/echo/renderEcho.c 2023-07-16 02:29:25 UTC (rev 7117)
@@ -36,17 +36,15 @@
/* this will probably be over-written */
tstate->verbose = gstate->verbose;
tstate->threadIdx = threadIdx;
- if (nrrdMaybeAlloc_va(tstate->nperm, nrrdTypeInt, 2,
- AIR_CAST(size_t, ECHO_JITTABLE_NUM),
- AIR_CAST(size_t, parm->numSamples))) {
+ if (nrrdMaybeAlloc_va(tstate->nperm, nrrdTypeInt, 2, AIR_SIZE_T(ECHO_JITTABLE_NUM),
+ AIR_SIZE_T(parm->numSamples))) {
biffMovef(ECHO, NRRD, "%s: couldn't allocate jitter permutation array", me);
return 1;
}
nrrdAxisInfoSet_va(tstate->nperm, nrrdAxisInfoLabel, "jittable", "sample");
- if (nrrdMaybeAlloc_va(tstate->njitt, echoPos_nt, 3, AIR_CAST(size_t, 2),
- AIR_CAST(size_t, ECHO_JITTABLE_NUM),
- AIR_CAST(size_t, parm->numSamples))) {
+ if (nrrdMaybeAlloc_va(tstate->njitt, echoPos_nt, 3, AIR_SIZE_T(2),
+ AIR_SIZE_T(ECHO_JITTABLE_NUM), AIR_SIZE_T(parm->numSamples))) {
biffMovef(ECHO, NRRD, "%s: couldn't allocate jitter array", me);
return 1;
}
@@ -424,9 +422,8 @@
gstate->scene = scene;
gstate->parm = parm;
mop = airMopNew();
- if (nrrdMaybeAlloc_va(nraw, echoCol_nt, 3, AIR_CAST(size_t, ECHO_IMG_CHANNELS),
- AIR_CAST(size_t, parm->imgResU),
- AIR_CAST(size_t, parm->imgResV))) {
+ if (nrrdMaybeAlloc_va(nraw, echoCol_nt, 3, AIR_SIZE_T(ECHO_IMG_CHANNELS),
+ AIR_SIZE_T(parm->imgResU), AIR_SIZE_T(parm->imgResV))) {
biffMovef(ECHO, NRRD, "%s: couldn't allocate output image", me);
airMopError(mop);
return 1;
Modified: teem/trunk/src/gage/optimsig.c
===================================================================
--- teem/trunk/src/gage/optimsig.c 2023-07-16 02:21:56 UTC (rev 7116)
+++ teem/trunk/src/gage/optimsig.c 2023-07-16 02:29:25 UTC (rev 7117)
@@ -369,12 +369,11 @@
oscx->nerr = nrrdNew();
oscx->ninterp = nrrdNew();
oscx->ndiff = nrrdNew();
- if (nrrdMaybeAlloc_va(oscx->nerr, nrrdTypeDouble, 1,
- AIR_CAST(size_t, oscx->trueImgNum))
- || nrrdMaybeAlloc_va(oscx->ninterp, nrrdTypeDouble, 3, AIR_CAST(size_t, oscx->sx),
- AIR_CAST(size_t, oscx->sy), AIR_CAST(size_t, oscx->sz))
- || nrrdMaybeAlloc_va(oscx->ndiff, nrrdTypeDouble, 3, AIR_CAST(size_t, oscx->sx),
- AIR_CAST(size_t, oscx->sy), AIR_CAST(size_t, oscx->sz))) {
+ if (nrrdMaybeAlloc_va(oscx->nerr, nrrdTypeDouble, 1, AIR_SIZE_T(oscx->trueImgNum))
+ || nrrdMaybeAlloc_va(oscx->ninterp, nrrdTypeDouble, 3, AIR_SIZE_T(oscx->sx),
+ AIR_SIZE_T(oscx->sy), AIR_SIZE_T(oscx->sz))
+ || nrrdMaybeAlloc_va(oscx->ndiff, nrrdTypeDouble, 3, AIR_SIZE_T(oscx->sx),
+ AIR_SIZE_T(oscx->sy), AIR_SIZE_T(oscx->sz))) {
biffMovef(GAGE, NRRD, "%s: couldn't allocate buffers", me);
return NULL;
}
@@ -435,9 +434,8 @@
}
for (ii = 0; ii < oscx->sampleNumMax; ii++) {
oscx->nsampleImg[ii] = nrrdNew();
- if (nrrdMaybeAlloc_va(oscx->nsampleImg[ii], nrrdTypeDouble, 3,
- AIR_CAST(size_t, oscx->sx), AIR_CAST(size_t, oscx->sy),
- AIR_CAST(size_t, oscx->sz))) {
+ if (nrrdMaybeAlloc_va(oscx->nsampleImg[ii], nrrdTypeDouble, 3, AIR_SIZE_T(oscx->sx),
+ AIR_SIZE_T(oscx->sy), AIR_SIZE_T(oscx->sz))) {
biffMovef(GAGE, NRRD, "%s: couldn't allocate vol[%u]", me, ii);
return NULL;
}
@@ -1191,8 +1189,8 @@
oscx->imgMeasr = imgMeasr;
oscx->allMeasr = nrrdMeasureUnknown;
oscx->convEps = AIR_NAN;
- if (nrrdMaybeAlloc_va(nout, nrrdTypeDouble, 2, AIR_CAST(size_t, 2),
- AIR_CAST(size_t, oscx->trueImgNum))) {
+ if (nrrdMaybeAlloc_va(nout, nrrdTypeDouble, 2, AIR_SIZE_T(2),
+ AIR_SIZE_T(oscx->trueImgNum))) {
biffMovef(GAGE, NRRD, "%s: trouble allocating output", me);
return 1;
}
@@ -1297,8 +1295,7 @@
biffAddf(GAGE, "%s: problem setting up gage", me);
return 1;
}
- if (nrrdMaybeAlloc_va(nout, nrrdTypeDouble, 2, AIR_CAST(size_t, 2),
- AIR_CAST(size_t, sampleNum))) {
+ if (nrrdMaybeAlloc_va(nout, nrrdTypeDouble, 2, AIR_SIZE_T(2), AIR_SIZE_T(sampleNum))) {
biffMovef(GAGE, NRRD, "%s: trouble allocating output", me);
return 1;
}
@@ -1336,9 +1333,8 @@
if (debugReconErrArr) {
Nrrd *nre = nrrdNew();
- nrrdWrap_va(nre, debugReconErr, nrrdTypeDouble, 3, AIR_CAST(size_t, 2),
- AIR_CAST(size_t, oscx->sz * oscx->sy * oscx->sx),
- AIR_CAST(size_t, sampleNum));
+ nrrdWrap_va(nre, debugReconErr, nrrdTypeDouble, 3, AIR_SIZE_T(2),
+ AIR_SIZE_T(oscx->sz * oscx->sy * oscx->sx), AIR_SIZE_T(sampleNum));
nrrdSave(debugReconErrName, nre, NULL);
nrrdNix(nre);
}
Modified: teem/trunk/src/gage/st.c
===================================================================
--- teem/trunk/src/gage/st.c 2023-07-16 02:21:56 UTC (rev 7116)
+++ teem/trunk/src/gage/st.c 2023-07-16 02:29:25 UTC (rev 7117)
@@ -216,9 +216,8 @@
osx = AIR_INT((nin->axis[0].size) / dsmp);
osy = AIR_INT((nin->axis[1].size) / dsmp);
osz = AIR_INT((nin->axis[2].size) / dsmp);
- if (nrrdMaybeAlloc_va(nout, nrrdTypeDouble, 4, AIR_CAST(size_t, 7),
- AIR_CAST(size_t, osx), AIR_CAST(size_t, osy),
- AIR_CAST(size_t, osz))) {
+ if (nrrdMaybeAlloc_va(nout, nrrdTypeDouble, 4, AIR_SIZE_T(7), AIR_SIZE_T(osx),
+ AIR_SIZE_T(osy), AIR_SIZE_T(osz))) {
biffAddf(GAGE, NRRD, "%s: couldn't allocate output", me);
airMopError(mop);
return 1;
Modified: teem/trunk/src/gage/test/genoptsig.c
===================================================================
--- teem/trunk/src/gage/test/genoptsig.c 2023-07-16 02:21:56 UTC (rev 7116)
+++ teem/trunk/src/gage/test/genoptsig.c 2023-07-16 02:29:25 UTC (rev 7117)
@@ -39,7 +39,8 @@
double *scalePos, *out, info[512];
Nrrd *nout;
NrrdKernelSpec *kss;
- double *plotPos; unsigned int plotPosNum;
+ double *plotPos;
+ unsigned int plotPosNum;
me = argv[0];
mop = airMopNew();
@@ -62,8 +63,7 @@
hestOptAdd(&hopt, "eps", "eps", airTypeDouble, 1, 1, &convEps, "0.0001",
"convergence threshold for optimization");
hestOptAdd(&hopt, "m", "m1 m2", airTypeEnum, 2, 2, measr, "l2 l2",
- "how to measure error across image, and across scales",
- NULL, nrrdMeasure);
+ "how to measure error across image, and across scales", NULL, nrrdMeasure);
hestOptAdd(&hopt, "p", "s0 s1", airTypeDouble, 1, -1, &plotPos, "nan nan",
"hack: don't do optimization; just plot the recon error given "
"these (two or more) samples along scale. OR, hackier hack: "
@@ -75,10 +75,9 @@
"kernel for gageKernelStack", NULL, NULL, nrrdHestKernelSpec);
hestOptAdd(&hopt, "tent", NULL, airTypeInt, 0, 0, &tentRecon, NULL,
"same hack: plot error with tent recon, not hermite");
- hestOptAdd(&hopt, "o", "nout", airTypeString, 1, 1, &outS, NULL,
- "output array");
- hestParseOrDie(hopt, argc-1, argv+1, hparm,
- me, optsigInfo, AIR_TRUE, AIR_TRUE, AIR_TRUE);
+ hestOptAdd(&hopt, "o", "nout", airTypeString, 1, 1, &outS, NULL, "output array");
+ hestParseOrDie(hopt, argc - 1, argv + 1, hparm, me, optsigInfo, AIR_TRUE, AIR_TRUE,
+ AIR_TRUE);
airMopAdd(mop, hopt, (airMopper)hestOptFree, airMopAlways);
airMopAdd(mop, hopt, (airMopper)hestParseFree, airMopAlways);
@@ -85,17 +84,15 @@
nout = nrrdNew();
airMopAdd(mop, nout, AIR_CAST(airMopper, nrrdNuke), airMopAlways);
- osctx = gageOptimSigContextNew(dim, sampleNum[1],
- measrSampleNum,
- sigma[0], sigma[1],
+ osctx = gageOptimSigContextNew(dim, sampleNum[1], measrSampleNum, sigma[0], sigma[1],
cutoff);
if (!osctx) {
airMopAdd(mop, err = biffGetDone(GAGE), airFree, airMopAlways);
fprintf(stderr, "%s: trouble:\n%s", me, err);
- airMopError(mop); return 1;
+ airMopError(mop);
+ return 1;
}
- airMopAdd(mop, osctx, AIR_CAST(airMopper, gageOptimSigContextNix),
- airMopAlways);
+ airMopAdd(mop, osctx, AIR_CAST(airMopper, gageOptimSigContextNix), airMopAlways);
scalePos = AIR_CALLOC(sampleNum[1], double);
airMopAdd(mop, scalePos, airFree, airMopAlways);
@@ -102,32 +99,29 @@
if (1 == plotPosNum && AIR_EXISTS(plotPos[0])) {
/* hackity hack: a different kind of plotting requested */
- if (gageOptimSigErrorPlotSliding(osctx, nout,
- plotPos[0],
- measrSampleNum,
- kss, measr[0])) {
+ if (gageOptimSigErrorPlotSliding(osctx, nout, plotPos[0], measrSampleNum, kss,
+ measr[0])) {
airMopAdd(mop, err = biffGetDone(GAGE), airFree, airMopAlways);
fprintf(stderr, "%s: trouble:\n%s", me, err);
- airMopError(mop); return 1;
+ airMopError(mop);
+ return 1;
}
} else if (AIR_EXISTS(plotPos[0]) && AIR_EXISTS(plotPos[1])) {
/* hack: plotting requested */
- if (gageOptimSigErrorPlot(osctx, nout,
- plotPos, plotPosNum,
- kss,
- measr[0])) {
+ if (gageOptimSigErrorPlot(osctx, nout, plotPos, plotPosNum, kss, measr[0])) {
airMopAdd(mop, err = biffGetDone(GAGE), airFree, airMopAlways);
fprintf(stderr, "%s: trouble:\n%s", me, err);
- airMopError(mop); return 1;
+ airMopError(mop);
+ return 1;
}
} else {
/* do sample position optimization */
- if (nrrdMaybeAlloc_va(nout, nrrdTypeDouble, 2,
- AIR_CAST(size_t, sampleNum[1]+1),
- AIR_CAST(size_t, sampleNum[1]+1))) {
+ if (nrrdMaybeAlloc_va(nout, nrrdTypeDouble, 2, AIR_SIZE_T(sampleNum[1] + 1),
+ AIR_SIZE_T(sampleNum[1] + 1))) {
airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
fprintf(stderr, "%s: trouble allocating output:\n%s", me, err);
- airMopError(mop); return 1;
+ airMopError(mop);
+ return 1;
}
out = AIR_CAST(double *, nout->data);
/* hacky way of saving some of the computation information */
@@ -138,23 +132,23 @@
info[3] = measr[1];
info[4] = convEps;
info[5] = maxIter;
- for (ii=0; ii<sampleNum[1]+1; ii++) {
+ for (ii = 0; ii < sampleNum[1] + 1; ii++) {
out[ii] = info[ii];
}
- for (num=sampleNum[0]; num<=sampleNum[1]; num++) {
- printf("\n%s: ======= optimizing %u/%u samples (sigma %g--%g) \n\n",
- me, num, sampleNum[1]+1, sigma[0], sigma[1]);
- if (gageOptimSigCalculate(osctx, scalePos, num,
- kss, measr[0], measr[1],
- maxIter, convEps)) {
+ for (num = sampleNum[0]; num <= sampleNum[1]; num++) {
+ printf("\n%s: ======= optimizing %u/%u samples (sigma %g--%g) \n\n", me, num,
+ sampleNum[1] + 1, sigma[0], sigma[1]);
+ if (gageOptimSigCalculate(osctx, scalePos, num, kss, measr[0], measr[1], maxIter,
+ convEps)) {
airMopAdd(mop, err = biffGetDone(GAGE), airFree, airMopAlways);
fprintf(stderr, "%s: trouble:\n%s", me, err);
- airMopError(mop); return 1;
+ airMopError(mop);
+ return 1;
}
- for (ii=0; ii<num; ii++) {
- out[ii + (sampleNum[1]+1)*num] = scalePos[ii];
+ for (ii = 0; ii < num; ii++) {
+ out[ii + (sampleNum[1] + 1) * num] = scalePos[ii];
}
- out[sampleNum[1] + (sampleNum[1]+1)*num] = osctx->finalErr;
+ out[sampleNum[1] + (sampleNum[1] + 1) * num] = osctx->finalErr;
}
}
if (nrrdSave(outS, nout, NULL)) {
Modified: teem/trunk/src/gage/test/tplot.c
===================================================================
--- teem/trunk/src/gage/test/tplot.c 2023-07-16 02:21:56 UTC (rev 7116)
+++ teem/trunk/src/gage/test/tplot.c 2023-07-16 02:29:25 UTC (rev 7117)
@@ -49,29 +49,27 @@
"domain of plot is t, not sigma");
hestOptAdd(&hopt, "mm", "min max", airTypeDouble, 2, 2, dommm, NULL,
"range of domain to plot");
- hestOptAdd(&hopt, "n", "# samp", airTypeUInt, 1, 1, &num, NULL,
- "number of samples");
- hestOptAdd(&hopt, "o", "filename", airTypeString, 1, 1, &outS, NULL,
- "output volume");
- hestParseOrDie(hopt, argc-1, argv+1, hparm,
- me, tplotInfo, AIR_TRUE, AIR_TRUE, AIR_TRUE);
+ hestOptAdd(&hopt, "n", "# samp", airTypeUInt, 1, 1, &num, NULL, "number of samples");
+ hestOptAdd(&hopt, "o", "filename", airTypeString, 1, 1, &outS, NULL, "output volume");
+ hestParseOrDie(hopt, argc - 1, argv + 1, hparm, me, tplotInfo, AIR_TRUE, AIR_TRUE,
+ AIR_TRUE);
airMopAdd(mop, hopt, (airMopper)hestOptFree, airMopAlways);
airMopAdd(mop, hopt, (airMopper)hestParseFree, airMopAlways);
nout = nrrdNew();
airMopAdd(mop, nout, (airMopper)nrrdNuke, airMopAlways);
- if (nrrdMaybeAlloc_va(nout, nrrdTypeDouble, 1,
- AIR_CAST(size_t, num))) {
+ if (nrrdMaybeAlloc_va(nout, nrrdTypeDouble, 1, AIR_SIZE_T(num))) {
airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
fprintf(stderr, "%s: couldn't allocate output:\n%s", me, err);
- airMopError(mop); return 1;
+ airMopError(mop);
+ return 1;
}
out = AIR_CAST(double *, nout->data);
nout->axis[0].min = dommm[0];
nout->axis[0].max = dommm[1];
nout->axis[0].center = nrrdCenterNode;
- for (ii=0; ii<num; ii++) {
- dd = AIR_AFFINE(0, ii, num-1, dommm[0], dommm[1]);
+ for (ii = 0; ii < num; ii++) {
+ dd = AIR_AFFINE(0, ii, num - 1, dommm[0], dommm[1]);
out[ii] = tee ? gageTauOfTee(dd) : gageTauOfSig(dd);
}
@@ -78,7 +76,8 @@
if (nrrdSave(outS, nout, NULL)) {
airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
fprintf(stderr, "%s: couldn't save output:\n%s", me, err);
- airMopError(mop); return 1;
+ airMopError(mop);
+ return 1;
}
airMopOkay(mop);
Modified: teem/trunk/src/limn/cam.c
===================================================================
--- teem/trunk/src/limn/cam.c 2023-07-16 02:21:56 UTC (rev 7116)
+++ teem/trunk/src/limn/cam.c 2023-07-16 02:29:25 UTC (rev 7117)
@@ -230,7 +230,7 @@
airMopAdd(mop, ndist = nrrdNew(), (airMopper)nrrdNuke, airMopAlways);
airMopAdd(mop, nfova = nrrdNew(), (airMopper)nrrdNuke, airMopAlways);
airMopAdd(mop, ntime = nrrdNew(), (airMopper)nrrdNix, airMopAlways);
- if (nrrdWrap_va(ntime, time, nrrdTypeDouble, 1, AIR_CAST(size_t, numKeys))) {
+ if (nrrdWrap_va(ntime, time, nrrdTypeDouble, 1, AIR_SIZE_T(numKeys))) {
biffMovef(LIMN, NRRD, "%s: trouble wrapping time values", me);
airMopError(mop);
return 1;
@@ -238,18 +238,13 @@
airMopAdd(mop, nsample = nrrdNew(), (airMopper)nrrdNuke, airMopAlways);
timeType = limnSplineTypeSpecNew(limnSplineTypeTimeWarp);
airMopAdd(mop, timeType, (airMopper)limnSplineTypeSpecNix, airMopAlways);
- if (nrrdMaybeAlloc_va(nquat, nrrdTypeDouble, 2, AIR_CAST(size_t, 4),
- AIR_CAST(size_t, numKeys))
- || nrrdMaybeAlloc_va(nfrom, nrrdTypeDouble, 2, AIR_CAST(size_t, 3),
- AIR_CAST(size_t, numKeys))
- || nrrdMaybeAlloc_va(natpt, nrrdTypeDouble, 2, AIR_CAST(size_t, 3),
- AIR_CAST(size_t, numKeys))
- || nrrdMaybeAlloc_va(nupvc, nrrdTypeDouble, 2, AIR_CAST(size_t, 3),
- AIR_CAST(size_t, numKeys))
- || nrrdMaybeAlloc_va(ndist, nrrdTypeDouble, 2, AIR_CAST(size_t, 4),
- AIR_CAST(size_t, numKeys))
- || nrrdMaybeAlloc_va(nfova, nrrdTypeDouble, 2, AIR_CAST(size_t, 2),
- AIR_CAST(size_t, numKeys))) {
+ if (nrrdMaybeAlloc_va(nquat, nrrdTypeDouble, 2, AIR_SIZE_T(4), AIR_SIZE_T(numKeys))
+ || nrrdMaybeAlloc_va(nfrom, nrrdTypeDouble, 2, AIR_SIZE_T(3), AIR_SIZE_T(numKeys))
+ || nrrdMaybeAlloc_va(natpt, nrrdTypeDouble, 2, AIR_SIZE_T(3), AIR_SIZE_T(numKeys))
+ || nrrdMaybeAlloc_va(nupvc, nrrdTypeDouble, 2, AIR_SIZE_T(3), AIR_SIZE_T(numKeys))
+ || nrrdMaybeAlloc_va(ndist, nrrdTypeDouble, 2, AIR_SIZE_T(4), AIR_SIZE_T(numKeys))
+ || nrrdMaybeAlloc_va(nfova, nrrdTypeDouble, 2, AIR_SIZE_T(2),
+ AIR_SIZE_T(numKeys))) {
biffMovef(LIMN, NRRD, "%s: couldn't allocate buffer nrrds", me);
airMopError(mop);
return 1;
Modified: teem/trunk/src/limn/envmap.c
===================================================================
--- teem/trunk/src/limn/envmap.c 2023-07-16 02:21:56 UTC (rev 7116)
+++ teem/trunk/src/limn/envmap.c 2023-07-16 02:29:25 UTC (rev 7117)
@@ -76,8 +76,8 @@
biffAddf(LIMN, "%s: sorry, QN method %d not implemented", me, qnMethod);
return 1;
}
- if (nrrdMaybeAlloc_va(map, nrrdTypeFloat, 3, AIR_CAST(size_t, 3), AIR_CAST(size_t, sx),
- AIR_CAST(size_t, sy))) {
+ if (nrrdMaybeAlloc_va(map, nrrdTypeFloat, 3, AIR_SIZE_T(3), AIR_SIZE_T(sx),
+ AIR_SIZE_T(sy))) {
biffMovef(LIMN, NRRD, "%s: couldn't alloc output", me);
return 1;
}
Modified: teem/trunk/src/limn/polydata.c
===================================================================
--- teem/trunk/src/limn/polydata.c 2023-07-16 02:21:56 UTC (rev 7116)
+++ teem/trunk/src/limn/polydata.c 2023-07-16 02:29:25 UTC (rev 7117)
@@ -556,7 +556,7 @@
biffAddf(LIMN, "%s: got NULL pointer", me);
return 1;
}
- if (nrrdMaybeAlloc_va(nout, nrrdTypeUInt, 1, AIR_CAST(size_t, pld->primNum))) {
+ if (nrrdMaybeAlloc_va(nout, nrrdTypeUInt, 1, AIR_SIZE_T(pld->primNum))) {
biffMovef(LIMN, NRRD, "%s: couldn't allocate output", me);
return 1;
}
@@ -581,7 +581,7 @@
biffAddf(LIMN, "%s: got NULL pointer", me);
return 1;
}
- if (nrrdMaybeAlloc_va(nout, nrrdTypeDouble, 1, AIR_CAST(size_t, pld->primNum))) {
+ if (nrrdMaybeAlloc_va(nout, nrrdTypeDouble, 1, AIR_SIZE_T(pld->primNum))) {
biffMovef(LIMN, NRRD, "%s: couldn't allocate output", me);
return 1;
}
Modified: teem/trunk/src/limn/polyfilter.c
===================================================================
--- teem/trunk/src/limn/polyfilter.c 2023-07-16 02:21:56 UTC (rev 7116)
+++ teem/trunk/src/limn/polyfilter.c 2023-07-16 02:29:25 UTC (rev 7117)
@@ -65,7 +65,7 @@
return 1;
}
if (nvertmap) {
- if (nrrdMaybeAlloc_va(nvertmap, nrrdTypeUInt, 1, AIR_CAST(size_t, tubeVertNum))) {
+ if (nrrdMaybeAlloc_va(nvertmap, nrrdTypeUInt, 1, AIR_SIZE_T(tubeVertNum))) {
biffMovef(LIMN, NRRD, "%s: trouble allocating vert map", me);
return 1;
}
Modified: teem/trunk/src/limn/polymod.c
===================================================================
--- teem/trunk/src/limn/polymod.c 2023-07-16 02:21:56 UTC (rev 7116)
+++ teem/trunk/src/limn/polymod.c 2023-07-16 02:29:25 UTC (rev 7117)
@@ -282,9 +282,8 @@
for (vertIdx = 0; vertIdx < pld->xyzwNum; vertIdx++) {
maxTriPerVert = AIR_MAX(maxTriPerVert, triWithVertNum[vertIdx]);
}
- if (nrrdMaybeAlloc_va(nTriWithVert, nrrdTypeUInt, 2,
- AIR_CAST(size_t, 1 + maxTriPerVert),
- AIR_CAST(size_t, pld->xyzwNum))) {
+ if (nrrdMaybeAlloc_va(nTriWithVert, nrrdTypeUInt, 2, AIR_SIZE_T(1 + maxTriPerVert),
+ AIR_SIZE_T(pld->xyzwNum))) {
biffMovef(LIMN, NRRD, "%s: couldn't allocate output", me);
airMopError(mop);
return 1;
@@ -331,8 +330,8 @@
}
triNum = limnPolyDataPolygonNumber(pld);
- if (nrrdMaybeAlloc_va(nVertWithTri, nrrdTypeUInt, 2, AIR_CAST(size_t, 3),
- AIR_CAST(size_t, triNum))) {
+ if (nrrdMaybeAlloc_va(nVertWithTri, nrrdTypeUInt, 2, AIR_SIZE_T(3),
+ AIR_SIZE_T(triNum))) {
biffMovef(LIMN, NRRD, "%s: couldn't allocate output", me);
return 1;
}
@@ -1315,7 +1314,7 @@
airMopAdd(mop, nTriMap, (airMopper)nrrdNuke, airMopAlways);
nccSize = nrrdNew();
airMopAdd(mop, nccSize, (airMopper)nrrdNuke, airMopAlways);
- if (nrrdMaybeAlloc_va(nTriMap, nrrdTypeUInt, 1, AIR_CAST(size_t, realTriNum))) {
+ if (nrrdMaybeAlloc_va(nTriMap, nrrdTypeUInt, 1, AIR_SIZE_T(realTriNum))) {
biffMovef(LIMN, NRRD, "%s: couldn't allocate equivalence map", me);
airMopError(mop);
return 1;
Modified: teem/trunk/src/limn/qn.c
===================================================================
--- teem/trunk/src/limn/qn.c 2023-07-16 02:21:56 UTC (rev 7116)
+++ teem/trunk/src/limn/qn.c 2023-07-16 02:29:25 UTC (rev 7117)
@@ -899,9 +899,8 @@
biffAddf(LIMN, "%s: got NULL pointer", me);
return 1;
}
- if (nrrdMaybeAlloc_va(nqn, nrrdTypeDouble, 4, AIR_CAST(size_t, reso),
- AIR_CAST(size_t, reso), AIR_CAST(size_t, 6),
- AIR_CAST(size_t, 2))) {
+ if (nrrdMaybeAlloc_va(nqn, nrrdTypeDouble, 4, AIR_SIZE_T(reso), AIR_SIZE_T(reso),
+ AIR_SIZE_T(6), AIR_SIZE_T(2))) {
biffMovef(LIMN, NRRD, "%s: couldn't alloc output", me);
return 1;
}
Modified: teem/trunk/src/limn/splineMethods.c
===================================================================
--- teem/trunk/src/limn/splineMethods.c 2023-07-16 02:21:56 UTC (rev 7116)
+++ teem/trunk/src/limn/splineMethods.c 2023-07-16 02:29:25 UTC (rev 7117)
@@ -197,8 +197,8 @@
/* now allocate the real control point information */
spline->ncpt = nrrdNew();
airMopAdd(mop, spline->ncpt, (airMopper)nrrdNuke, airMopOnError);
- if (nrrdMaybeAlloc_va(spline->ncpt, nrrdTypeDouble, 3, AIR_CAST(size_t, 1),
- AIR_CAST(size_t, 3), _ncpt->axis[0].size)) {
+ if (nrrdMaybeAlloc_va(spline->ncpt, nrrdTypeDouble, 3, AIR_SIZE_T(1), AIR_SIZE_T(3),
+ _ncpt->axis[0].size)) {
biffMovef(LIMN, NRRD, "%s: trouble allocating real control points", me);
airMopError(mop);
return NULL;
Modified: teem/trunk/src/make/darwin.mk
===================================================================
--- teem/trunk/src/make/darwin.mk 2023-07-16 02:21:56 UTC (rev 7116)
+++ teem/trunk/src/make/darwin.mk 2023-07-16 02:29:25 UTC (rev 7117)
@@ -1,24 +1,26 @@
#
# Teem: Tools to process and visualize scientific data and images
-# Copyright (C) 2009--2023 University of Chicago
-# Copyright (C) 2005--2008 Gordon Kindlmann
-# Copyright (C) 1998--2004 University of Utah
+# Copyright (C) 2008, 2007, 2006, 2005 Gordon Kindlmann
+# Copyright (C) 2004, 2003, 2002, 2001, 2000, 1999, 1998 University of Utah
#
-# This library is free software; you can redistribute it and/or modify it under the terms
-# of the GNU Lesser General Public License (LGPL) as published by the Free Software
-# Foundation; either version 2.1 of the License, or (at your option) any later version.
-# The terms of redistributing and/or modifying this software also include exceptions to
-# the LGPL that facilitate static linking.
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public License
+# (LGPL) as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+# The terms of redistributing and/or modifying this software also
+# include exceptions to the LGPL that facilitate static linking.
#
-# This library is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without...
[truncated message content] |
|
From: <kin...@us...> - 2023-07-16 02:21:59
|
Revision: 7116
http://sourceforge.net/p/teem/code/7116
Author: kindlmann
Date: 2023-07-16 02:21:56 +0000 (Sun, 16 Jul 2023)
Log Message:
-----------
WEIRD: how was this working before? if the min number of parms was 1 instead of 0. It needs to be zero
Modified Paths:
--------------
teem/trunk/src/unrrdu/basinfo.c
Modified: teem/trunk/src/unrrdu/basinfo.c
===================================================================
--- teem/trunk/src/unrrdu/basinfo.c 2023-07-15 21:57:26 UTC (rev 7115)
+++ teem/trunk/src/unrrdu/basinfo.c 2023-07-16 02:21:56 UTC (rev 7116)
@@ -61,7 +61,7 @@
"many coefficients are needed for the chosen space). Quoting the "
"vector is needed to stop interpretation from the shell");
/* HEY: copy and paste from unrrdu/make.c */
- hestOptAdd_Nv_String(&opt, "kv,keyvalue", "key/val", 1, -1, &kvp, "",
+ hestOptAdd_Nv_String(&opt, "kv,keyvalue", "key/val", 0, -1, &kvp, "",
"key/value string pairs to be stored in nrrd. Each key/value "
"pair must be a single string (put it in \"\"s "
"if the key or the value contain spaces). The format of each "
@@ -68,7 +68,7 @@
"pair is \"<key>:=<value>\", with no spaces before or after "
"\":=\".",
&kvpLen);
- hestOptAdd_Nv_String(&opt, "dk,delkey", "key", 1, -1, &dkey, "",
+ hestOptAdd_Nv_String(&opt, "dk,delkey", "key", 0, -1, &dkey, "",
"keys to be deleted (erased) from key/value pairs", &dkeyLen);
hestOptAdd_Flag(&opt, "xkv,nixkeyvalue", &nixkvp, "nix (clear) all key/value pairs");
cIdx = hestOptAdd_1_String(
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kin...@us...> - 2023-07-15 21:57:29
|
Revision: 7115
http://sourceforge.net/p/teem/code/7115
Author: kindlmann
Date: 2023-07-15 21:57:26 +0000 (Sat, 15 Jul 2023)
Log Message:
-----------
using new AIR_SIZE_T (and some overdue clang-format)
Modified Paths:
--------------
teem/trunk/src/nrrd/apply1D.c
teem/trunk/src/nrrd/cc.c
teem/trunk/src/nrrd/ccmethods.c
teem/trunk/src/nrrd/deringNrrd.c
teem/trunk/src/nrrd/encodingGzip.c
teem/trunk/src/nrrd/formatPNM.c
teem/trunk/src/nrrd/formatVTK.c
teem/trunk/src/nrrd/histogram.c
teem/trunk/src/nrrd/map.c
teem/trunk/src/nrrd/methodsNrrd.c
teem/trunk/src/nrrd/resampleContext.c
teem/trunk/src/nrrd/subset.c
teem/trunk/src/nrrd/test/ax.c
teem/trunk/src/nrrd/test/genvol.c
teem/trunk/src/nrrd/test/histrad.c
teem/trunk/src/nrrd/test/phrnd.c
teem/trunk/src/nrrd/test/quadvol.c
teem/trunk/src/nrrd/test/texp.c
teem/trunk/src/nrrd/test/trand.c
Modified: teem/trunk/src/nrrd/apply1D.c
===================================================================
--- teem/trunk/src/nrrd/apply1D.c 2023-07-15 21:56:46 UTC (rev 7114)
+++ teem/trunk/src/nrrd/apply1D.c 2023-07-15 21:57:26 UTC (rev 7115)
@@ -830,8 +830,7 @@
airSprintSize_t(stmp, aclLen));
return 1;
}
- if (nrrdMaybeAlloc_va(nacl, nrrdTypeUShort, 2, AIR_CAST(size_t, 2),
- AIR_CAST(size_t, aclLen))) {
+ if (nrrdMaybeAlloc_va(nacl, nrrdTypeUShort, 2, AIR_SIZE_T(2), AIR_SIZE_T(aclLen))) {
biffAddf(NRRD, "%s: ", me);
return 1;
}
Modified: teem/trunk/src/nrrd/cc.c
===================================================================
--- teem/trunk/src/nrrd/cc.c 2023-07-15 21:56:46 UTC (rev 7114)
+++ teem/trunk/src/nrrd/cc.c 2023-07-15 21:57:26 UTC (rev 7115)
@@ -374,7 +374,7 @@
if (!(*nvalP)) {
*nvalP = nrrdNew();
}
- if (nrrdMaybeAlloc_va(*nvalP, nin->type, 1, AIR_CAST(size_t, numsettleid))) {
+ if (nrrdMaybeAlloc_va(*nvalP, nin->type, 1, AIR_SIZE_T(numsettleid))) {
biffAddf(NRRD, "%s: couldn't allocate output value list", me);
airMopError(mop);
return 1;
@@ -561,8 +561,8 @@
return 1;
}
maxid = nrrdCCMax(nin);
- if (nrrdMaybeAlloc_va(nout, nrrdTypeUChar, 2, AIR_CAST(size_t, maxid + 1),
- AIR_CAST(size_t, maxid + 1))) {
+ if (nrrdMaybeAlloc_va(nout, nrrdTypeUChar, 2, AIR_SIZE_T(maxid + 1),
+ AIR_SIZE_T(maxid + 1))) {
biffAddf(NRRD, "%s: trouble allocating output", me);
return 1;
}
@@ -858,7 +858,7 @@
if (!(*nvalP)) {
*nvalP = nrrdNew();
}
- if (nrrdMaybeAlloc_va(*nvalP, nin->type, 1, AIR_CAST(size_t, numid))) {
+ if (nrrdMaybeAlloc_va(*nvalP, nin->type, 1, AIR_SIZE_T(numid))) {
biffAddf(NRRD, "%s: couldn't allocate output value list", me);
airMopError(mop);
return 1;
Modified: teem/trunk/src/nrrd/ccmethods.c
===================================================================
--- teem/trunk/src/nrrd/ccmethods.c 2023-07-15 21:56:46 UTC (rev 7114)
+++ teem/trunk/src/nrrd/ccmethods.c 2023-07-15 21:57:26 UTC (rev 7115)
@@ -64,7 +64,7 @@
return 1;
}
maxid = nrrdCCMax(nin);
- if (nrrdMaybeAlloc_va(nout, nrrdTypeUInt, 1, AIR_CAST(size_t, maxid + 1))) {
+ if (nrrdMaybeAlloc_va(nout, nrrdTypeUInt, 1, AIR_SIZE_T(maxid + 1))) {
biffAddf(NRRD, "%s: can't allocate output", me);
return 1;
}
Modified: teem/trunk/src/nrrd/deringNrrd.c
===================================================================
--- teem/trunk/src/nrrd/deringNrrd.c 2023-07-15 21:56:46 UTC (rev 7114)
+++ teem/trunk/src/nrrd/deringNrrd.c 2023-07-15 21:57:26 UTC (rev 7115)
@@ -381,11 +381,10 @@
for (pi = 0; pi < PTXF_NUM; pi++) {
if (drc->verticalSeam && (CROP == pi || CBLR == pi)) {
E = nrrdMaybeAlloc_va(dbg->nptxf[pi], nrrdTypeDouble, 3, dbg->radNum,
- AIR_CAST(size_t, drc->thetaNum / 2 - 1),
- AIR_CAST(size_t, 2));
+ AIR_SIZE_T(drc->thetaNum / 2 - 1), AIR_SIZE_T(2));
} else {
E = nrrdMaybeAlloc_va(dbg->nptxf[pi], nrrdTypeDouble, 2, dbg->radNum,
- AIR_CAST(size_t, drc->thetaNum));
+ AIR_SIZE_T(drc->thetaNum));
}
if (E) {
biffAddf(NRRD, "%s: polar transform allocation problem", me);
@@ -655,7 +654,7 @@
airMopAdd(mop, ntmp[1], (airMopper)nrrdNuke, airMopAlways);
if (nrrdReshape_va(ntmp[0], dbg->nptxf[RING], 2,
(dbg->nptxf[RING]->axis[0].size * dbg->nptxf[RING]->axis[1].size),
- AIR_CAST(size_t, 1))
+ AIR_SIZE_T(1))
|| nrrdProject(ntmp[1], ntmp[0], 0, nrrdMeasureL2, nrrdTypeDouble)) {
biffAddf(NRRD, "%s: trouble", me);
airMopError(mop);
Modified: teem/trunk/src/nrrd/encodingGzip.c
===================================================================
--- teem/trunk/src/nrrd/encodingGzip.c 2023-07-15 21:56:46 UTC (rev 7114)
+++ teem/trunk/src/nrrd/encodingGzip.c 2023-07-15 21:57:26 UTC (rev 7115)
@@ -127,10 +127,10 @@
}
/* backwards is (positive) number of bytes AFTER data that we ignore */
backwards = -nio->byteSkip - 1;
- if (sizeRed < sizeData + AIR_CAST(size_t, backwards)) {
+ if (sizeRed < sizeData + AIR_SIZE_T(backwards)) {
char stmp[2][AIR_STRLEN_SMALL + 1];
biffAddf(NRRD, "%s: expected %s bytes but received only %s", me,
- airSprintSize_t(stmp[0], sizeData + AIR_CAST(size_t, backwards)),
+ airSprintSize_t(stmp[0], sizeData + AIR_SIZE_T(backwards)),
airSprintSize_t(stmp[1], sizeRed));
return 1;
}
Modified: teem/trunk/src/nrrd/formatPNM.c
===================================================================
--- teem/trunk/src/nrrd/formatPNM.c 2023-07-15 21:56:46 UTC (rev 7114)
+++ teem/trunk/src/nrrd/formatPNM.c 2023-07-15 21:57:26 UTC (rev 7115)
@@ -163,8 +163,8 @@
goto plain;
}
/* else this PNM comment is trying to tell us something */
- nio->pos = AIR_CAST(int, strlen(NRRD_PNM_COMMENT));
- nio->pos += AIR_CAST(int, strspn(nio->line + nio->pos, _nrrdFieldSep));
+ nio->pos = AIR_INT(strlen(NRRD_PNM_COMMENT));
+ nio->pos += AIR_INT(strspn(nio->line + nio->pos, _nrrdFieldSep));
ret = _nrrdReadNrrdParseField(nio, AIR_FALSE);
if (!ret) {
if (1 <= nrrdStateVerboseIO) {
@@ -249,11 +249,10 @@
/* we know what we need in order to set nrrd fields and read data */
if (color) {
- nrrdAxisInfoSet_va(nrrd, nrrdAxisInfoSize, AIR_CAST(size_t, 3), AIR_CAST(size_t, sx),
- AIR_CAST(size_t, sy));
+ nrrdAxisInfoSet_va(nrrd, nrrdAxisInfoSize, AIR_SIZE_T(3), AIR_SIZE_T(sx),
+ AIR_SIZE_T(sy));
} else {
- nrrdAxisInfoSet_va(nrrd, nrrdAxisInfoSize, AIR_CAST(size_t, sx),
- AIR_CAST(size_t, sy));
+ nrrdAxisInfoSet_va(nrrd, nrrdAxisInfoSize, AIR_SIZE_T(sx), AIR_SIZE_T(sy));
}
if (!nio->skipData) {
if (_nrrdCalloc(nrrd, nio, file)) {
Modified: teem/trunk/src/nrrd/formatVTK.c
===================================================================
--- teem/trunk/src/nrrd/formatVTK.c 2023-07-15 21:56:46 UTC (rev 7114)
+++ teem/trunk/src/nrrd/formatVTK.c 2023-07-15 21:57:26 UTC (rev 7115)
@@ -220,21 +220,21 @@
return 1;
}
nrrd->dim = 3;
- nrrdAxisInfoSet_va(nrrd, nrrdAxisInfoSize, AIR_CAST(size_t, sx),
- AIR_CAST(size_t, sy), AIR_CAST(size_t, sz));
+ nrrdAxisInfoSet_va(nrrd, nrrdAxisInfoSize, AIR_SIZE_T(sx), AIR_SIZE_T(sy),
+ AIR_SIZE_T(sz));
nrrdAxisInfoSet_va(nrrd, nrrdAxisInfoSpacing, xs, ys, zs);
nrrdAxisInfoSet_va(nrrd, nrrdAxisInfoMin, xm, ym, zm);
} else if (!strncmp("VECTORS", three[0], strlen("VECTORS"))) {
nrrd->dim = 4;
- nrrdAxisInfoSet_va(nrrd, nrrdAxisInfoSize, AIR_CAST(size_t, 3), AIR_CAST(size_t, sx),
- AIR_CAST(size_t, sy), AIR_CAST(size_t, sz));
+ nrrdAxisInfoSet_va(nrrd, nrrdAxisInfoSize, AIR_SIZE_T(3), AIR_SIZE_T(sx),
+ AIR_SIZE_T(sy), AIR_SIZE_T(sz));
nrrdAxisInfoSet_va(nrrd, nrrdAxisInfoSpacing, AIR_NAN, xs, ys, zs);
nrrdAxisInfoSet_va(nrrd, nrrdAxisInfoMin, AIR_NAN, xm, ym, zm);
nrrd->axis[0].kind = nrrdKind3Vector;
} else if (!strncmp("TENSORS", three[0], strlen("TENSORS"))) {
nrrd->dim = 4;
- nrrdAxisInfoSet_va(nrrd, nrrdAxisInfoSize, AIR_CAST(size_t, 9), AIR_CAST(size_t, sx),
- AIR_CAST(size_t, sy), AIR_CAST(size_t, sz));
+ nrrdAxisInfoSet_va(nrrd, nrrdAxisInfoSize, AIR_SIZE_T(9), AIR_SIZE_T(sx),
+ AIR_SIZE_T(sy), AIR_SIZE_T(sz));
nrrdAxisInfoSet_va(nrrd, nrrdAxisInfoSpacing, AIR_NAN, xs, ys, zs);
nrrdAxisInfoSet_va(nrrd, nrrdAxisInfoMin, AIR_NAN, xm, ym, zm);
nrrd->axis[0].kind = nrrdKind3DMatrix;
Modified: teem/trunk/src/nrrd/histogram.c
===================================================================
--- teem/trunk/src/nrrd/histogram.c 2023-07-15 21:56:46 UTC (rev 7114)
+++ teem/trunk/src/nrrd/histogram.c 2023-07-15 21:57:26 UTC (rev 7115)
@@ -293,7 +293,7 @@
if (!E) E |= nrrdCommentAdd(nout, cmt);
sprintf(cmt, "max hits: %g, in bin %s, around value %g\n", maxhits,
airSprintSize_t(stmp, maxhitidx),
- nrrdAxisInfoPos(nout, 0, AIR_CAST(double, maxhitidx)));
+ nrrdAxisInfoPos(nout, 0, AIR_DOUBLE(maxhitidx)));
if (!E) E |= nrrdCommentAdd(nout, cmt);
if (!E) E |= nrrdContentSet_va(nout, func, nin, "%s", airSprintSize_t(stmp, sy));
if (E) {
@@ -600,9 +600,8 @@
break;
}
}
- coord[ai] = AIR_CAST(size_t,
- airIndexClampULL(range[ai]->min, val, range[ai]->max,
- bins[ai]));
+ coord[ai] = AIR_SIZE_T(airIndexClampULL(range[ai]->min, val, range[ai]->max,
+ bins[ai]));
}
if (skip) {
continue;
Modified: teem/trunk/src/nrrd/map.c
===================================================================
--- teem/trunk/src/nrrd/map.c 2023-07-15 21:56:46 UTC (rev 7114)
+++ teem/trunk/src/nrrd/map.c 2023-07-15 21:57:26 UTC (rev 7115)
@@ -663,7 +663,7 @@
/* for "smart" mode, we have to some extra work while creating the
histogram to look for bins incessantly hit with the exact same
value */
- if (nrrdMaybeAlloc_va(nhist = nrrdNew(), nrrdTypeUInt, 1, AIR_CAST(size_t, bins))) {
+ if (nrrdMaybeAlloc_va(nhist = nrrdNew(), nrrdTypeUInt, 1, AIR_SIZE_T(bins))) {
biffAddf(NRRD, "%s: failed to allocate histogram", me);
airMopError(mop);
return 1;
@@ -722,8 +722,7 @@
/* printf("%s: disrespecting bin %d\n", me, steady[1+2*bii]); */
}
}
- if (nrrdMaybeAlloc_va(nmap = nrrdNew(), nrrdTypeDouble, 1,
- AIR_CAST(size_t, bins + 1))) {
+ if (nrrdMaybeAlloc_va(nmap = nrrdNew(), nrrdTypeDouble, 1, AIR_SIZE_T(bins + 1))) {
biffAddf(NRRD, "%s: failed to create map nrrd", me);
airMopError(mop);
return 1;
Modified: teem/trunk/src/nrrd/methodsNrrd.c
===================================================================
--- teem/trunk/src/nrrd/methodsNrrd.c 2023-07-15 21:56:46 UTC (rev 7114)
+++ teem/trunk/src/nrrd/methodsNrrd.c 2023-07-15 21:57:26 UTC (rev 7115)
@@ -1381,7 +1381,7 @@
static const char me[] = "nrrdPPM";
char stmp[2][AIR_STRLEN_SMALL + 1];
- if (nrrdMaybeAlloc_va(ppm, nrrdTypeUChar, 3, AIR_CAST(size_t, 3), sx, sy)) {
+ if (nrrdMaybeAlloc_va(ppm, nrrdTypeUChar, 3, AIR_SIZE_T(3), sx, sy)) {
biffAddf(NRRD, "%s: couldn't allocate %s x %s 24-bit image", me,
airSprintSize_t(stmp[0], sx), airSprintSize_t(stmp[1], sy));
return 1;
Modified: teem/trunk/src/nrrd/resampleContext.c
===================================================================
--- teem/trunk/src/nrrd/resampleContext.c 2023-07-15 21:56:46 UTC (rev 7114)
+++ teem/trunk/src/nrrd/resampleContext.c 2023-07-15 21:57:26 UTC (rev 7115)
@@ -119,7 +119,7 @@
axis->axIdx = axIdx; /* never changes */
axis->passIdx = AIR_UINT(-1);
for (axJdx = 0; axJdx < NRRD_DIM_MAX; axJdx++) {
- axis->sizePerm[axJdx] = AIR_CAST(size_t, -1);
+ axis->sizePerm[axJdx] = AIR_SIZE_T(-1);
axis->axisPerm[axJdx] = AIR_UINT(-1);
}
axis->ratio = AIR_NAN;
@@ -598,7 +598,7 @@
nrrdEmpty(axis->nline);
} else {
if (nrrdMaybeAlloc_va(axis->nline, nrrdResample_nt, 1,
- AIR_CAST(size_t, 1 + axis->sizeIn))) {
+ AIR_SIZE_T(1 + axis->sizeIn))) {
biffAddf(NRRD, "%s: couldn't allocate scanline buffer", me);
return 1;
}
@@ -662,10 +662,10 @@
/* some kernels can report zero support when they're basically
delta functions */
dotLen = AIR_MAX(2, dotLen);
- if (nrrdMaybeAlloc_va(axis->nweight, nrrdResample_nt, 2, AIR_CAST(size_t, dotLen),
- AIR_CAST(size_t, axis->samples))
- || nrrdMaybeAlloc_va(axis->nindex, nrrdTypeInt, 2, AIR_CAST(size_t, dotLen),
- AIR_CAST(size_t, axis->samples))) {
+ if (nrrdMaybeAlloc_va(axis->nweight, nrrdResample_nt, 2, AIR_SIZE_T(dotLen),
+ AIR_SIZE_T(axis->samples))
+ || nrrdMaybeAlloc_va(axis->nindex, nrrdTypeInt, 2, AIR_SIZE_T(dotLen),
+ AIR_SIZE_T(axis->samples))) {
biffAddf(NRRD, "%s: trouble allocating index and weighting vectors", me);
return 1;
}
Modified: teem/trunk/src/nrrd/subset.c
===================================================================
--- teem/trunk/src/nrrd/subset.c 2023-07-15 21:56:46 UTC (rev 7114)
+++ teem/trunk/src/nrrd/subset.c 2023-07-15 21:57:26 UTC (rev 7115)
@@ -778,7 +778,7 @@
*/
/* adjust based on offset */
if (offset > 0) {
- if (min[axi] < AIR_CAST(size_t, offset)) {
+ if (min[axi] < AIR_SIZE_T(offset)) {
/* desired outwards offset is more than cropping set */
min[axi] = 0;
} else {
Modified: teem/trunk/src/nrrd/test/ax.c
===================================================================
--- teem/trunk/src/nrrd/test/ax.c 2023-07-15 21:56:46 UTC (rev 7114)
+++ teem/trunk/src/nrrd/test/ax.c 2023-07-15 21:57:26 UTC (rev 7115)
@@ -19,11 +19,11 @@
Fifth Floor, Boston, MA 02110-1301 USA
*/
-
#include <stdlib.h>
#include "../nrrd.h"
-float frand(float min, float max) {
+float
+frand(float min, float max) {
return AIR_FLOAT(min + airDrandMT() * (max - min));
}
@@ -35,9 +35,7 @@
AIR_UNUSED(argc);
AIR_UNUSED(argv);
- if (nrrdAlloc_va(nrrd=nrrdNew(), nrrdTypeFloat, 2,
- AIR_CAST(size_t, 4),
- AIR_CAST(size_t, 4))) {
+ if (nrrdAlloc_va(nrrd = nrrdNew(), nrrdTypeFloat, 2, AIR_SIZE_T(4), AIR_SIZE_T(4))) {
printf("trouble:\n%s\n", biffGet(NRRD));
exit(1);
}
@@ -48,62 +46,59 @@
idx = 0;
printf("\n");
pos = nrrdAxisInfoPos(nrrd, 0, idx);
- printf("pos(0, %g) == %g --> %g\n",
- idx, pos, nrrdAxisInfoIdx(nrrd, 0, pos));
+ printf("pos(0, %g) == %g --> %g\n", idx, pos, nrrdAxisInfoIdx(nrrd, 0, pos));
pos = nrrdAxisInfoPos(nrrd, 1, idx);
- printf("pos(1, %g) == %g --> %g\n",
- idx, pos, nrrdAxisInfoIdx(nrrd, 1, pos));
+ printf("pos(1, %g) == %g --> %g\n", idx, pos, nrrdAxisInfoIdx(nrrd, 1, pos));
idx = 1;
printf("\n");
pos = nrrdAxisInfoPos(nrrd, 0, idx);
- printf("pos(0, %g) == %g --> %g\n",
- idx, pos, nrrdAxisInfoIdx(nrrd, 0, pos));
+ printf("pos(0, %g) == %g --> %g\n", idx, pos, nrrdAxisInfoIdx(nrrd, 0, pos));
pos = nrrdAxisInfoPos(nrrd, 1, idx);
- printf("pos(1, %g) == %g --> %g\n",
- idx, pos, nrrdAxisInfoIdx(nrrd, 1, pos));
+ printf("pos(1, %g) == %g --> %g\n", idx, pos, nrrdAxisInfoIdx(nrrd, 1, pos));
idx = 2;
printf("\n");
pos = nrrdAxisInfoPos(nrrd, 0, idx);
- printf("pos(0, %g) == %g --> %g\n",
- idx, pos, nrrdAxisInfoIdx(nrrd, 0, pos));
+ printf("pos(0, %g) == %g --> %g\n", idx, pos, nrrdAxisInfoIdx(nrrd, 0, pos));
pos = nrrdAxisInfoPos(nrrd, 1, idx);
- printf("pos(1, %g) == %g --> %g\n",
- idx, pos, nrrdAxisInfoIdx(nrrd, 1, pos));
+ printf("pos(1, %g) == %g --> %g\n", idx, pos, nrrdAxisInfoIdx(nrrd, 1, pos));
- idx = 0; idx2 = 0;
+ idx = 0;
+ idx2 = 0;
printf("\n");
nrrdAxisInfoPosRange(&lo, &hi, nrrd, 0, idx, idx2);
nrrdAxisInfoIdxRange(&idx3, &idx4, nrrd, 0, lo, hi);
- printf("range(0, %g -- %g) == (%g -- %g) --> (%g -- %g)\n",
- idx, idx2, lo, hi, idx3, idx4);
+ printf("range(0, %g -- %g) == (%g -- %g) --> (%g -- %g)\n", idx, idx2, lo, hi, idx3,
+ idx4);
nrrdAxisInfoPosRange(&lo, &hi, nrrd, 1, idx, idx2);
nrrdAxisInfoIdxRange(&idx3, &idx4, nrrd, 1, lo, hi);
- printf("range(1, %g -- %g) == (%g -- %g) --> (%g -- %g)\n",
- idx, idx2, lo, hi, idx3, idx4);
+ printf("range(1, %g -- %g) == (%g -- %g) --> (%g -- %g)\n", idx, idx2, lo, hi, idx3,
+ idx4);
- idx = 0; idx2 = 1;
+ idx = 0;
+ idx2 = 1;
printf("\n");
nrrdAxisInfoPosRange(&lo, &hi, nrrd, 0, idx, idx2);
nrrdAxisInfoIdxRange(&idx3, &idx4, nrrd, 0, lo, hi);
- printf("range(0, %g -- %g) == (%g -- %g) --> (%g -- %g)\n",
- idx, idx2, lo, hi, idx3, idx4);
+ printf("range(0, %g -- %g) == (%g -- %g) --> (%g -- %g)\n", idx, idx2, lo, hi, idx3,
+ idx4);
nrrdAxisInfoPosRange(&lo, &hi, nrrd, 1, idx, idx2);
nrrdAxisInfoIdxRange(&idx3, &idx4, nrrd, 1, lo, hi);
- printf("range(1, %g -- %g) == (%g -- %g) --> (%g -- %g)\n",
- idx, idx2, lo, hi, idx3, idx4);
+ printf("range(1, %g -- %g) == (%g -- %g) --> (%g -- %g)\n", idx, idx2, lo, hi, idx3,
+ idx4);
- idx = 1; idx2 = 0;
+ idx = 1;
+ idx2 = 0;
printf("\n");
nrrdAxisInfoPosRange(&lo, &hi, nrrd, 0, idx, idx2);
nrrdAxisInfoIdxRange(&idx3, &idx4, nrrd, 0, lo, hi);
- printf("range(0, %g -- %g) == (%g -- %g) --> (%g -- %g)\n",
- idx, idx2, lo, hi, idx3, idx4);
+ printf("range(0, %g -- %g) == (%g -- %g) --> (%g -- %g)\n", idx, idx2, lo, hi, idx3,
+ idx4);
nrrdAxisInfoPosRange(&lo, &hi, nrrd, 1, idx, idx2);
nrrdAxisInfoIdxRange(&idx3, &idx4, nrrd, 1, lo, hi);
- printf("range(1, %g -- %g) == (%g -- %g) --> (%g -- %g)\n",
- idx, idx2, lo, hi, idx3, idx4);
+ printf("range(1, %g -- %g) == (%g -- %g) --> (%g -- %g)\n", idx, idx2, lo, hi, idx3,
+ idx4);
nrrdAxisInfoSet_va(nrrd, nrrdAxisInfoMin, 12.0, 12.0);
nrrdAxisInfoSet_va(nrrd, nrrdAxisInfoMax, 10.0, 10.0);
@@ -112,62 +107,59 @@
idx = 0;
printf("\n");
pos = nrrdAxisInfoPos(nrrd, 0, idx);
- printf("pos(0, %g) == %g --> %g\n",
- idx, pos, nrrdAxisInfoIdx(nrrd, 0, pos));
+ printf("pos(0, %g) == %g --> %g\n", idx, pos, nrrdAxisInfoIdx(nrrd, 0, pos));
pos = nrrdAxisInfoPos(nrrd, 1, idx);
- printf("pos(1, %g) == %g --> %g\n",
- idx, pos, nrrdAxisInfoIdx(nrrd, 1, pos));
+ printf("pos(1, %g) == %g --> %g\n", idx, pos, nrrdAxisInfoIdx(nrrd, 1, pos));
idx = 1;
printf("\n");
pos = nrrdAxisInfoPos(nrrd, 0, idx);
- printf("pos(0, %g) == %g --> %g\n",
- idx, pos, nrrdAxisInfoIdx(nrrd, 0, pos));
+ printf("pos(0, %g) == %g --> %g\n", idx, pos, nrrdAxisInfoIdx(nrrd, 0, pos));
pos = nrrdAxisInfoPos(nrrd, 1, idx);
- printf("pos(1, %g) == %g --> %g\n",
- idx, pos, nrrdAxisInfoIdx(nrrd, 1, pos));
+ printf("pos(1, %g) == %g --> %g\n", idx, pos, nrrdAxisInfoIdx(nrrd, 1, pos));
idx = 2;
printf("\n");
pos = nrrdAxisInfoPos(nrrd, 0, idx);
- printf("pos(0, %g) == %g --> %g\n",
- idx, pos, nrrdAxisInfoIdx(nrrd, 0, pos));
+ printf("pos(0, %g) == %g --> %g\n", idx, pos, nrrdAxisInfoIdx(nrrd, 0, pos));
pos = nrrdAxisInfoPos(nrrd, 1, idx);
- printf("pos(1, %g) == %g --> %g\n",
- idx, pos, nrrdAxisInfoIdx(nrrd, 1, pos));
+ printf("pos(1, %g) == %g --> %g\n", idx, pos, nrrdAxisInfoIdx(nrrd, 1, pos));
- idx = 0; idx2 = 0;
+ idx = 0;
+ idx2 = 0;
printf("\n");
nrrdAxisInfoPosRange(&lo, &hi, nrrd, 0, idx, idx2);
nrrdAxisInfoIdxRange(&idx3, &idx4, nrrd, 0, lo, hi);
- printf("range(0, %g -- %g) == (%g -- %g) --> (%g -- %g)\n",
- idx, idx2, lo, hi, idx3, idx4);
+ printf("range(0, %g -- %g) == (%g -- %g) --> (%g -- %g)\n", idx, idx2, lo, hi, idx3,
+ idx4);
nrrdAxisInfoPosRange(&lo, &hi, nrrd, 1, idx, idx2);
nrrdAxisInfoIdxRange(&idx3, &idx4, nrrd, 1, lo, hi);
- printf("range(1, %g -- %g) == (%g -- %g) --> (%g -- %g)\n",
- idx, idx2, lo, hi, idx3, idx4);
+ printf("range(1, %g -- %g) == (%g -- %g) --> (%g -- %g)\n", idx, idx2, lo, hi, idx3,
+ idx4);
- idx = 0; idx2 = 2;
+ idx = 0;
+ idx2 = 2;
printf("\n");
nrrdAxisInfoPosRange(&lo, &hi, nrrd, 0, idx, idx2);
nrrdAxisInfoIdxRange(&idx3, &idx4, nrrd, 0, lo, hi);
- printf("range(0, %g -- %g) == (%g -- %g) --> (%g -- %g)\n",
- idx, idx2, lo, hi, idx3, idx4);
+ printf("range(0, %g -- %g) == (%g -- %g) --> (%g -- %g)\n", idx, idx2, lo, hi, idx3,
+ idx4);
nrrdAxisInfoPosRange(&lo, &hi, nrrd, 1, idx, idx2);
nrrdAxisInfoIdxRange(&idx3, &idx4, nrrd, 1, lo, hi);
- printf("range(1, %g -- %g) == (%g -- %g) --> (%g -- %g)\n",
- idx, idx2, lo, hi, idx3, idx4);
+ printf("range(1, %g -- %g) == (%g -- %g) --> (%g -- %g)\n", idx, idx2, lo, hi, idx3,
+ idx4);
- idx = 2; idx2 = 0;
+ idx = 2;
+ idx2 = 0;
printf("\n");
nrrdAxisInfoPosRange(&lo, &hi, nrrd, 0, idx, idx2);
nrrdAxisInfoIdxRange(&idx3, &idx4, nrrd, 0, lo, hi);
- printf("range(0, %g -- %g) == (%g -- %g) --> (%g -- %g)\n",
- idx, idx2, lo, hi, idx3, idx4);
+ printf("range(0, %g -- %g) == (%g -- %g) --> (%g -- %g)\n", idx, idx2, lo, hi, idx3,
+ idx4);
nrrdAxisInfoPosRange(&lo, &hi, nrrd, 1, idx, idx2);
nrrdAxisInfoIdxRange(&idx3, &idx4, nrrd, 1, lo, hi);
- printf("range(1, %g -- %g) == (%g -- %g) --> (%g -- %g)\n",
- idx, idx2, lo, hi, idx3, idx4);
+ printf("range(1, %g -- %g) == (%g -- %g) --> (%g -- %g)\n", idx, idx2, lo, hi, idx3,
+ idx4);
nrrd->axis[0].center = nrrdCenterCell;
nrrd->axis[0].size = 4;
@@ -183,22 +175,27 @@
printf("pos3, pos4 = %g, %g\n", pos3, pos4);
exit(1);
-
/* and now for random-ness */
airSrandMT((int)airTime());
nrrd->axis[0].center = nrrdCenterNode;
nrrd->axis[0].center = nrrdCenterCell;
- for (i=0; i<=1000000; i++) {
+ for (i = 0; i <= 1000000; i++) {
nrrd->axis[0].min = frand(-3.0, 3.0);
nrrd->axis[0].max = frand(-3.0, 3.0);
idx = frand(-3.0, 3.0);
pos = nrrdAxisInfoPos(nrrd, 0, idx);
diff = idx - nrrdAxisInfoIdx(nrrd, 0, pos);
- if (AIR_ABS(diff) > 0.00000001) { printf("PANIC 0\n"); exit(2); }
+ if (AIR_ABS(diff) > 0.00000001) {
+ printf("PANIC 0\n");
+ exit(2);
+ }
pos = frand(-3.0, 3.0);
idx = nrrdAxisInfoIdx(nrrd, 0, pos);
diff = pos - nrrdAxisInfoPos(nrrd, 0, idx);
- if (AIR_ABS(diff) > 0.00000001) { printf("PANIC 1\n"); exit(2); }
+ if (AIR_ABS(diff) > 0.00000001) {
+ printf("PANIC 1\n");
+ exit(2);
+ }
nrrd->axis[0].min = (int)frand(-3.0, 3.0);
nrrd->axis[0].max = (int)frand(-3.0, 3.0);
@@ -207,7 +204,10 @@
nrrdAxisInfoPosRange(&pos, &pos2, nrrd, 0, idx, idx2);
nrrdAxisInfoIdxRange(&idx3, &idx4, nrrd, 0, pos, pos2);
diff = AIR_ABS(idx - idx3) + AIR_ABS(idx2 - idx4);
- if (AIR_ABS(diff) > 0.00000001) { printf("PANIC 2\n"); exit(2); }
+ if (AIR_ABS(diff) > 0.00000001) {
+ printf("PANIC 2\n");
+ exit(2);
+ }
pos = (int)frand(-3.0, 3.0);
pos2 = (int)frand(-3.0, 3.0);
nrrdAxisInfoIdxRange(&idx, &idx2, nrrd, 0, pos, pos2);
@@ -218,7 +218,8 @@
printf("pos, pos2 = %g, %g\n", pos, pos2);
printf("idx, idx2 = %g, %g\n", idx, idx2);
printf("pos3, pos4 = %g, %g\n", pos3, pos4);
- printf("PANIC (%d) 3 %g\n", (int)nrrd->axis[0].size, diff); exit(2);
+ printf("PANIC (%d) 3 %g\n", (int)nrrd->axis[0].size, diff);
+ exit(2);
}
}
Modified: teem/trunk/src/nrrd/test/genvol.c
===================================================================
--- teem/trunk/src/nrrd/test/genvol.c 2023-07-15 21:56:46 UTC (rev 7114)
+++ teem/trunk/src/nrrd/test/genvol.c 2023-07-15 21:57:26 UTC (rev 7115)
@@ -27,37 +27,33 @@
double
rho(double r) {
- return cos(2*AIR_PI*6.0*cos(AIR_PI*r/2));
+ return cos(2 * AIR_PI * 6.0 * cos(AIR_PI * r / 2));
}
double
genvolFunc(double x, double y, double z) {
- double mask, phi, R2, R3, Rbig, Rlit, sig0=0.17, sig1=0.04, a, b, w, ret;
+ double mask, phi, R2, R3, Rbig, Rlit, sig0 = 0.17, sig1 = 0.04, a, b, w, ret;
/* three bladed thing */
- R3 = sqrt(x*x + y*y + z*z);
- mask = AIR_AFFINE(-1.0, erf((R3 - 0.75)*15), 1.0, 1.0, 0.0);
- R2 = sqrt(x*x + y*y);
- phi = atan2(y+0.001,x+0.001) + z*1.2;
- w = pow((1+cos(3*phi))/2, R2*R2*90);
- ret = w*mask;
+ R3 = sqrt(x * x + y * y + z * z);
+ mask = AIR_AFFINE(-1.0, erf((R3 - 0.75) * 15), 1.0, 1.0, 0.0);
+ R2 = sqrt(x * x + y * y);
+ phi = atan2(y + 0.001, x + 0.001) + z * 1.2;
+ w = pow((1 + cos(3 * phi)) / 2, R2 * R2 * 90);
+ ret = w * mask;
if (0) {
/* ridge surface is a Mobius aka Moebius strip */
- Rbig = sqrt(x*x + y*y);
- Rlit = sqrt(z*z + (Rbig-0.5)*(Rbig-0.5));
- phi = atan2(Rbig-0.5, z) - atan2(x, y)/2;
- a = Rlit*cos(phi);
- b = Rlit*sin(phi);
+ Rbig = sqrt(x * x + y * y);
+ Rlit = sqrt(z * z + (Rbig - 0.5) * (Rbig - 0.5));
+ phi = atan2(Rbig - 0.5, z) - atan2(x, y) / 2;
+ a = Rlit * cos(phi);
+ b = Rlit * sin(phi);
/*
ret = airGaussian(a, 0, sig0)*airGaussian(b, 0, sig1);
*/
- a = (a > sig0
- ? a - sig0
- : (a < -sig0
- ? a + sig0
- : 0));
- ret = airGaussian(a, 0, sig1)*airGaussian(b, 0, sig1);
+ a = (a > sig0 ? a - sig0 : (a < -sig0 ? a + sig0 : 0));
+ ret = airGaussian(a, 0, sig1) * airGaussian(b, 0, sig1);
}
return ret;
@@ -116,37 +112,36 @@
"upper bounding corner of volume");
hestOptAdd(&hopt, "o", "filename", airTypeString, 1, 1, &out, "-",
"file to write output nrrd to");
- hestParseOrDie(hopt, argc-1, argv+1, hparm,
- me, genvolInfo, AIR_TRUE, AIR_TRUE, AIR_TRUE);
+ hestParseOrDie(hopt, argc - 1, argv + 1, hparm, me, genvolInfo, AIR_TRUE, AIR_TRUE,
+ AIR_TRUE);
airMopAdd(mop, hopt, (airMopper)hestOptFree, airMopAlways);
airMopAdd(mop, hopt, (airMopper)hestParseFree, airMopAlways);
nout = nrrdNew();
airMopAdd(mop, nout, (airMopper)nrrdNuke, airMopAlways);
- if (nrrdAlloc_va(nout, nrrdTypeDouble, 3,
- AIR_CAST(size_t, size[0]),
- AIR_CAST(size_t, size[1]),
- AIR_CAST(size_t, size[2]))) {
+ if (nrrdAlloc_va(nout, nrrdTypeDouble, 3, AIR_SIZE_T(size[0]), AIR_SIZE_T(size[1]),
+ AIR_SIZE_T(size[2]))) {
airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
fprintf(stderr, "%s: problem allocating volume:\n%s\n", me, err);
- airMopError(mop); return 1;
+ airMopError(mop);
+ return 1;
}
data = (double *)nout->data;
- for (zi=0; zi<size[2]; zi++) {
- z = AIR_AFFINE(0, zi, size[2]-1, min[2], max[2]);
- for (yi=0; yi<size[1]; yi++) {
- y = AIR_AFFINE(0, yi, size[1]-1, min[1], max[1]);
- for (xi=0; xi<size[0]; xi++) {
- x = AIR_AFFINE(0, xi, size[0]-1, min[0], max[0]);
- *data = genvolFunc(x,y,z);
+ for (zi = 0; zi < size[2]; zi++) {
+ z = AIR_AFFINE(0, zi, size[2] - 1, min[2], max[2]);
+ for (yi = 0; yi < size[1]; yi++) {
+ y = AIR_AFFINE(0, yi, size[1] - 1, min[1], max[1]);
+ for (xi = 0; xi < size[0]; xi++) {
+ x = AIR_AFFINE(0, xi, size[0] - 1, min[0], max[0]);
+ *data = genvolFunc(x, y, z);
data += 1;
}
}
}
- nrrdAxisInfoSet_va(nout, nrrdAxisInfoCenter,
- nrrdCenterNode, nrrdCenterNode, nrrdCenterNode);
+ nrrdAxisInfoSet_va(nout, nrrdAxisInfoCenter, nrrdCenterNode, nrrdCenterNode,
+ nrrdCenterNode);
#if 0
nrrdAxisInfoSet_va(nout, nrrdAxisInfoMin, min[0], min[1], min[2]);
nrrdAxisInfoSet_va(nout, nrrdAxisInfoMax, max[0], max[1], max[2]);
@@ -155,8 +150,7 @@
nrrdAxisInfoSpacingSet(nout, 2);
#else
/* impatient, not using API, bad! */
-#define ELL_3V_SET(v, a, b, c) \
- ((v)[0] = (a), (v)[1] = (b), (v)[2] = (c))
+# define ELL_3V_SET(v, a, b, c) ((v)[0] = (a), (v)[1] = (b), (v)[2] = (c))
nout->space = nrrdSpaceLeftPosteriorSuperior;
nout->spaceDim = 3;
ELL_3V_SET(nout->spaceOrigin, 0, 0, 0);
@@ -168,7 +162,8 @@
if (nrrdSave(out, nout, NULL)) {
airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
fprintf(stderr, "%s: problem saving output:\n%s\n", me, err);
- airMopError(mop); return 1;
+ airMopError(mop);
+ return 1;
}
airMopOkay(mop);
Modified: teem/trunk/src/nrrd/test/histrad.c
===================================================================
--- teem/trunk/src/nrrd/test/histrad.c 2023-07-15 21:56:46 UTC (rev 7114)
+++ teem/trunk/src/nrrd/test/histrad.c 2023-07-15 21:57:26 UTC (rev 7115)
@@ -43,8 +43,8 @@
hparm = hestParmNew();
hopt = NULL;
airMopAdd(mop, hparm, (airMopper)hestParmFree, airMopAlways);
- hestOptAdd(&hopt, "i", "nin", airTypeOther, 1, 1, &nin, NULL,
- "input image", NULL, NULL, nrrdHestNrrd);
+ hestOptAdd(&hopt, "i", "nin", airTypeOther, 1, 1, &nin, NULL, "input image", NULL,
+ NULL, nrrdHestNrrd);
hestOptAdd(&hopt, "b", "rbins hbins", airTypeInt, 2, 2, bins, NULL,
"# of histogram bins: radial and value");
hestOptAdd(&hopt, "min", "value", airTypeDouble, 1, 1, &vmin, "nan",
@@ -59,14 +59,15 @@
"The center point around which to build radial histogram");
hestOptAdd(&hopt, "o", "filename", airTypeString, 1, 1, &outS, "-",
"file to write histogram to");
- hestParseOrDie(hopt, argc-1, argv+1, hparm,
- me, histradInfo, AIR_TRUE, AIR_TRUE, AIR_TRUE);
+ hestParseOrDie(hopt, argc - 1, argv + 1, hparm, me, histradInfo, AIR_TRUE, AIR_TRUE,
+ AIR_TRUE);
airMopAdd(mop, hopt, (airMopper)hestOptFree, airMopAlways);
airMopAdd(mop, hopt, (airMopper)hestParseFree, airMopAlways);
if (2 != nin->dim) {
fprintf(stderr, "%s: need 2-D input (not %d-D)\n", me, nin->dim);
- airMopError(mop); return 1;
+ airMopError(mop);
+ return 1;
}
rbins = bins[0];
@@ -73,15 +74,15 @@
hbins = bins[1];
nhist = nrrdNew();
airMopAdd(mop, nhist, (airMopper)nrrdNuke, airMopAlways);
- if (nrrdMaybeAlloc_va(nhist, nrrdTypeDouble, 2,
- AIR_CAST(size_t, rbins),
- AIR_CAST(size_t, hbins))) {
+ if (nrrdMaybeAlloc_va(nhist, nrrdTypeDouble, 2, AIR_SIZE_T(rbins),
+ AIR_SIZE_T(hbins))) {
airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
fprintf(stderr, "%s: couldn't allocate histogram:\n%s", me, err);
- airMopError(mop); return 1;
+ airMopError(mop);
+ return 1;
}
- if (!( AIR_EXISTS(vmin) && AIR_EXISTS(vmax) )) {
+ if (!(AIR_EXISTS(vmin) && AIR_EXISTS(vmax))) {
range = nrrdRangeNewSet(nin, nrrdStateBlind8BitRange);
airMopAdd(mop, range, (airMopper)nrrdRangeNix, airMopAlways);
vmin = AIR_EXISTS(vmin) ? vmin : range->min;
@@ -88,7 +89,7 @@
vmax = AIR_EXISTS(vmax) ? vmax : range->max;
}
-#define DIST(x0, y0, x1, y1) (sqrt((x0-x1)*(x0-x1) + (y0-y1)*(y0-y1)))
+#define DIST(x0, y0, x1, y1) (sqrt((x0 - x1) * (x0 - x1) + (y0 - y1) * (y0 - y1)))
sx = AIR_INT(nin->axis[0].size); /* HEY unsigned? */
sy = AIR_INT(nin->axis[1].size);
@@ -95,26 +96,26 @@
if (!AIR_EXISTS(rmax)) {
rmax = 0;
rmax = AIR_MAX(rmax, DIST(cent[0], cent[1], 0, 0));
- rmax = AIR_MAX(rmax, DIST(cent[0], cent[1], sx-1, 0));
- rmax = AIR_MAX(rmax, DIST(cent[0], cent[1], 0, sy-1));
- rmax = AIR_MAX(rmax, DIST(cent[0], cent[1], sx-1, sy-1));
+ rmax = AIR_MAX(rmax, DIST(cent[0], cent[1], sx - 1, 0));
+ rmax = AIR_MAX(rmax, DIST(cent[0], cent[1], 0, sy - 1));
+ rmax = AIR_MAX(rmax, DIST(cent[0], cent[1], sx - 1, sy - 1));
}
lup = nrrdDLookup[nin->type];
- hist = (double*)(nhist->data);
- for (xi=0; xi<sx; xi++) {
- for (yi=0; yi<sy; yi++) {
+ hist = (double *)(nhist->data);
+ for (xi = 0; xi < sx; xi++) {
+ for (yi = 0; yi < sy; yi++) {
rad = DIST(cent[0], cent[1], xi, yi);
if (!AIR_IN_OP(0, rad, rmax)) {
continue;
}
- val = lup(nin->data, xi + sx*yi);
+ val = lup(nin->data, xi + sx * yi);
if (!AIR_IN_OP(vmin, val, vmax)) {
continue;
}
ridx = airIndex(0, rad, rmax, rbins);
hidx = airIndex(vmin, val, vmax, hbins);
- hist[ridx + rbins*hidx] += 1;
+ hist[ridx + rbins * hidx] += 1;
}
}
@@ -125,7 +126,8 @@
if (nrrdSave(outS, nhist, NULL)) {
airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
fprintf(stderr, "%s: couldn't save output:\n%s", me, err);
- airMopError(mop); return 1;
+ airMopError(mop);
+ return 1;
}
airMopOkay(mop);
Modified: teem/trunk/src/nrrd/test/phrnd.c
===================================================================
--- teem/trunk/src/nrrd/test/phrnd.c 2023-07-15 21:56:46 UTC (rev 7114)
+++ teem/trunk/src/nrrd/test/phrnd.c 2023-07-15 21:57:26 UTC (rev 7115)
@@ -21,8 +21,8 @@
#include "../nrrd.h"
-#define NRRDNEW(X) \
- (X) = nrrdNew(); \
+#define NRRDNEW(X) \
+ (X) = nrrdNew(); \
airMopAdd(mop, (X), (airMopper)nrrdNuke, airMopAlways)
const char *phrndInfo = ("randomizes phase of a real-valued array "
@@ -38,21 +38,21 @@
int rigor;
char *err, *outS, *imagOutS, *wispath, *seedS;
Nrrd *ntmp, *ntmp2, /* tmp */
- *njarg[2], /* arguments to join */
- *nrin, /* given real-valued input */
- *nrdin, /* given real-valued input, as double */
- *ncin, /* (padded) complex-valued input */
- *ncfin, /* complex-valued transform of input */
- *nR, /* real part of something */
- *nI, /* imag part of something */
- *nP, /* phase */
- *nM, /* mag */
- *nlut, /* phase look-up table */
- *ncfout, /* complex-valued transform of output */
- *ncdout, /* double complex-valued output */
- *ncout, /* complex-valued output, as input type */
- *niout, /* imaginary output */
- *nrout; /* real output */
+ *njarg[2], /* arguments to join */
+ *nrin, /* given real-valued input */
+ *nrdin, /* given real-valued input, as double */
+ *ncin, /* (padded) complex-valued input */
+ *ncfin, /* complex-valued transform of input */
+ *nR, /* real part of something */
+ *nI, /* imag part of something */
+ *nP, /* phase */
+ *nM, /* mag */
+ *nlut, /* phase look-up table */
+ *ncfout, /* complex-valued transform of output */
+ *ncdout, /* double complex-valued output */
+ *ncout, /* complex-valued output, as input type */
+ *niout, /* imaginary output */
+ *nrout; /* real output */
double howrand, *lut, *P;
unsigned int len, axi, seed;
size_t II, NN, minInset[NRRD_DIM_MAX];
@@ -65,8 +65,8 @@
hparm = hestParmNew();
hopt = NULL;
airMopAdd(mop, hparm, (airMopper)hestParmFree, airMopAlways);
- hestOptAdd(&hopt, "i", "nin", airTypeOther, 1, 1, &nrin, NULL,
- "input array", NULL, NULL, nrrdHestNrrd);
+ hestOptAdd(&hopt, "i", "nin", airTypeOther, 1, 1, &nrin, NULL, "input array", NULL,
+ NULL, nrrdHestNrrd);
hestOptAdd(&hopt, "n", "len", airTypeUInt, 1, 1, &len, "65536",
"length (must be EVEN) of phase look-up table, used "
"enable being dumb (rather than clever) in asserting "
@@ -99,8 +99,8 @@
"permit confirming that it doesn't carry significant info");
hestOptAdd(&hopt, "o", "filename", airTypeString, 1, 1, &outS, NULL,
"file to write output nrrd to");
- hestParseOrDie(hopt, argc-1, argv+1, hparm,
- me, phrndInfo, AIR_TRUE, AIR_TRUE, AIR_TRUE);
+ hestParseOrDie(hopt, argc - 1, argv + 1, hparm, me, phrndInfo, AIR_TRUE, AIR_TRUE,
+ AIR_TRUE);
airMopAdd(mop, hopt, (airMopper)hestOptFree, airMopAlways);
airMopAdd(mop, hopt, (airMopper)hestParseFree, airMopAlways);
@@ -121,7 +121,7 @@
/* got no request for specific seed */
airSrandMT(AIR_UINT(airTime()));
}
- for (axi=0; axi<NRRD_DIM_MAX; axi++) {
+ for (axi = 0; axi < NRRD_DIM_MAX; axi++) {
minInset[axi] = 0;
}
/* pointless to set content */
@@ -130,15 +130,14 @@
/* ============== pad real input nrin to complex-valued input ncin */
minPad[0] = 0;
maxPad[0] = 1;
- for (axi=0; axi<nrin->dim; axi++) {
- minPad[axi+1] = 0;
- maxPad[axi+1] = AIR_CAST(ptrdiff_t, nrin->axis[axi].size-1);
+ for (axi = 0; axi < nrin->dim; axi++) {
+ minPad[axi + 1] = 0;
+ maxPad[axi + 1] = AIR_CAST(ptrdiff_t, nrin->axis[axi].size - 1);
}
NRRDNEW(nrdin);
NRRDNEW(ntmp);
NRRDNEW(ncin);
- if (nrrdConvert(nrdin, nrin, nrrdTypeDouble)
- || nrrdAxesInsert(ntmp, nrdin, 0)
+ if (nrrdConvert(nrdin, nrin, nrrdTypeDouble) || nrrdAxesInsert(ntmp, nrdin, 0)
|| nrrdPad_nva(ncin, ntmp, minPad, maxPad, nrrdBoundaryPad, 0.0)) {
airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
fprintf(stderr, "%s: error creating complex input:\n%s", me, err);
@@ -158,14 +157,16 @@
}
fclose(fwise);
} else {
- fprintf(stderr, "%s: (\"%s\" couldn't be opened, will try to save "
- "wisdom afterwards)", me, wispath);
+ fprintf(stderr,
+ "%s: (\"%s\" couldn't be opened, will try to save "
+ "wisdom afterwards)",
+ me, wispath);
}
}
/* ============== transform input to phase and magnitude */
- for (axi=0; axi<nrin->dim; axi++) {
- axes[axi] = axi+1;
+ for (axi = 0; axi < nrin->dim; axi++) {
+ axes[axi] = axi + 1;
}
NRRDNEW(ncfin);
NRRDNEW(nR);
@@ -173,8 +174,7 @@
NRRDNEW(nP);
NRRDNEW(nM);
if (nrrdFFT(ncfin, ncin, axes, nrin->dim, +1, AIR_TRUE, rigor)
- || nrrdSlice(nR, ncfin, 0, 0)
- || nrrdSlice(nI, ncfin, 0, 1)
+ || nrrdSlice(nR, ncfin, 0, 0) || nrrdSlice(nI, ncfin, 0, 1)
|| nrrdArithBinaryOp(nP, nrrdBinaryOpAtan2, nI, nR)
|| nrrdProject(nM, ncfin, 0, nrrdMeasureL2, nrrdTypeDefault)) {
airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
@@ -185,7 +185,7 @@
/* ============== randomize phase */
NRRDNEW(nlut);
- if (nrrdMaybeAlloc_va(nlut, nrrdTypeDouble, 1, AIR_CAST(size_t, len))) {
+ if (nrrdMaybeAlloc_va(nlut, nrrdTypeDouble, 1, AIR_SIZE_T(len))) {
airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
fprintf(stderr, "%s: error making lut:\n%s", me, err);
airMopError(mop);
@@ -192,17 +192,17 @@
return 1;
}
lut = AIR_CAST(double *, nlut->data);
- for (II=0; II<len; II++) {
+ for (II = 0; II < len; II++) {
/* random phase */
- if (II < len/2) {
+ if (II < len / 2) {
lut[II] = AIR_AFFINE(0, airDrandMT(), 1, -AIR_PI, AIR_PI);
} else {
- lut[II] = -lut[len-1-II];
+ lut[II] = -lut[len - 1 - II];
}
}
NN = nrrdElementNumber(nP);
P = AIR_CAST(double *, nP->data);
- for (II=0; II<NN; II++) {
+ for (II = 0; II < NN; II++) {
/* pp is the original input phase */
double pp = P[II];
/* pi is the index for the input phase */
@@ -225,10 +225,9 @@
|| nrrdArithBinaryOp(nR, nrrdBinaryOpMultiply, nR, nM)
|| nrrdArithUnaryOp(nI, nrrdUnaryOpSin, nP)
|| nrrdArithBinaryOp(nI, nrrdBinaryOpMultiply, nI, nM)
- || nrrdJoin(ncfout, AIR_CAST(const Nrrd*const*, njarg), 2, 0, AIR_TRUE)
+ || nrrdJoin(ncfout, AIR_CAST(const Nrrd *const *, njarg), 2, 0, AIR_TRUE)
|| nrrdFFT(ncdout, ncfout, axes, nrin->dim, -1, AIR_TRUE, rigor)
- || nrrdConvert(ntmp, ncdout, nrin->type)
- || nrrdConvert(ntmp2, ncin, nrin->type)
+ || nrrdConvert(ntmp, ncdout, nrin->type) || nrrdConvert(ntmp2, ncin, nrin->type)
|| nrrdInset(ncout, ntmp2, ntmp, minInset)) {
airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
fprintf(stderr, "%s: error creating output\n%s", me, err);
@@ -254,8 +253,8 @@
/* ============== DONE. saving things to save */
if (airStrlen(wispath) && nrrdFFTWEnabled) {
if (!(fwise = fopen(wispath, "w"))) {
- fprintf(stderr, "%s: couldn't open %s for writing: %s\n",
- me, wispath, strerror(errno));
+ fprintf(stderr, "%s: couldn't open %s for writing: %s\n", me, wispath,
+ strerror(errno));
airMopError(mop);
return 1;
}
@@ -269,22 +268,19 @@
}
if (airStrlen(imagOutS)) {
NRRDNEW(niout);
- if (nrrdSlice(niout, ncout, 0, 1)
- || nrrdSave(imagOutS, niout, NULL)) {
+ if (nrrdSlice(niout, ncout, 0, 1) || nrrdSave(imagOutS, niout, NULL)) {
airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
- fprintf(stderr, "%s: error slicing/saving imaginary output:\n%s",
- me, err);
+ fprintf(stderr, "%s: error slicing/saving imaginary output:\n%s", me, err);
airMopError(mop);
return 1;
}
}
NRRDNEW(nrout);
- if (nrrdSlice(nrout, ncout, 0, 0)
- || nrrdSave(outS, nrout, NULL)) {
+ if (nrrdSlice(nrout, ncout, 0, 0) || nrrdSave(outS, nrout, NULL)) {
airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
- fprintf(stderr, "%s: problem slicing/saving real output:\n%s\n",
- me, err);
- airMopError(mop); return 1;
+ fprintf(stderr, "%s: problem slicing/saving real output:\n%s\n", me, err);
+ airMopError(mop);
+ return 1;
}
airMopOkay(mop);
Modified: teem/trunk/src/nrrd/test/quadvol.c
===================================================================
--- teem/trunk/src/nrrd/test/quadvol.c 2023-07-15 21:56:46 UTC (rev 7114)
+++ teem/trunk/src/nrrd/test/quadvol.c 2023-07-15 21:57:26 UTC (rev 7115)
@@ -28,7 +28,7 @@
float
quadFunc(float x, float y, float z, float A, float B, float off) {
- return A*x*x + B*y*y - z + off;
+ return A * x * x + B * y * y - z + off;
}
int
@@ -59,30 +59,29 @@
"vertical offset");
hestOptAdd(&hopt, "o", "filename", airTypeString, 1, 1, &out, "-",
"file to write output nrrd to");
- hestParseOrDie(hopt, argc-1, argv+1, hparm,
- me, quadInfo, AIR_TRUE, AIR_TRUE, AIR_TRUE);
+ hestParseOrDie(hopt, argc - 1, argv + 1, hparm, me, quadInfo, AIR_TRUE, AIR_TRUE,
+ AIR_TRUE);
airMopAdd(mop, hopt, (airMopper)hestOptFree, airMopAlways);
airMopAdd(mop, hopt, (airMopper)hestParseFree, airMopAlways);
nout = nrrdNew();
airMopAdd(mop, nout, (airMopper)nrrdNuke, airMopAlways);
- if (nrrdAlloc_va(nout, nrrdTypeFloat, 3,
- AIR_CAST(size_t, size[0]),
- AIR_CAST(size_t, size[1]),
- AIR_CAST(size_t, size[2]))) {
+ if (nrrdAlloc_va(nout, nrrdTypeFloat, 3, AIR_SIZE_T(size[0]), AIR_SIZE_T(size[1]),
+ AIR_SIZE_T(size[2]))) {
airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
fprintf(stderr, "%s: problem allocating volume:\n%s\n", me, err);
- airMopError(mop); return 1;
+ airMopError(mop);
+ return 1;
}
data = (float *)nout->data;
- for (zi=0; zi<size[2]; zi++) {
- z = AIR_FLOAT(AIR_AFFINE(0, zi, size[2]-1, min[2], max[2]));
- for (yi=0; yi<size[1]; yi++) {
- y = AIR_FLOAT(AIR_AFFINE(0, yi, size[1]-1, min[1], max[1]));
- for (xi=0; xi<size[0]; xi++) {
- x = AIR_FLOAT(AIR_AFFINE(0, xi, size[0]-1, min[0], max[0]));
- *data = quadFunc(x,y,z, AB[0], AB[1], off);
+ for (zi = 0; zi < size[2]; zi++) {
+ z = AIR_FLOAT(AIR_AFFINE(0, zi, size[2] - 1, min[2], max[2]));
+ for (yi = 0; yi < size[1]; yi++) {
+ y = AIR_FLOAT(AIR_AFFINE(0, yi, size[1] - 1, min[1], max[1]));
+ for (xi = 0; xi < size[0]; xi++) {
+ x = AIR_FLOAT(AIR_AFFINE(0, xi, size[0] - 1, min[0], max[0]));
+ *data = quadFunc(x, y, z, AB[0], AB[1], off);
data += 1;
}
}
@@ -96,7 +95,8 @@
if (nrrdSave(out, nout, NULL)) {
airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
fprintf(stderr, "%s: problem saving output:\n%s\n", me, err);
- airMopError(mop); return 1;
+ airMopError(mop);
+ return 1;
}
airMopOkay(mop);
Modified: teem/trunk/src/nrrd/test/texp.c
===================================================================
--- teem/trunk/src/nrrd/test/texp.c 2023-07-15 21:56:46 UTC (rev 7114)
+++ teem/trunk/src/nrrd/test/texp.c 2023-07-15 21:57:26 UTC (rev 7115)
@@ -19,13 +19,12 @@
Fifth Floor, Boston, MA 02110-1301 USA
*/
-
#include <teem/air.h>
#include <teem/biff.h>
#include "../nrrd.h"
void
-usage(char *me) { /* 0 1 2 3 4 (5) */
+usage(char *me) { /* 0 1 2 3 4 (5) */
fprintf(stderr, "usage: %s <min> <N> <max> <fileOut>\n", me);
exit(1);
}
@@ -41,45 +40,40 @@
if (5 != argc) {
usage(me);
}
- if (3 != (sscanf(argv[2], "%u", &NN)
- + sscanf(argv[1], "%lf", &min)
- + sscanf(argv[3], "%lf", &max))) {
- fprintf(stderr, "%s: couldn't parse %s %s %s double uint double",
- me, argv[1], argv[2], argv[3]);
+ if (3
+ != (sscanf(argv[2], "%u", &NN) + sscanf(argv[1], "%lf", &min)
+ + sscanf(argv[3], "%lf", &max))) {
+ fprintf(stderr, "%s: couldn't parse %s %s %s double uint double", me, argv[1],
+ argv[2], argv[3]);
usage(me);
}
nout = nrrdNew();
- if (nrrdAlloc_va(nout, nrrdTypeDouble, 2,
- AIR_CAST(size_t, 5),
- AIR_CAST(size_t, NN))) {
- fprintf(stderr, "%s: trouble allocating:\n%s", me,
- biffGetDone(NRRD));
+ if (nrrdAlloc_va(nout, nrrdTypeDouble, 2, AIR_SIZE_T(5), AIR_SIZE_T(NN))) {
+ fprintf(stderr, "%s: trouble allocating:\n%s", me, biffGetDone(NRRD));
exit(1);
}
out = AIR_CAST(double *, nout->data);
- for (ii=0; ii<NN; ii++) {
+ for (ii = 0; ii < NN; ii++) {
double xx, rr, ff, gg;
- xx = AIR_AFFINE(0, ii, NN-1, min, max);
+ xx = AIR_AFFINE(0, ii, NN - 1, min, max);
rr = exp(xx);
ff = airFastExp(xx);
gg = airExp(xx);
- if (rr < 0 || ff < 0 || gg < 0
- || !AIR_EXISTS(rr) || !AIR_EXISTS(ff) || !AIR_EXISTS(gg)) {
- fprintf(stderr, "%s: problem: %f -> real %f, approx %f %f\n",
- me, xx, rr, ff, gg);
+ if (rr < 0 || ff < 0 || gg < 0 || !AIR_EXISTS(rr) || !AIR_EXISTS(ff)
+ || !AIR_EXISTS(gg)) {
+ fprintf(stderr, "%s: problem: %f -> real %f, approx %f %f\n", me, xx, rr, ff, gg);
exit(1);
}
out[0] = rr;
out[1] = ff;
- out[2] = (ff-rr)/rr;
+ out[2] = (ff - rr) / rr;
out[3] = gg;
- out[4] = (gg-rr)/rr;
+ out[4] = (gg - rr) / rr;
out += 5;
}
if (nrrdSave(argv[4], nout, NULL)) {
- fprintf(stderr, "%s: trouble saving:\n%s", me,
- biffGetDone(NRRD));
+ fprintf(stderr, "%s: trouble saving:\n%s", me, biffGetDone(NRRD));
exit(1);
}
exit(0);
Modified: teem/trunk/src/nrrd/test/trand.c
===================================================================
--- teem/trunk/src/nrrd/test/trand.c 2023-07-15 21:56:46 UTC (rev 7114)
+++ teem/trunk/src/nrrd/test/trand.c 2023-07-15 21:57:26 UTC (rev 7115)
@@ -32,17 +32,16 @@
AIR_UNUSED(argc);
AIR_UNUSED(argv);
- nrrdAlloc_va(nval=nrrdNew(), nrrdTypeDouble, 1,
- AIR_CAST(size_t, BINS*BINS));
+ nrrdAlloc_va(nval = nrrdNew(), nrrdTypeDouble, 1, AIR_SIZE_T(BINS * BINS));
val = (double *)nval->data;
airSrandMT((int)airTime());
- for (i=0; i<BINS*BINS; i++) {
+ for (i = 0; i < BINS * BINS; i++) {
val[i] = airDrandMT();
}
- nrrdHisto(nhist=nrrdNew(), nval, NULL, NULL, BINS, nrrdTypeInt);
- nrrdHistoDraw(npgm=nrrdNew(), nhist, HGHT, AIR_FALSE, 0.0);
+ nrrdHisto(nhist = nrrdNew(), nval, NULL, NULL, BINS, nrrdTypeInt);
+ nrrdHistoDraw(npgm = nrrdNew(), nhist, HGHT, AIR_FALSE, 0.0);
nrrdSave("hist.pgm", npgm, NULL);
nrrdNuke(nval);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kin...@us...> - 2023-07-15 21:56:47
|
Revision: 7114
http://sourceforge.net/p/teem/code/7114
Author: kindlmann
Date: 2023-07-15 21:56:46 +0000 (Sat, 15 Jul 2023)
Log Message:
-----------
AIR_CAST(size_t, _) is so common that it deserves its own thing there
Modified Paths:
--------------
teem/trunk/src/air/air.h
Modified: teem/trunk/src/air/air.h
===================================================================
--- teem/trunk/src/air/air.h 2023-07-15 14:31:23 UTC (rev 7113)
+++ teem/trunk/src/air/air.h 2023-07-15 21:56:46 UTC (rev 7114)
@@ -701,7 +701,7 @@
#define AIR_UNUSED(x) (void)(x)
/*
-******** AIR_CAST, AIR_UINT, AIR_INT
+******** AIR_CAST, AIR_UINT, AIR_INT, ...
**
** just casts, but with the added ability to grep for them more easily,
** since casts should probably always be revisited and reconsidered.
@@ -710,6 +710,7 @@
#define AIR_UCHAR(x) AIR_CAST(unsigned char, x)
#define AIR_USHORT(x) AIR_CAST(unsigned short, x)
#define AIR_UINT(x) AIR_CAST(unsigned int, x)
+#define AIR_SIZE_T(x) AIR_CAST(size_t, x)
#define AIR_INT(x) AIR_CAST(int, x)
#define AIR_FLOAT(x) AIR_CAST(float, x)
#define AIR_DOUBLE(x) AIR_CAST(double, x)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kin...@us...> - 2023-07-15 14:31:25
|
Revision: 7113
http://sourceforge.net/p/teem/code/7113
Author: kindlmann
Date: 2023-07-15 14:31:23 +0000 (Sat, 15 Jul 2023)
Log Message:
-----------
syncing with source
Modified Paths:
--------------
teem/trunk/python/cffi/biffdata/alan.csv
teem/trunk/python/cffi/cdef/cdef_alan.h
teem/trunk/python/cffi/cdef/cdef_hest.h
teem/trunk/python/cffi/cdef/cdef_hoover.h
teem/trunk/python/cffi/cdef/cdef_nrrd.h
teem/trunk/python/cffi/teem.py
Modified: teem/trunk/python/cffi/biffdata/alan.csv
===================================================================
--- teem/trunk/python/cffi/biffdata/alan.csv 2023-07-15 14:27:54 UTC (rev 7112)
+++ teem/trunk/python/cffi/biffdata/alan.csv 2023-07-15 14:31:23 UTC (rev 7113)
@@ -1,9 +1,9 @@
func_name,return_type,error_val(s),mubi,biff_key,filename:linenumber
alanUpdate,int,1,0,alan,alan/coreAlan.c:60
alanInit,int,1,0,alan,alan/coreAlan.c:103
-alanRun,int,1,0,alan,alan/coreAlan.c:456
+alanRun,int,1,0,alan,alan/coreAlan.c:457
alanDimensionSet,int,1,0,alan,alan/methodsAlan.c:104
alan2DSizeSet,int,1,0,alan,alan/methodsAlan.c:119
alan3DSizeSet,int,1,0,alan,alan/methodsAlan.c:139
-alanTensorSet,int,1,0,alan,alan/methodsAlan.c:160
-alanParmSet,int,1,0,alan,alan/methodsAlan.c:207
+alanTensorSet,int,1,0,alan,alan/methodsAlan.c:161
+alanParmSet,int,1,0,alan,alan/methodsAlan.c:208
Modified: teem/trunk/python/cffi/cdef/cdef_alan.h
===================================================================
--- teem/trunk/python/cffi/cdef/cdef_alan.h 2023-07-15 14:27:54 UTC (rev 7112)
+++ teem/trunk/python/cffi/cdef/cdef_alan.h 2023-07-15 14:31:23 UTC (rev 7113)
@@ -71,15 +71,15 @@
typedef struct alanContext_t {
/* INPUT ----------------------------- */
unsigned int dim, /* either 2 or 3 */
- size[3]; /* number of texels in X, Y, (Z) */
+ size[3], /* number of texels in X, Y, (Z) */
+ numThreads, /* # of threads, if airThreadCapable */
+ frameInterval, /* # of iterations between which to an image */
+ saveInterval, /* # of iterations between which to save all state */
+ maxIteration; /* cap on # of iterations, or 0 if there is no limit */
int verbose, wrap, /* do toroidal boundary wrapping */
textureType, /* what kind are we (from alanTextureType* enum) */
oversample, /* oversampling of tensors to texels */
homogAniso, /* homogenous anisotropy approximation */
- numThreads, /* # of threads, if airThreadCapable */
- frameInterval, /* # of iterations between which to an image */
- saveInterval, /* # of iterations between which to save all state */
- maxIteration, /* cap on # of iterations, or 0 if there is no limit */
constFilename; /* always use the same filename when saving frames */
alan_t K, F, /* simulation variables */
deltaX, /* size of spatial grid discretization */
@@ -99,13 +99,13 @@
/* if non-NULL, this is called once per iteration, at its completion */
int (*perIteration)(struct alanContext_t *, int iter);
/* INTERNAL -------------------------- */
- int iter; /* current iteration */
- Nrrd *_nlev[2], /* levels of morphogens, alternating buffers */
- *nlev; /* pointer to last iterations output */
- Nrrd *nparm; /* alpha, beta values for all texels */
- alan_t averageChange; /* average amount of "change" in last iteration */
- int changeCount; /* # of contributions to averageChange */
- /* to control update of averageChange and changeCount */
+ int iter; /* current iteration */
+ Nrrd *_nlev[2], /* levels of morphogens, alternating buffers */
+ *nlev; /* pointer to last iterations output */
+ Nrrd *nparm; /* alpha, beta values for all texels */
+ alan_t averageChange; /* average amount of "change" in last iteration */
+ unsigned int changeCount; /* # of contributions to averageChange
+ to control update of averageChange and changeCount */
airThreadMutex *changeMutex;
/* to synchronize separate iterations of simulation */
airThreadBarrier *iterBarrier;
@@ -118,9 +118,10 @@
extern void alanContextInit(alanContext *actx);
extern alanContext *alanContextNew(void);
extern alanContext *alanContextNix(alanContext *actx);
-extern int alanDimensionSet(alanContext *actx, int dim);
-extern int alan2DSizeSet(alanContext *actx, int sizeX, int sizeY);
-extern int alan3DSizeSet(alanContext *actx, int sizeX, int sizeY, int sizeZ);
+extern int alanDimensionSet(alanContext *actx, unsigned int dim);
+extern int alan2DSizeSet(alanContext *actx, unsigned int sizeX, unsigned int sizeY);
+extern int alan3DSizeSet(alanContext *actx, unsigned int sizeX, unsigned int sizeY,
+ unsigned int sizeZ);
extern int alanTensorSet(alanContext *actx, Nrrd *nten, int oversample);
extern int alanParmSet(alanContext *actx, int whichParm, double parm);
/* enumsAlan.c */
Modified: teem/trunk/python/cffi/cdef/cdef_hest.h
===================================================================
--- teem/trunk/python/cffi/cdef/cdef_hest.h 2023-07-15 14:27:54 UTC (rev 7112)
+++ teem/trunk/python/cffi/cdef/cdef_hest.h 2023-07-15 14:31:23 UTC (rev 7113)
@@ -37,9 +37,9 @@
/*
******** hestCB struct
**
-** for when the thing you want to parse from the command-line is not a simple boolean,
-** number, airEnum, or string. hestParse() will not allocate anything to store
-** individual things, though it may allocate an array in the case of a multiple
+** for when the thing you want to parse from the command-line is airTypeOther: not a
+** simple boolean, number, string, or airEnum. hestParse() will not allocate anything to
+** store individual things, though it may allocate an array in the case of a multiple
** variable parameter option. If your things are actually pointers to things, then you
** do the allocation in the parse() callback. In this case, you set destroy() to be
** your "destructor", and it will be called on the result of derefencing the argument
@@ -73,7 +73,7 @@
int type; /* type of option (from airType enum) */
unsigned int min; /* min # of parameters for option */
int max; /* max # of parameters for option,
- or -1 for "there is no max" */
+ or -1 for "there is no max; # parms is unbounded" */
void *valueP; /* storage of parsed values */
char *dflt, /* default value written out as string */
*info; /* description to be printed with "glossary" info */
@@ -216,17 +216,17 @@
extern hestParm *hestParmFree(hestParm *parm);
extern void *hestParmFree_vp(void *parm);
extern void hestOptSingleSet(hestOpt *opt, const char *flag, const char *name,
- int type, int min, int max, void *valueP,
+ int type, unsigned int min, int max, void *valueP,
const char *dflt, const char *info, unsigned int *sawP,
const airEnum *enm, const hestCB *CB);
extern unsigned int hestOptAdd_nva(hestOpt **optP, const char *flag,
- const char *name, int type, int min, int max,
- void *valueP, const char *dflt, const char *info,
- unsigned int *sawP, const airEnum *enm,
- const hestCB *CB);
+ const char *name, int type, unsigned int min,
+ int max, void *valueP, const char *dflt,
+ const char *info, unsigned int *sawP,
+ const airEnum *enm, const hestCB *CB);
extern unsigned int hestOptAdd(hestOpt **optP,
const char *flag, const char *name,
- int type, int min, int max,
+ int type, unsigned int min, int max,
void *valueP, const char *dflt,
const char *info,
... /* unsigned int *sawP,
@@ -254,43 +254,313 @@
extern void hestInfo(FILE *file, const char *argv0, const char *info,
const hestParm *parm);
/* adders.c */
+extern void hestOptAddDeclsPrint(FILE *f);
+/* Many many non-var-args alternatives to hestOptAdd, also usefully type-specific for the
+type of value to be parsed in a way that hestOptAdd_nva cannot match. These capture all
+the common uses (and them some) of hest within Teem. They can be categorized, like
+hestOpt->kind, in terms of the min, max number of (type T) parameters to the option:
+ min == max == 0 hestOptAdd_Flag (stand-alone flag; no parameters)
+ min == max == 1 hestOptAdd_1_T single fixed parameter
+ min == max >= 2 hestOptAdd_{2,3,4,N}_T multiple fixed parameters
+ min == 0; max == 1 hestOptAdd_1v_T single variable parameter
+ min < max; max >= 2 hestOptAdd_Nv_T multiple variable parameters
+An airEnum* is passed for _Enum options; or a hestCB* for _Other options. The number of
+parameters *sawP that hestParm saw on the command-line is passed for the _Nv_ options.
+All declarations below were automatically generated via hestOptAddDeclsPrint (followed by
+clang-format), which (like the implementation of all the functions) is done via lots of
+#define macro tricks. */
extern unsigned int hestOptAdd_Flag(hestOpt **optP, const char *flag, int *valueP,
const char *info);
-extern unsigned int hestOptAdd_1_Bool(hestOpt **optP, const char *flag,
- const char *name, int *valueP, int dflt,
- const char *info);
-extern unsigned int hestOptAdd_1_Int(hestOpt **optP, const char *flag,
- const char *name, int *valueP, int dflt,
- const char *info);
-extern unsigned int hestOptAdd_1_UInt(hestOpt **optP, const char *flag,
+extern unsigned int hestOptAdd_1v_Bool(hestOpt **hoptP, const char *flag,
+ const char *name, int *valueP,
+ const char *dflt, const char *info);
+extern unsigned int hestOptAdd_1v_Int(hestOpt **hoptP, const char *flag,
+ const char *name, int *valueP,
+ const char *dflt, const char *info);
+extern unsigned int hestOptAdd_1v_UInt(hestOpt **hoptP, const char *flag,
+ const char *name, unsigned int *valueP,
+ const char *dflt, const char *info);
+extern unsigned int hestOptAdd_1v_LongInt(hestOpt **hoptP, const char *flag,
+ const char *name, long int *valueP,
+ const char *dflt, const char *info);
+extern unsigned int hestOptAdd_1v_ULongInt(hestOpt **hoptP, const char *flag,
+ const char *name,
+ unsigned long int *valueP,
+ const char *dflt, const char *info);
+extern unsigned int hestOptAdd_1v_Size_t(hestOpt **hoptP, const char *flag,
+ const char *name, size_t *valueP,
+ const char *dflt, const char *info);
+extern unsigned int hestOptAdd_1v_Float(hestOpt **hoptP, const char *flag,
+ const char *name, float *valueP,
+ const char *dflt, const char *info);
+extern unsigned int hestOptAdd_1v_Double(hestOpt **hoptP, const char *flag,
+ const char *name, double *valueP,
+ const char *dflt, const char *info);
+extern unsigned int hestOptAdd_1v_Char(hestOpt **hoptP, const char *flag,
+ const char *name, char *valueP,
+ const char *dflt, const char *info);
+extern unsigned int hestOptAdd_1v_String(hestOpt **hoptP, const char *flag,
+ const char *name, char **valueP,
+ const char *dflt, const char *info);
+extern unsigned int hestOptAdd_1v_Enum(hestOpt **hoptP, const char *flag,
+ const char *name, int *valueP,
+ const char *dflt, const char *info,
+ const airEnum *enm);
+extern unsigned int hestOptAdd_1v_Other(hestOpt **hoptP, const char *flag,
+ const char *name, void *valueP,
+ const char *dflt, const char *info,
+ const hestCB *CB);
+extern unsigned int hestOptAdd_1_Bool(hestOpt **hoptP, const char *flag,
+ const char *name, int *valueP,
+ const char *dflt, const char *info);
+extern unsigned int hestOptAdd_1_Int(hestOpt **hoptP, const char *flag,
+ const char *name, int *valueP,
+ const char *dflt, const char *info);
+extern unsigned int hestOptAdd_1_UInt(hestOpt **hoptP, const char *flag,
const char *name, unsigned int *valueP,
- unsigned int dflt, const char *info);
-extern unsigned int hestOptAdd_1_LongInt(hestOpt **optP, const char *flag,
+ const char *dflt, const char *info);
+extern unsigned int hestOptAdd_1_LongInt(hestOpt **hoptP, const char *flag,
const char *name, long int *valueP,
- long int dflt, const char *info);
-extern unsigned int hestOptAdd_1_ULongInt(hestOpt **optP, const char *flag,
+ const char *dflt, const char *info);
+extern unsigned int hestOptAdd_1_ULongInt(hestOpt **hoptP, const char *flag,
const char *name,
unsigned long int *valueP,
- unsigned long int dflt, const char *info);
-extern unsigned int hestOptAdd_1_Size_t(hestOpt **optP, const char *flag,
+ const char *dflt, const char *info);
+extern unsigned int hestOptAdd_1_Size_t(hestOpt **hoptP, const char *flag,
const char *name, size_t *valueP,
- size_t dflt, const char *info);
-extern unsigned int hestOptAdd_1_Float(hestOpt **optP, const char *flag,
- const char *name, float *valueP, float dflt,
- const char *info);
-extern unsigned int hestOptAdd_1_Double(hestOpt **optP, const char *flag,
+ const char *dflt, const char *info);
+extern unsigned int hestOptAdd_1_Float(hestOpt **hoptP, const char *flag,
+ const char *name, float *valueP,
+ const char *dflt, const char *info);
+extern unsigned int hestOptAdd_1_Double(hestOpt **hoptP, const char *flag,
const char *name, double *valueP,
- double dflt, const char *info);
-extern unsigned int hestOptAdd_1_Char(hestOpt **optP, const char *flag,
- const char *name, char *valueP, char dflt,
- const char *info);
-extern unsigned int hestOptAdd_1_String(hestOpt **optP, const char *flag,
+ const char *dflt, const char *info);
+extern unsigned int hestOptAdd_1_Char(hestOpt **hoptP, const char *flag,
+ const char *name, char *valueP,
+ const char *dflt, const char *info);
+extern unsigned int hestOptAdd_1_String(hestOpt **hoptP, const char *flag,
const char *name, char **valueP,
const char *dflt, const char *info);
-extern unsigned int hestOptAdd_1_Enum(hestOpt **optP, const char *flag,
- const char *name, int *valueP, int dflt,
- const char *info, const airEnum *enm);
-extern unsigned int hestOptAdd_1_Other(hestOpt **optP, const char *flag,
+extern unsigned int hestOptAdd_1_Enum(hestOpt **hoptP, const char *flag,
+ const char *name, int *valueP,
+ const char *dflt, const char *info,
+ const airEnum *enm);
+extern unsigned int hestOptAdd_1_Other(hestOpt **hoptP, const char *flag,
const char *name, void *valueP,
const char *dflt, const char *info,
const hestCB *CB);
+extern unsigned int hestOptAdd_2_Bool(hestOpt **hoptP, const char *flag,
+ const char *name, int valueP[2],
+ const char *dflt, const char *info);
+extern unsigned int hestOptAdd_2_Int(hestOpt **hoptP, const char *flag,
+ const char *name, int valueP[2],
+ const char *dflt, const char *info);
+extern unsigned int hestOptAdd_2_UInt(hestOpt **hoptP, const char *flag,
+ const char *name, unsigned int valueP[2],
+ const char *dflt, const char *info);
+extern unsigned int hestOptAdd_2_LongInt(hestOpt **hoptP, const char *flag,
+ const char *name, long int valueP[2],
+ const char *dflt, const char *info);
+extern unsigned int hestOptAdd_2_ULongInt(hestOpt **hoptP, const char *flag,
+ const char *name,
+ unsigned long int valueP[2],
+ const char *dflt, const char *info);
+extern unsigned int hestOptAdd_2_Size_t(hestOpt **hoptP, const char *flag,
+ const char *name, size_t valueP[2],
+ const char *dflt, const char *info);
+extern unsigned int hestOptAdd_2_Float(hestOpt **hoptP, const char *flag,
+ const char *name, float valueP[2],
+ const char *dflt, const char *info);
+extern unsigned int hestOptAdd_2_Double(hestOpt **hoptP, const char *flag,
+ const char *name, double valueP[2],
+ const char *dflt, const char *info);
+extern unsigned int hestOptAdd_2_Char(hestOpt **hoptP, const char *flag,
+ const char *name, char valueP[2],
+ const char *dflt, const char *info);
+extern unsigned int hestOptAdd_2_String(hestOpt **hoptP, const char *flag,
+ const char *name, char *valueP[2],
+ const char *dflt, const char *info);
+extern unsigned int hestOptAdd_2_Enum(hestOpt **hoptP, const char *flag,
+ const char *name, int valueP[2],
+ const char *dflt, const char *info,
+ const airEnum *enm);
+extern unsigned int hestOptAdd_2_Other(hestOpt **hoptP, const char *flag,
+ const char *name, void *valueP,
+ const char *dflt, const char *info,
+ const hestCB *CB);
+extern unsigned int hestOptAdd_3_Bool(hestOpt **hoptP, const char *flag,
+ const char *name, int valueP[3],
+ const char *dflt, const char *info);
+extern unsigned int hestOptAdd_3_Int(hestOpt **hoptP, const char *flag,
+ const char *name, int valueP[3],
+ const char *dflt, const char *info);
+extern unsigned int hestOptAdd_3_UInt(hestOpt **hoptP, const char *flag,
+ const char *name, unsigned int valueP[3],
+ const char *dflt, const char *info);
+extern unsigned int hestOptAdd_3_LongInt(hestOpt **hoptP, const char *flag,
+ const char *name, long int valueP[3],
+ const char *dflt, const char *info);
+extern unsigned int hestOptAdd_3_ULongInt(hestOpt **hoptP, const char *flag,
+ const char *name,
+ unsigned long int valueP[3],
+ const char *dflt, const char *info);
+extern unsigned int hestOptAdd_3_Size_t(hestOpt **hoptP, const char *flag,
+ const char *name, size_t valueP[3],
+ const char *dflt, const char *info);
+extern unsigned int hestOptAdd_3_Float(hestOpt **hoptP, const char *flag,
+ const char *name, float valueP[3],
+ const char *dflt, const char *info);
+extern unsigned int hestOptAdd_3_Double(hestOpt **hoptP, const char *flag,
+ const char *name, double valueP[3],
+ const char *dflt, const char *info);
+extern unsigned int hestOptAdd_3_Char(hestOpt **hoptP, const char *flag,
+ const char *name, char valueP[3],
+ const char *dflt, const char *info);
+extern unsigned int hestOptAdd_3_String(hestOpt **hoptP, const char *flag,
+ const char *name, char *valueP[3],
+ const char *dflt, const char *info);
+extern unsigned int hestOptAdd_3_Enum(hestOpt **hoptP, const char *flag,
+ const char *name, int valueP[3],
+ const char *dflt, const char *info,
+ const airEnum *enm);
+extern unsigned int hestOptAdd_3_Other(hestOpt **hoptP, const char *flag,
+ const char *name, void *valueP,
+ const char *dflt, const char *info,
+ const hestCB *CB);
+extern unsigned int hestOptAdd_4_Bool(hestOpt **hoptP, const char *flag,
+ const char *name, int valueP[4],
+ const char *dflt, const char *info);
+extern unsigned int hestOptAdd_4_Int(hestOpt **hoptP, const char *flag,
+ const char *name, int valueP[4],
+ const char *dflt, const char *info);
+extern unsigned int hestOptAdd_4_UInt(hestOpt **hoptP, const char *flag,
+ const char *name, unsigned int valueP[4],
+ const char *dflt, const char *info);
+extern unsigned int hestOptAdd_4_LongInt(hestOpt **hoptP, const char *flag,
+ const char *name, long int valueP[4],
+ const char *dflt, const char *info);
+extern unsigned int hestOptAdd_4_ULongInt(hestOpt **hoptP, const char *flag,
+ const char *name,
+ unsigned long int valueP[4],
+ const char *dflt, const char *info);
+extern unsigned int hestOptAdd_4_Size_t(hestOpt **hoptP, const char *flag,
+ const char *name, size_t valueP[4],
+ const char *dflt, const char *info);
+extern unsigned int hestOptAdd_4_Float(hestOpt **hoptP, const char *flag,
+ const char *name, float valueP[4],
+ const char *dflt, const char *info);
+extern unsigned int hestOptAdd_4_Double(hestOpt **hoptP, const char *flag,
+ const char *name, double valueP[4],
+ const char *dflt, const char *info);
+extern unsigned int hestOptAdd_4_Char(hestOpt **hoptP, const char *flag,
+ const char *name, char valueP[4],
+ const char *dflt, const char *info);
+extern unsigned int hestOptAdd_4_String(hestOpt **hoptP, const char *flag,
+ const char *name, char *valueP[4],
+ const char *dflt, const char *info);
+extern unsigned int hestOptAdd_4_Enum(hestOpt **hoptP, const char *flag,
+ const char *name, int valueP[4],
+ const char *dflt, const char *info,
+ const airEnum *enm);
+extern unsigned int hestOptAdd_4_Other(hestOpt **hoptP, const char *flag,
+ const char *name, void *valueP,
+ const char *dflt, const char *info,
+ const hestCB *CB);
+extern unsigned int hestOptAdd_N_Bool(hestOpt **hoptP, const char *flag,
+ const char *name, unsigned int N, int *valueP,
+ const char *dflt, const char *info);
+extern unsigned int hestOptAdd_N_Int(hestOpt **hoptP, const char *flag,
+ const char *name, unsigned int N, int *valueP,
+ const char *dflt, const char *info);
+extern unsigned int hestOptAdd_N_UInt(hestOpt **hoptP, const char *flag,
+ const char *name, unsigned int N,
+ unsigned int *valueP, const char *dflt,
+ const char *info);
+extern unsigned int hestOptAdd_N_LongInt(hestOpt **hoptP, const char *flag,
+ const char *name, unsigned int N,
+ long int *valueP, const char *dflt,
+ const char *info);
+extern unsigned int hestOptAdd_N_ULongInt(hestOpt **hoptP, const char *flag,
+ const char *name, unsigned int N,
+ unsigned long int *valueP,
+ const char *dflt, const char *info);
+extern unsigned int hestOptAdd_N_Size_t(hestOpt **hoptP, const char *flag,
+ const char *name, unsigned int N,
+ size_t *valueP, const char *dflt,
+ const char *info);
+extern unsigned int hestOptAdd_N_Float(hestOpt **hoptP, const char *flag,
+ const char *name, unsigned int N,
+ float *valueP, const char *dflt,
+ const char *info);
+extern unsigned int hestOptAdd_N_Double(hestOpt **hoptP, const char *flag,
+ const char *name, unsigned int N,
+ double *valueP, const char *dflt,
+ const char *info);
+extern unsigned int hestOptAdd_N_Char(hestOpt **hoptP, const char *flag,
+ const char *name, unsigned int N,
+ char *valueP, const char *dflt,
+ const char *info);
+extern unsigned int hestOptAdd_N_String(hestOpt **hoptP, const char *flag,
+ const char *name, unsigned int N,
+ char **valueP, const char *dflt,
+ const char *info);
+extern unsigned int hestOptAdd_N_Enum(hestOpt **hoptP, const char *flag,
+ const char *name, unsigned int N, int *valueP,
+ const char *dflt, const char *info,
+ const airEnum *enm);
+extern unsigned int hestOptAdd_N_Other(hestOpt **hoptP, const char *flag,
+ const char *name, unsigned int N,
+ void *valueP, const char *dflt,
+ const char *info, const hestCB *CB);
+extern unsigned int hestOptAdd_Nv_Bool(hestOpt **hoptP, const char *flag,
+ const char *name, unsigned int min, int max,
+ int **valueP, const char *dflt,
+ const char *info, unsigned int *sawP);
+extern unsigned int hestOptAdd_Nv_Int(hestOpt **hoptP, const char *flag,
+ const char *name, unsigned int min, int max,
+ int **valueP, const char *dflt,
+ const char *info, unsigned int *sawP);
+extern unsigned int hestOptAdd_Nv_UInt(hestOpt **hoptP, const char *flag,
+ const char *name, unsigned int min, int max,
+ unsigned int **valueP, const char *dflt,
+ const char *info, unsigned int *sawP);
+extern unsigned int hestOptAdd_Nv_LongInt(hestOpt **hoptP, const char *flag,
+ const char *name, unsigned int min,
+ int max, long int **valueP,
+ const char *dflt, const char *info,
+ unsigned int *sawP);
+extern unsigned int hestOptAdd_Nv_ULongInt(hestOpt **hoptP, const char *flag,
+ const char *name, unsigned int min,
+ int max, unsigned long int **valueP,
+ const char *dflt, const char *info,
+ unsigned int *sawP);
+extern unsigned int hestOptAdd_Nv_Size_t(hestOpt **hoptP, const char *flag,
+ const char *name, unsigned int min,
+ int max, size_t **valueP, const char *dflt,
+ const char *info, unsigned int *sawP);
+extern unsigned int hestOptAdd_Nv_Float(hestOpt **hoptP, const char *flag,
+ const char *name, unsigned int min, int max,
+ float **valueP, const char *dflt,
+ const char *info, unsigned int *sawP);
+extern unsigned int hestOptAdd_Nv_Double(hestOpt **hoptP, const char *flag,
+ const char *name, unsigned int min,
+ int max, double **valueP, const char *dflt,
+ const char *info, unsigned int *sawP);
+extern unsigned int hestOptAdd_Nv_Char(hestOpt **hoptP, const char *flag,
+ const char *name, unsigned int min, int max,
+ char **valueP, const char *dflt,
+ const char *info, unsigned int *sawP);
+extern unsigned int hestOptAdd_Nv_String(hestOpt **hoptP, const char *flag,
+ const char *name, unsigned int min,
+ int max, char ***valueP, const char *dflt,
+ const char *info, unsigned int *sawP);
+extern unsigned int hestOptAdd_Nv_Enum(hestOpt **hoptP, const char *flag,
+ const char *name, unsigned int min, int max,
+ int **valueP, const char *dflt,
+ const char *info, unsigned int *sawP,
+ const airEnum *enm);
+extern unsigned int hestOptAdd_Nv_Other(hestOpt **hoptP, const char *flag,
+ const char *name, unsigned int min, int max,
+ void *valueP, const char *dflt,
+ const char *info, unsigned int *sawP,
+ const hestCB *CB);
Modified: teem/trunk/python/cffi/cdef/cdef_hoover.h
===================================================================
--- teem/trunk/python/cffi/cdef/cdef_hoover.h 2023-07-15 14:27:54 UTC (rev 7112)
+++ teem/trunk/python/cffi/cdef/cdef_hoover.h 2023-07-15 14:31:23 UTC (rev 7113)
@@ -69,20 +69,20 @@
limnCamera *cam; /* camera info */
/******** 2) volume information: size and spacing, centering, or
a gageShape that sets everything */
- int volSize[3]; /* X,Y,Z resolution of volume */
- double volSpacing[3]; /* distance between samples in X,Y,Z direction */
- int volCentering; /* either nrrdCenterNode or nrrdCenterCell */
- const gageShape *shape; /* if non-NULL, use this gageShape (which we do
- NOT own), which over-rides
- volSize, volSpacing, volCentering */
+ unsigned int volSize[3]; /* X,Y,Z resolution of volume */
+ double volSpacing[3]; /* distance between samples in X,Y,Z direction */
+ int volCentering; /* either nrrdCenterNode or nrrdCenterCell */
+ const gageShape *shape; /* if non-NULL, use this gageShape (which we do
+ NOT own), which over-rides
+ volSize, volSpacing, volCentering */
/******** 3) image information: dimensions + centering */
- int imgSize[2], /* # samples of image along U and V axes */
- imgCentering; /* either nrrdCenterNode or nrrdCenterCell */
+ unsigned int imgSize[2]; /* # samples of image along U and V axes */
+ int imgCentering; /* either nrrdCenterNode or nrrdCenterCell */
/******** 4) opaque "user information" pointer */
void *user; /* passed to all callbacks */
/******** 5) stuff about multi-threading */
- unsigned int numThreads; /* number of threads to spawn per rendering */
- int workIdx; /* next work assignment (such as a scanline) */
+ unsigned int numThreads, /* number of threads to spawn per rendering */
+ workIdx; /* next work assignment (such as a scanline) */
airThreadMutex *workMutex; /* mutex around work assignment */
/*
******* 6) the callbacks
Modified: teem/trunk/python/cffi/cdef/cdef_nrrd.h
===================================================================
--- teem/trunk/python/cffi/cdef/cdef_nrrd.h 2023-07-15 14:27:54 UTC (rev 7112)
+++ teem/trunk/python/cffi/cdef/cdef_nrrd.h 2023-07-15 14:31:23 UTC (rev 7113)
@@ -1787,6 +1787,7 @@
/******** things useful with hest */
/* hestNrrd.c */
extern const hestCB *const nrrdHestNrrd;
+extern const hestCB *const nrrdHestNrrdNoTTY;
extern const hestCB *const nrrdHestKernelSpec;
extern const hestCB *const nrrdHestBoundarySpec;
extern const hestCB *const nrrdHestIter;
Modified: teem/trunk/python/cffi/teem.py
===================================================================
--- teem/trunk/python/cffi/teem.py 2023-07-15 14:27:54 UTC (rev 7112)
+++ teem/trunk/python/cffi/teem.py 2023-07-15 14:31:23 UTC (rev 7113)
@@ -295,12 +295,12 @@
'mossFourPointTransform': (_equals_one, 0, b'moss', 'moss/xform.c:219'),
'alanUpdate': (_equals_one, 0, b'alan', 'alan/coreAlan.c:60'),
'alanInit': (_equals_one, 0, b'alan', 'alan/coreAlan.c:103'),
- 'alanRun': (_equals_one, 0, b'alan', 'alan/coreAlan.c:456'),
+ 'alanRun': (_equals_one, 0, b'alan', 'alan/coreAlan.c:457'),
'alanDimensionSet': (_equals_one, 0, b'alan', 'alan/methodsAlan.c:104'),
'alan2DSizeSet': (_equals_one, 0, b'alan', 'alan/methodsAlan.c:119'),
'alan3DSizeSet': (_equals_one, 0, b'alan', 'alan/methodsAlan.c:139'),
- 'alanTensorSet': (_equals_one, 0, b'alan', 'alan/methodsAlan.c:160'),
- 'alanParmSet': (_equals_one, 0, b'alan', 'alan/methodsAlan.c:207'),
+ 'alanTensorSet': (_equals_one, 0, b'alan', 'alan/methodsAlan.c:161'),
+ 'alanParmSet': (_equals_one, 0, b'alan', 'alan/methodsAlan.c:208'),
'gageContextCopy': (_equals_null, 0, b'gage', 'gage/ctx.c:88'),
'gageKernelSet': (_equals_one, 0, b'gage', 'gage/ctx.c:199'),
'gagePerVolumeAttach': (_equals_one, 0, b'gage', 'gage/ctx.c:398'),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kin...@us...> - 2023-07-15 14:27:55
|
Revision: 7112
http://sourceforge.net/p/teem/code/7112
Author: kindlmann
Date: 2023-07-15 14:27:54 +0000 (Sat, 15 Jul 2023)
Log Message:
-----------
fixing function name in comment
Modified Paths:
--------------
teem/trunk/src/hest/adders.c
Modified: teem/trunk/src/hest/adders.c
===================================================================
--- teem/trunk/src/hest/adders.c 2023-07-15 14:27:19 UTC (rev 7111)
+++ teem/trunk/src/hest/adders.c 2023-07-15 14:27:54 UTC (rev 7112)
@@ -85,7 +85,7 @@
snake_case ell and tijk libraries). The "hestOptAdd" prefix needs to stay the same (we're
not going to have both hestOptAdd() and hest_opt_add_*() in one library, when other
necessary functions like hestOptFree() are not going to change. So then the question is:
-which is more reader-friendly: hestOptAddNvUInt or hestOpt_Nv_UInt? Obviously the
+which is more reader-friendly: hestOptAddNvUInt or hestOptAdd_Nv_UInt? Obviously the
second, and that matters more that superficial consistency.
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
