From: Kevin M. Rosenberg <kevin@rosenberg.net>
Date: Wed, 21 Mar 2018 23:13:01 +0000 (-0600)
Subject: Add more tests
X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=commitdiff_plain;h=0f3276aa66802546766faeb113562f4c835979eb

Add more tests
---

diff --git a/scripts/test-single-openmp.sh b/scripts/test-single-openmp.sh
index 8697e37..c6d88da 100755
--- a/scripts/test-single-openmp.sh
+++ b/scripts/test-single-openmp.sh
@@ -1,6 +1,6 @@
 #/bin/sh
 
-TEST=medium
+TEST=short
 if test $# -ge 1; then
     TEST=$1
 fi
@@ -23,22 +23,26 @@ BIN1=$DIR/omp/ctsimtext
 BIN2=$DIR/sng/ctsimtext
 
 for PHAN in herman; do
-    fbase=${DIR}/${PHAN}
-    rm -f ${fbase}-*
-    
-    echo -n "$BIN1 Prj: "; $TIME $BIN1 phm2pj $fbase-omp.pj $PR $PV --phantom $PHAN --verbose | tail -1  | sed 's/Run time: (.+) /$1/'
-    echo -n "$BIN2 Prj: "; $TIME $BIN2 phm2pj $fbase-sng.pj $PR $PV --phantom $PHAN --verbose | tail -1 | sed 's/Run time: (.+) /$1/'
+    for GEOM in equilinear equiangular parallel; do
+        echo "$PHAN $GEOM"
+        echo "-------------------"
+        fbase=${DIR}/${PHAN}-${GEOM}
+        rm -f ${fbase}-*
 
-    for BP in idiff diff; do
-        for INT in nearest linear cubic; do
-            recbase=${fbase}-${BP}-${INT}
-            echo -n "$BIN1 Rec $BP $INT: "; $TIME $BIN1 pjrec $fbase-omp.pj $recbase-omp.if $IX $IY --verbose --interp $INT --backproj $BP | tail -1
-            echo -n "$BIN2 Rec $BP $INT: "; $TIME $BIN2 pjrec $fbase-sng.pj $recbase-sng.if $IX $IY --verbose --interp $INT --backproj $BP| tail -1
-            echo -n "--> Difference Rec $BP $INT: "; $BIN1 if2 $recbase-omp.if $recbase-sng.if --comp
-            echo
+        echo -n "$BIN1 Proj: "; $TIME $BIN1 phm2pj $fbase-omp.pj $PR $PV --phantom $PHAN --verbose | tail -1  | sed 's/Run time: (.+) /$1/'
+        echo -n "$BIN2 Proj: "; $TIME $BIN2 phm2pj $fbase-sng.pj $PR $PV --phantom $PHAN --verbose | tail -1 | sed 's/Run time: (.+) /$1/'
+        echo
+
+        for BP in idiff diff table trig; do
+            for INT in nearest linear cubic; do
+                recbase=${fbase}-${BP}-${INT}
+                echo -n "$BIN1 Recon $BP $INT: "; $TIME $BIN1 pjrec $fbase-omp.pj $recbase-omp.if $IX $IY --verbose --interp $INT --backproj $BP | tail -1
+                echo -n "$BIN2 Recon $BP $INT: "; $TIME $BIN2 pjrec $fbase-sng.pj $recbase-sng.if $IX $IY --verbose --interp $INT --backproj $BP| tail -1
+                echo -n "--> Difference Recon $BP $INT: "; $BIN1 if2 $recbase-omp.if $recbase-sng.if --comp
+                echo
+            done
         done
     done
-
     phmbase=${fbase}-phm
     echo -n "$BIN1 Phm: "; $TIME $BIN1 phm2if ${phmbase}-omp.if $IX $IX --phantom $PHAN --nsample 5 --verbose | tail -1
     echo -n "$BIN2 Phm: "; $TIME $BIN2 phm2if ${phmbase}-sng.if $IX $IX --phantom $PHAN --nsample 5 --verbose | tail -1