[Teem-commit] SF.net SVN: teem:[7211] teem/trunk/src/limn

[<kin...@us...>]

Revision: 7211
          http://sourceforge.net/p/teem/code/7211
Author:   kindlmann
Date:     2024-07-16 23:00:09 +0000 (Tue, 16 Jul 2024)
Log Message:
-----------
it may actually be working ...

Modified Paths:
--------------
    teem/trunk/src/limn/lpu_cbfit.c
    teem/trunk/src/limn/test/02-test-fs.sh
    teem/trunk/src/limn/test/03-single.sh
    teem/trunk/src/limn/test/04-multi.sh
    teem/trunk/src/limn/test/05-go.sh

Modified: teem/trunk/src/limn/lpu_cbfit.c
===================================================================
--- teem/trunk/src/limn/lpu_cbfit.c	2024-07-16 22:15:26 UTC (rev 7210)
+++ teem/trunk/src/limn/lpu_cbfit.c	2024-07-16 23:00:09 UTC (rev 7211)
@@ -137,7 +137,9 @@
   sprintf(buff, "%.17g", fctx->nrpPsi);
   hestOptAdd_1_Double(&hopt, "psi", "psi", &psi, buff, "psi, of course");
   sprintf(buff, "%.17g", fctx->cornAngle);
-  hestOptAdd_1_Double(&hopt, "ca", "angle", &cangle, buff, "angle indicating a corner");
+  hestOptAdd_1_Double(&hopt, "ca", "angle", &cangle, buff,
+                      "angle indicating a corner, or, "
+                      "0 to say that no corner finding should be done");
   sprintf(buff, "%.17g", fctx->scale);
   hestOptAdd_1_Double(&hopt, "scl", "scale", &scale, buff,
                       "scale for geometry estimation");
@@ -324,7 +326,12 @@
   fctx->nrpDeltaThresh = deltaThresh;
   fctx->nrpIota = nrpIota;
   fctx->nrpPsi = psi;
