|
From: <kin...@us...> - 2024-07-09 22:40:49
|
Revision: 7194
http://sourceforge.net/p/teem/code/7194
Author: kindlmann
Date: 2024-07-09 22:40:47 +0000 (Tue, 09 Jul 2024)
Log Message:
-----------
segfault fixed, debugging continues
Modified Paths:
--------------
teem/trunk/src/limn/splineFit.c
teem/trunk/src/limn/test/04-multi.sh
Modified: teem/trunk/src/limn/splineFit.c
===================================================================
--- teem/trunk/src/limn/splineFit.c 2024-07-09 22:29:06 UTC (rev 7193)
+++ teem/trunk/src/limn/splineFit.c 2024-07-09 22:40:47 UTC (rev 7194)
@@ -69,10 +69,10 @@
you can only use actual indices for any memory access. Early iterations of the code used
lifted indices in lots of places, but GLK got confused, so the following summary of who
calls whom ("who -- whom") was made to trace where [loi,hii] spans originate, and to
-ensure that all the functions here only take actual indices as parameters, including
-limnCbfTVT (which computes a tangent,vertex,tangent triple at a given point). Nearly all
-of the cleverness with lifted indices happens in limnCbfTVT, and its idxLift helper
-function ensures it gets actual indices.
+ensure that all the functions here only take actual (not-lifted) indices as parameters,
+including limnCbfTVT (which computes a tangent,vertex,tangent triple at a given point).
+Nearly all of the cleverness with lifted indices happens in limnCbfTVT, and its idxLift
+helper function ensures it gets actual indices.
limnCbfTVT -- idxLift to convert given actual indices into lifted,
and does computations with lifted indices (with signed offsets)
@@ -713,7 +713,7 @@
that we go from lifted index to actual index */
static const double *
PPlowerI(const limnCbfPoints *lpnt, int ssi) {
- int pnum = lpnt->num;
+ int pnum = AIR_INT(lpnt->num);
ssi = AIR_MOD(ssi, pnum);
return PP(lpnt) + 2 * ssi; /* DIM=2 */
}
Modified: teem/trunk/src/limn/test/04-multi.sh
===================================================================
--- teem/trunk/src/limn/test/04-multi.sh 2024-07-09 22:29:06 UTC (rev 7193)
+++ teem/trunk/src/limn/test/04-multi.sh 2024-07-09 22:40:47 UTC (rev 7194)
@@ -59,9 +59,11 @@
junk {0,1}.txt xy-inn.txt
# IN=xy-inn.txt
-IN=circ.txt
+IN=pointy.txt
-CMD="./lpu cbfit -i $IN -loop -scl 0 -fm 0 -1 -v 1"
+# TODO: figure out why this is generating NON-geometrically continuous segments
+
+CMD="./lpu cbfit -i $IN -loop -scl 0 -fm 0 -1 -v 1 -scl 0.5 -eps 0.08"
echo "====== $CMD"
eval $CMD > log.txt
cat log.txt # ; junk log.txt
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|