-  fctx->cornAngle = cangle;
+  if (cangle) {
+    fctx->cornAngle = cangle;
+    fctx->cornerFind = AIR_TRUE;
+  } else {
+    fctx->cornerFind = AIR_FALSE;
+  }
 
   if (tvt[3] >= 0) { /* here just to call limnCbfTVT once */
     double lt[2], vv[2], rt[2];

Modified: teem/trunk/src/limn/test/02-test-fs.sh
===================================================================
--- teem/trunk/src/limn/test/02-test-fs.sh	2024-07-16 22:15:26 UTC (rev 7210)
+++ teem/trunk/src/limn/test/02-test-fs.sh	2024-07-16 23:00:09 UTC (rev 7211)
@@ -32,8 +32,8 @@
 # https://devmanual.gentoo.org/tools-reference/bash/
 unset UNRRDU_QUIET_QUIT
 
-#IN=circ.txt
-IN=pointy.txt
+IN=circ.txt
+#IN=pointy.txt
 N=$(cat $IN | wc -l | xargs echo)
 BIN=900
 
@@ -40,7 +40,7 @@
 MMB="-min -1.1 1.1 -max 1.1 -1.1 -b $BIN $BIN"
 
 unu jhisto -i $IN    $MMB -t float |
-    unu resample -s x1 x1 -k gauss:1.3,6 | unu quantize -b 8 | unu 2op x - 0.8 -o in.png
+    unu resample -s x1 x1 -k gauss:1.5,6 | unu quantize -b 8 | unu 2op x - 1 -o in.png
 junk in.png
 
 rm -f test-??.png
@@ -47,15 +47,16 @@
 
 for LO in $(seq 0 $((N-1))); do
     echo $LO
-    HI=$((LO+10))
+    HI=$((LO+7))
     LOO=$(printf %02d $LO)
-    CMD="./lpu cbfit -i $IN -loop -scl 2 -psi 1000 -fs $LO $HI -v 0 -eps 0.01"
+    # CMD="./lpu cbfit -i $IN -loop -scl 0.5 -psi 1000 -fs $LO $HI -v 0 -eps 0.5"
+      CMD="./lpu cbfit -i $IN -loop -scl  0  -psi 1000 -fs $LO $HI -v 0 -eps 0.01"
     echo "==================== $LO $HI --> test-$LOO.png : $CMD"
     eval $CMD 2>&1 > log-$LOO.txt
     # cat log-$LOO.txt
     junk log-$LOO.txt
     tail -n 4 log-$LOO.txt |
-        ./lpu cbfit -i - -synthn $N -syntho out.txt 2>&1 | grep -v _hestDefaults
+        ./lpu cbfit -i - -synthn 200 -syntho out.txt 2>&1 | grep -v _hestDefaults
     # lots of extraneous printfs thwart piping
     unu jhisto -i out.txt $MMB | unu quantize -b 8 -max 1 -o out.png
     #  in: green

Modified: teem/trunk/src/limn/test/03-single.sh
===================================================================
--- teem/trunk/src/limn/test/03-single.sh	2024-07-16 22:15:26 UTC (rev 7210)
+++ teem/trunk/src/limn/test/03-single.sh	2024-07-16 23:00:09 UTC (rev 7211)
@@ -37,9 +37,9 @@
 #    because the nrp parms that make sense for a small number of points don't work great
 #    for a huge number of points
 
-# # Good debugging test case: N=18 is a bad fit, N=19 is a perfect fit
-# BUT THEN the improved delta_t fixed this; so both are equally good!
-# # likely due to initial arc-length parameterization being bad, and nrp stuck in local minima
+## Good debugging test case: N=18 is a bad fit, N=19 is a perfect fit
+## BUT THEN the improved delta_t fixed this; so both are equally good!
+## likely due to initial arc-length parameterization being bad, and nrp stuck in local minima
 #N=18
 #echo "-0.5 0.5
 # 2.0  0.5
@@ -53,7 +53,6 @@
 # 1 1.5
 #-1 1.5
 # 1 -1" | ./lpu cbfit -i - -synthn $N -sup 3 -syntho xy-inn-$N.txt
-#junk xy-inn-$N.txt
 
 # This is demo of why we might want a step that optimizes tangent directions
 # after the parameterization has been found
@@ -62,8 +61,9 @@
  1 3
 -3 -1
  1 -1" | ./lpu cbfit -i - -synthn $N -v 0 -syntho - | unu crop -min 0 0 -max M M-1 -o xy-inn-$N.txt
-# junk xy-inn-$N.txt
 
+junk xy-inn-$N.txt
+
 CMD="./lpu cbfit -i xy-inn-$N.txt -scl 0 -fs 0 -1 -v 1 -psi 1000000000 -nim 4000 -deltathr 0.000000000001"
 echo "====== $CMD"
 eval $CMD > log.txt

Modified: teem/trunk/src/limn/test/04-multi.sh
===================================================================
--- teem/trunk/src/limn/test/04-multi.sh	2024-07-16 22:15:26 UTC (rev 7210)
+++ teem/trunk/src/limn/test/04-multi.sh	2024-07-16 23:00:09 UTC (rev 7211)
@@ -45,11 +45,11 @@
 cat 0.txt 1.txt | uniq > xy-inn.txt
 junk {0,1}.txt xy-inn.txt
 
-# IN=xy-inn.txt
+IN=xy-inn.txt
 #IN=pointy.txt
-IN=circ.txt
+#IN=circ.txt
 
-CMD="./lpu cbfit -i $IN -scl 0 -fm 0 -1 -v 2 -psi 3 -eps 0.01"
+CMD="./lpu cbfit -i $IN -scl 0.5 -fm 0 -1 -v 2 -psi 3 -eps 0.01"
 echo "====== $CMD"
 eval $CMD > log.txt
 cat log.txt # ; junk log.txt

Modified: teem/trunk/src/limn/test/05-go.sh
===================================================================
--- teem/trunk/src/limn/test/05-go.sh	2024-07-16 22:15:26 UTC (rev 7210)
+++ teem/trunk/src/limn/test/05-go.sh	2024-07-16 23:00:09 UTC (rev 7211)
@@ -54,8 +54,21 @@
 
 rm -f tmp.png
 
+SCL=3
+EPS=0.08
 rm -f log.txt
-CMD="./lpu cbfit -i $IN -loop -scl 0 -v 0 -eps 0.03 -roll 10"
+# CMD="./lpu cbfit -i $IN             -scl   0  -v 0 -eps $EPS -roll 0"
+# CMD="./lpu cbfit -i $IN       -ca 0 -scl   0  -v 0 -eps $EPS -roll 0"
+# CMD="./lpu cbfit -i $IN             -scl $SCL -v 0 -eps $EPS -roll 0"
+# CMD="./lpu cbfit -i $IN       -ca 0 -scl $SCL -v 0 -eps $EPS -roll 0"
+# CMD="./lpu cbfit -i $IN -loop       -scl   0  -v 0 -eps $EPS -roll 0"
+# CMD="./lpu cbfit -i $IN -loop -ca 0 -scl   0  -v 0 -eps $EPS -roll 0"
+# CMD="./lpu cbfit -i $IN -loop       -scl   0  -v 0 -eps $EPS -roll 5"
+# CMD="./lpu cbfit -i $IN -loop -ca 0 -scl   0  -v 0 -eps $EPS -roll 5"
+# CMD="./lpu cbfit -i $IN -loop       -scl $SCL -v 0 -eps $EPS -roll 0"
+# CMD="./lpu cbfit -i $IN -loop -ca 0 -scl $SCL -v 0 -eps $EPS -roll 0"
+# CMD="./lpu cbfit -i $IN -loop       -scl $SCL -v 0 -eps $EPS -roll 5"
+  CMD="./lpu cbfit -i $IN -loop -ca 0 -scl $SCL -v 0 -eps $EPS -roll 5"
 eval $CMD  2>&1 > log.txt ||:
 echo "====== $CMD"
 cat log.txt # ; junk log.txt
@@ -64,11 +77,11 @@
 echo "====== RESULTS: --> $OUT"
 grep "^seg" log.txt | xargs -n 12 echo | cut -d' ' -f 2,3,4,5,6,7,8,9
 grep "^seg" log.txt | xargs -n 12 echo | cut -d' ' -f 2,3,4,5,6,7,8,9 |
-    ./lpu cbfit -i - -loop -synthn 300 -sup 1 -syntho $OUT
+    ./lpu cbfit -i - -loop -synthn 900 -sup 1 -syntho $OUT
 junk $OUT
 
 
-BIN=900
+BIN=660
 MM="-min -1.1 1.1 -max 1.1 -1.1"
 unu jhisto -i  $IN $MM -b $BIN $BIN | unu quantize -b 8 -max 1 -o xy-inn.png
 unu jhisto -i $OUT $MM -b $BIN $BIN | unu quantize -b 8 -max 1 -o xy-out.png

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.