From 8fbca36cd1abc71c89e6d49611dbd58424881a96 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Mon, 12 Feb 2018 15:05:42 -0700 Subject: [PATCH] Exclude examples b7 and b11 from regression as use random number generator. Add PERFECT measurement versions of examples as b12 and b13 --- examples/.gitignore | 4 +- examples/Makefile | 2 +- examples/b11/README | 7 ++ examples/b11/run | 2 +- examples/b12/README | 7 ++ examples/b12/b12.in | 63 +++++++++++ examples/{b11/b11r.out => b12/b12r.out} | 143 ++++-------------------- examples/b12/run | 1 + examples/b13/README | 7 ++ examples/b13/b13.in | 62 ++++++++++ examples/{b7/b7r.out => b13/b13r.out} | 124 ++++++++++---------- examples/b13/run | 1 + examples/regression | 5 +- examples/run_all | 2 +- 14 files changed, 234 insertions(+), 196 deletions(-) create mode 100644 examples/b11/README create mode 100644 examples/b12/README create mode 100644 examples/b12/b12.in rename examples/{b11/b11r.out => b12/b12r.out} (81%) create mode 100755 examples/b12/run create mode 100644 examples/b13/README create mode 100644 examples/b13/b13.in rename examples/{b7/b7r.out => b13/b13r.out} (86%) create mode 100755 examples/b13/run diff --git a/examples/.gitignore b/examples/.gitignore index 58e9c64..98b08ac 100644 --- a/examples/.gitignore +++ b/examples/.gitignore @@ -12,6 +12,6 @@ b9/snark_e.in b9/snark_e.out b9/fomfil.1 b9/testem.1 -b11/RPRTsuperiorization -b11/RPRTklds +*/RPRTsuperiorization +*/RPRTklds .have_run diff --git a/examples/Makefile b/examples/Makefile index a1bfcde..5ed7d85 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -17,6 +17,6 @@ results: .have_run clean: @rm -f */b[0-9][0-9].out */b1[0-9].out */file11 */prjfil */recfil */eval */src/.o */punch b*/src/*.o */MAPUser1 */snark.lock b*/bin/* - @rm -f b11/RPRTsuperiorization b11/RPRTklds b9/snark_e.in b9/snark_e.out b9/testem.1 b9/fomfil.1 + @rm -f */RPRTsuperiorization */RPRTklds b9/snark_e.in b9/snark_e.out b9/testem.1 b9/fomfil.1 @rm -f .have_run diff --git a/examples/b11/README b/examples/b11/README new file mode 100644 index 0000000..a17892a --- /dev/null +++ b/examples/b11/README @@ -0,0 +1,7 @@ +SNARK14m's original b11 example uses 'MEASUREMENT NOISY' data which +causes inconsistencies in output across different random number +libraries. + +This version is excluded from regresstion testing, but b12 example +uses PERFECT data and is used for regression. + diff --git a/examples/b11/run b/examples/b11/run index 4e5107b..cc6392d 100755 --- a/examples/b11/run +++ b/examples/b11/run @@ -1 +1 @@ -snark14 b11.in +snark14 b11.in diff --git a/examples/b12/README b/examples/b12/README new file mode 100644 index 0000000..9127728 --- /dev/null +++ b/examples/b12/README @@ -0,0 +1,7 @@ +SNARK14m's original b11 example uses 'MEASUREMENT NOISY' data which +causes inconsistencies in output across different random number +libraries. + +This version uses PERFECT data so it can be used to test regression +across different platforms. + diff --git a/examples/b12/b12.in b/examples/b12/b12.in new file mode 100644 index 0000000..ee3d74d --- /dev/null +++ b/examples/b12/b12.in @@ -0,0 +1,63 @@ +********EXAMPLE 11 +* SUPERIORIZED MAP EM ALGORITHM FOR EMISSION TOMOGRAPHY. RECONSTRUCTION +* OF BRAIN PHANTOM. SIMULATING PET GEOMETRY WITH A RING OF 300 DETECTORS +* WITH EACH DETECTOR IN COINCIDENCE WITH 101 DETECTORS OPPOSITE IT. +* COEFFICIENT OF PENALTLY TERM IS SET TO 0 +* +CREATE +EXAMPLE 11 Brain Phantom +SPECTRUM MONOCHROMATIC 511 +OBJECTS + 1 elip -7.0 46.0 3.0 6.0 17.0 0.95 1.0 + 2 elip 7.0 46.0 3.0 6.0 -17.0 1.0 0.95 + 3 rect -12.0 64.0 7.5 4.5 5.0 1.0 1.0 + 4 rect 12.0 64.0 7.5 4.5 -5.0 0.95 0.95 + 5 rect -38.0 51.0 3.5 13.0 -39.0 0.95 1.0 + 6 rect 38.0 51.0 3.5 13.0 39.0 1.0 0.95 + 7 rect -46.0 24.0 6.5 6.0 -18.0 0.95 1.0 + 8 rect 46.0 24.0 6.5 6.0 18.0 1.0 0.95 + 9 rect -49.0 6.0 2.5 10.0 63.0 1.0 1.0 + 10 rect 49.0 6.0 2.5 10.0 -63.0 0.95 0.95 + 11 rect -52.0 -14.0 9.0 7.0 -14.0 0.95 1.0 + 12 rect 52.0 -14.0 9.0 7.0 14.0 1.0 0.95 + 13 rect -10.0 -56.0 5.5 10.0 -1.0 0.95 1.0 + 14 rect 10.0 -56.0 5.5 10.0 1.0 1.0 0.95 + 15 elip -40.0 -47.0 9.0 22.5 48.0 1.0 1.0 + 16 elip 40.0 -47.0 9.0 22.5 -48.0 0.95 0.95 + 17 elip -8.0 -22.0 3.5 15.5 -9.0 1.0 1.0 + 18 elip 8.0 -22.0 3.5 15.5 9.0 0.95 0.95 + 19 elip -27.0 -6.0 5.5 23.5 -5.0 0.95 1.0 + 20 elip 27.0 -6.0 5.5 23.5 5.0 1.0 0.95 + 21 elip -25.0 38.0 6.5 10.5 -14.0 1.0 1.0 + 22 elip 25.0 38.0 6.5 10.5 14.0 0.95 0.95 + 23 rect -8.0 32.0 1.5 6.5 38.0 1.0 1.0 + 24 rect 8.0 32.0 1.5 6.5 -38.0 0.95 0.95 + 25 rect -8.0 3.0 1.0 9.0 -33.0 0.95 1.0 + 26 rect 8.0 3.0 1.0 9.0 33.0 1.0 0.95 + 27 elip 0.0 0.0 66.5 74.0 0.0 1.0 1.0 +LAST .51 1 0.05 +PHANTOM AVERAGE 7 +381 PIXELS OF SIZE 0.4 +RAYSUM AVERAGE 1 +1 +GEOMETRY +divergent arc 153 306 +RAYS USER 301 DETECTOR SPACING 1.1 +ANGLES 500 EQUAL SPACING +0.0 358.8 +MEASUREMENT PERFECT +BACKGROUND 0.0 +RUN +* +PICTURE TEST +* +PROJECTION REAL +* +STOP TERMINATION KLDS 100000 RPRT +* +SUPERIORIZE 16 0.999 1 SMOO RPRT +EXECUTE AVERAGE EMAP +Example 11 Illustrating the Superiorized MAP EM algorithm for PET +gamma is 0 EVAL +* +END diff --git a/examples/b11/b11r.out b/examples/b12/b12r.out similarity index 81% rename from examples/b11/b11r.out rename to examples/b12/b12r.out index 3458c1f..e8f9220 100644 --- a/examples/b11/b11r.out +++ b/examples/b12/b12r.out @@ -1,4 +1,4 @@ - snark14.s170426 - A PICTURE RECONSTRUCTION PROGRAM + snark14.s170710 - A PICTURE RECONSTRUCTION PROGRAM <*> *******EXAMPLE 11 @@ -173,15 +173,8 @@ 352.3287 353.0477 353.7667 354.4858 355.2048 355.9238 356.6429 357.3619 358.0810 358.8000 - <#> MEASUREMENT NOISY - noise characteristics of projection data follow - nature characteristics - - <#> QUANTUM 1.0 1.0 CALIBRATION 4 - Emission tomography - - <#> SEED 0 - seed for random number generator is 0 + <#> MEASUREMENT PERFECT + projection data are noiseless <#> BACKGROUND 0.0 @@ -191,9 +184,9 @@ <#> RUN - 0.358 seconds phantom creation - 1.289 seconds projection data creation - 1.647 seconds used for processing command crea + 0.214 seconds phantom creation + 0.604 seconds projection data creation + 0.820 seconds used for processing command crea <*> @@ -281,7 +274,7 @@ test picture read EXAMPLE 11 Brain Phantom - 0.042 seconds used for processing command pict + 0.043 seconds used for processing command pict <*> @@ -437,15 +430,8 @@ 352.3287 353.0477 353.7667 354.4858 355.2048 355.9238 356.6429 357.3619 358.0810 358.8000 - <#> meas nois - noise characteristics of projection data follow - nature characteristics - - <#> quan 1.0000 1.0000 cali 4 - Emission tomography - - <#> seed 0 - seed for random number generator is 0 + <#> meas perf + projection data are noiseless <#> back 0.0000 @@ -454,11 +440,11 @@ background absorption 0.0000 estimate of totlen = 20962469.574466 - estimate of totden = 9802000.000000 - estimate of average density = 0.4676 + estimate of totden = 9804758.593222 + estimate of average density = 0.4677 projection data read EXAMPLE 11 Brain Phantom - 0.054 seconds used for processing command proj + 0.070 seconds used for processing command proj <*> @@ -501,104 +487,17 @@ ----------------------------------------------------------- + *** WARNING - There exist negative values in the projection data *** + *** Negative values set to 0.0 *** value of l: 15 - value of phi before algorithm operator: 4.42622e-28 - value of phi after algorithm operator: 3.14467 + value of phi before algorithm operator: 0 + value of phi after algorithm operator: 2.39758 algorithm executed in iteration 1 - 3.847 seconds for the execution of the algorithm - current epsilon (KL distance) = 638282 - iteration 1 completed - 4.805 seconds for this iteration - value of l: 31 - value of phi before algorithm operator: 0.429607 - value of phi after algorithm operator: 1.65065 - algorithm executed in iteration 2 - 2.144 seconds for the execution of the algorithm - current epsilon (KL distance) = 446785 - iteration 2 completed - 3.149 seconds for this iteration - value of l: 47 - value of phi before algorithm operator: 0.706119 - value of phi after algorithm operator: 2.49879 - algorithm executed in iteration 3 - 2.148 seconds for the execution of the algorithm - current epsilon (KL distance) = 331430 - iteration 3 completed - 3.106 seconds for this iteration - value of l: 63 - value of phi before algorithm operator: 0.564997 - value of phi after algorithm operator: 2.14542 - algorithm executed in iteration 4 - 2.143 seconds for the execution of the algorithm - current epsilon (KL distance) = 257464 - iteration 4 completed - 3.090 seconds for this iteration - value of l: 79 - value of phi before algorithm operator: 0.577605 - value of phi after algorithm operator: 2.1505 - algorithm executed in iteration 5 - 2.241 seconds for the execution of the algorithm - current epsilon (KL distance) = 207738 - iteration 5 completed - 3.451 seconds for this iteration - value of l: 95 - value of phi before algorithm operator: 0.579469 - value of phi after algorithm operator: 2.11049 - algorithm executed in iteration 6 - 2.264 seconds for the execution of the algorithm - current epsilon (KL distance) = 173224 - iteration 6 completed - 3.188 seconds for this iteration - value of l: 111 - value of phi before algorithm operator: 0.581496 - value of phi after algorithm operator: 2.08666 - algorithm executed in iteration 7 - 2.374 seconds for the execution of the algorithm - current epsilon (KL distance) = 148708 - iteration 7 completed - 3.408 seconds for this iteration - value of l: 127 - value of phi before algorithm operator: 0.587932 - value of phi after algorithm operator: 2.07545 - algorithm executed in iteration 8 - 2.618 seconds for the execution of the algorithm - current epsilon (KL distance) = 130971 - iteration 8 completed - 3.687 seconds for this iteration - value of l: 143 - value of phi before algorithm operator: 0.598034 - value of phi after algorithm operator: 2.07283 - algorithm executed in iteration 9 - 2.448 seconds for the execution of the algorithm - current epsilon (KL distance) = 117930 - iteration 9 completed - 3.523 seconds for this iteration - value of l: 159 - value of phi before algorithm operator: 0.610951 - value of phi after algorithm operator: 2.07635 - algorithm executed in iteration 10 - 2.199 seconds for the execution of the algorithm - current epsilon (KL distance) = 108196 - iteration 10 completed - 3.139 seconds for this iteration - value of l: 175 - value of phi before algorithm operator: 0.625866 - value of phi after algorithm operator: 2.08405 - algorithm executed in iteration 11 - 2.215 seconds for the execution of the algorithm - current epsilon (KL distance) = 100827 - iteration 11 completed - 3.599 seconds for this iteration - value of l: 191 - value of phi before algorithm operator: 0.64192 - value of phi after algorithm operator: 2.09414 - algorithm executed in iteration 12 - 2.428 seconds for the execution of the algorithm - current epsilon (KL distance) = 95173.6 - reconstruction completed after iteration 12 - 3.422 seconds for this iteration - 41.565 seconds for all iterations - 41.706 seconds used for processing command exec + 1.266 seconds for the execution of the algorithm +****Error: Negative raysum in prjfil detected, KLDS is not applicable! Terminating algorithm execution. + reconstruction completed after iteration 1 + 1.268 seconds for this iteration + 1.392 seconds used for processing command exec <*> diff --git a/examples/b12/run b/examples/b12/run new file mode 100755 index 0000000..b981a8a --- /dev/null +++ b/examples/b12/run @@ -0,0 +1 @@ +snark14 b12.in diff --git a/examples/b13/README b/examples/b13/README new file mode 100644 index 0000000..d6aab0e --- /dev/null +++ b/examples/b13/README @@ -0,0 +1,7 @@ +SNARK14m's original b7 example uses 'MEASUREMENT NOISY' data which +causes inconsistencies in output across different random number +libraries. + +This version uses PERFECT data so it can be used to test regression +across different platforms. + diff --git a/examples/b13/b13.in b/examples/b13/b13.in new file mode 100644 index 0000000..835896e --- /dev/null +++ b/examples/b13/b13.in @@ -0,0 +1,62 @@ +********EXAMPLE 7 +* MAP EM ALGORITHM FOR EMISSION TOMOGRAPHY. RECONSTRUCTION OF BRAIN +* PHANTOM. SIMULATING PET GEOMETRY WITH A RING OF 300 DETECTORS WITH +* EACH DETECTOR IN COINCIDENCE WITH 101 DETECTORS OPPOSITE IT. +* COEFFICIENT OF PENALTLY TERM IS SET TO 10.0 +* +CREATE +EXAMPLE 7 Brain Phantom +SPECTRUM MONOCHROMATIC 511 +OBJECTS + 1 elip -7.0 46.0 3.0 6.0 17.0 0.95 1.0 + 2 elip 7.0 46.0 3.0 6.0 -17.0 1.0 0.95 + 3 rect -12.0 64.0 7.5 4.5 5.0 1.0 1.0 + 4 rect 12.0 64.0 7.5 4.5 -5.0 0.95 0.95 + 5 rect -38.0 51.0 3.5 13.0 -39.0 0.95 1.0 + 6 rect 38.0 51.0 3.5 13.0 39.0 1.0 0.95 + 7 rect -46.0 24.0 6.5 6.0 -18.0 0.95 1.0 + 8 rect 46.0 24.0 6.5 6.0 18.0 1.0 0.95 + 9 rect -49.0 6.0 2.5 10.0 63.0 1.0 1.0 + 10 rect 49.0 6.0 2.5 10.0 -63.0 0.95 0.95 + 11 rect -52.0 -14.0 9.0 7.0 -14.0 0.95 1.0 + 12 rect 52.0 -14.0 9.0 7.0 14.0 1.0 0.95 + 13 rect -10.0 -56.0 5.5 10.0 -1.0 0.95 1.0 + 14 rect 10.0 -56.0 5.5 10.0 1.0 1.0 0.95 + 15 elip -40.0 -47.0 9.0 22.5 48.0 1.0 1.0 + 16 elip 40.0 -47.0 9.0 22.5 -48.0 0.95 0.95 + 17 elip -8.0 -22.0 3.5 15.5 -9.0 1.0 1.0 + 18 elip 8.0 -22.0 3.5 15.5 9.0 0.95 0.95 + 19 elip -27.0 -6.0 5.5 23.5 -5.0 0.95 1.0 + 20 elip 27.0 -6.0 5.5 23.5 5.0 1.0 0.95 + 21 elip -25.0 38.0 6.5 10.5 -14.0 1.0 1.0 + 22 elip 25.0 38.0 6.5 10.5 14.0 0.95 0.95 + 23 rect -8.0 32.0 1.5 6.5 38.0 1.0 1.0 + 24 rect 8.0 32.0 1.5 6.5 -38.0 0.95 0.95 + 25 rect -8.0 3.0 1.0 9.0 -33.0 0.95 1.0 + 26 rect 8.0 3.0 1.0 9.0 33.0 1.0 0.95 + 27 elip 0.0 0.0 66.5 74.0 0.0 1.0 1.0 +LAST .51 1 0.05 +PHANTOM AVERAGE 7 +95 PIXELS OF SIZE 1.6 +RAYSUM AVERAGE 1 +1 +GEOMETRY +divergent arc 153 306 +RAYS USER 101 DETECTOR SPACING 3.2 +ANGLES 300 EQUAL SPACING +0.0 358.8 +MEASUREMENT PERFECT +BACKGROUND 0.0 +RUN +* +PICTURE TEST +* +PROJECTION REAL +* +STOP ITERATION 20 +* +EXECUTE AVERAGE EMAP +Example 7 Illustrating the MAP EM algorithm for PET +gamma is 10.0 EVAL +* +END diff --git a/examples/b7/b7r.out b/examples/b13/b13r.out similarity index 86% rename from examples/b7/b7r.out rename to examples/b13/b13r.out index fec9182..e419bf7 100644 --- a/examples/b7/b7r.out +++ b/examples/b13/b13r.out @@ -1,4 +1,4 @@ - snark14.s170426 - A PICTURE RECONSTRUCTION PROGRAM + snark14.s170710 - A PICTURE RECONSTRUCTION PROGRAM <*> *******EXAMPLE 7 @@ -153,15 +153,8 @@ 348.0000 349.2000 350.4000 351.6000 352.8000 354.0000 355.2000 356.4000 357.6000 358.8000 - <#> MEASUREMENT NOISY - noise characteristics of projection data follow - nature characteristics - - <#> QUANTUM 1.0 1.0 CALIBRATION 4 - Emission tomography - - <#> SEED 0 - seed for random number generator is 0 + <#> MEASUREMENT PERFECT + projection data are noiseless <#> BACKGROUND 0.0 @@ -171,9 +164,9 @@ <#> RUN - 0.025 seconds phantom creation - 0.100 seconds projection data creation - 0.125 seconds used for processing command crea + 0.014 seconds phantom creation + 0.078 seconds projection data creation + 0.093 seconds used for processing command crea <*> @@ -261,7 +254,7 @@ test picture read EXAMPLE 7 Brain Phantom - 0.000 seconds used for processing command pict + 0.003 seconds used for processing command pict <*> @@ -397,15 +390,8 @@ 348.0000 349.2000 350.4000 351.6000 352.8000 354.0000 355.2000 356.4000 357.6000 358.8000 - <#> meas nois - noise characteristics of projection data follow - nature characteristics - - <#> quan 1.0000 1.0000 cali 4 - Emission tomography - - <#> seed 0 - seed for random number generator is 0 + <#> meas perf + projection data are noiseless <#> back 0.0000 @@ -414,11 +400,11 @@ background absorption 0.0000 estimate of totlen = 4263169.769963 - estimate of totden = 2020362.000000 - estimate of average density = 0.4739 + estimate of totden = 2023083.983824 + estimate of average density = 0.4745 projection data read EXAMPLE 7 Brain Phantom - 0.012 seconds used for processing command proj + 0.017 seconds used for processing command proj <*> @@ -445,88 +431,90 @@ ----------------------------------------------------------- + *** WARNING - There exist negative values in the projection data *** + *** Negative values set to 0.0 *** algorithm executed in iteration 1 - 0.167 seconds for the execution of the algorithm + 0.063 seconds for the execution of the algorithm iteration 1 completed - 0.167 seconds for this iteration + 0.064 seconds for this iteration algorithm executed in iteration 2 - 0.096 seconds for the execution of the algorithm + 0.040 seconds for the execution of the algorithm iteration 2 completed - 0.096 seconds for this iteration + 0.040 seconds for this iteration algorithm executed in iteration 3 - 0.106 seconds for the execution of the algorithm + 0.040 seconds for the execution of the algorithm iteration 3 completed - 0.106 seconds for this iteration + 0.040 seconds for this iteration algorithm executed in iteration 4 - 0.097 seconds for the execution of the algorithm + 0.040 seconds for the execution of the algorithm iteration 4 completed - 0.097 seconds for this iteration + 0.040 seconds for this iteration algorithm executed in iteration 5 - 0.096 seconds for the execution of the algorithm + 0.041 seconds for the execution of the algorithm iteration 5 completed - 0.096 seconds for this iteration + 0.041 seconds for this iteration algorithm executed in iteration 6 - 0.097 seconds for the execution of the algorithm + 0.042 seconds for the execution of the algorithm iteration 6 completed - 0.097 seconds for this iteration + 0.042 seconds for this iteration algorithm executed in iteration 7 - 0.096 seconds for the execution of the algorithm + 0.044 seconds for the execution of the algorithm iteration 7 completed - 0.097 seconds for this iteration + 0.044 seconds for this iteration algorithm executed in iteration 8 - 0.097 seconds for the execution of the algorithm + 0.041 seconds for the execution of the algorithm iteration 8 completed - 0.097 seconds for this iteration + 0.041 seconds for this iteration algorithm executed in iteration 9 - 0.112 seconds for the execution of the algorithm + 0.040 seconds for the execution of the algorithm iteration 9 completed - 0.112 seconds for this iteration + 0.040 seconds for this iteration algorithm executed in iteration 10 - 0.116 seconds for the execution of the algorithm + 0.041 seconds for the execution of the algorithm iteration 10 completed - 0.116 seconds for this iteration + 0.041 seconds for this iteration algorithm executed in iteration 11 - 0.100 seconds for the execution of the algorithm + 0.040 seconds for the execution of the algorithm iteration 11 completed - 0.100 seconds for this iteration + 0.040 seconds for this iteration algorithm executed in iteration 12 - 0.106 seconds for the execution of the algorithm + 0.040 seconds for the execution of the algorithm iteration 12 completed - 0.106 seconds for this iteration + 0.040 seconds for this iteration algorithm executed in iteration 13 - 0.117 seconds for the execution of the algorithm + 0.040 seconds for the execution of the algorithm iteration 13 completed - 0.117 seconds for this iteration + 0.040 seconds for this iteration algorithm executed in iteration 14 - 0.115 seconds for the execution of the algorithm + 0.040 seconds for the execution of the algorithm iteration 14 completed - 0.115 seconds for this iteration + 0.040 seconds for this iteration algorithm executed in iteration 15 - 0.115 seconds for the execution of the algorithm + 0.040 seconds for the execution of the algorithm iteration 15 completed - 0.115 seconds for this iteration + 0.040 seconds for this iteration algorithm executed in iteration 16 - 0.109 seconds for the execution of the algorithm + 0.040 seconds for the execution of the algorithm iteration 16 completed - 0.109 seconds for this iteration + 0.041 seconds for this iteration algorithm executed in iteration 17 - 0.102 seconds for the execution of the algorithm + 0.040 seconds for the execution of the algorithm iteration 17 completed - 0.102 seconds for this iteration + 0.040 seconds for this iteration algorithm executed in iteration 18 - 0.089 seconds for the execution of the algorithm + 0.040 seconds for the execution of the algorithm iteration 18 completed - 0.089 seconds for this iteration + 0.040 seconds for this iteration algorithm executed in iteration 19 - 0.101 seconds for the execution of the algorithm + 0.041 seconds for the execution of the algorithm iteration 19 completed - 0.101 seconds for this iteration + 0.041 seconds for this iteration algorithm executed in iteration 20 - 0.099 seconds for the execution of the algorithm + 0.041 seconds for the execution of the algorithm reconstruction completed after iteration 20 - 0.099 seconds for this iteration - 2.135 seconds for all iterations - 2.183 seconds used for processing command exec + 0.041 seconds for this iteration + 0.836 seconds for all iterations + 0.883 seconds used for processing command exec <*> diff --git a/examples/b13/run b/examples/b13/run new file mode 100755 index 0000000..9634ec9 --- /dev/null +++ b/examples/b13/run @@ -0,0 +1 @@ +snark14 b13.in diff --git a/examples/regression b/examples/regression index 281ebe7..fb4c2f1 100755 --- a/examples/regression +++ b/examples/regression @@ -1,5 +1,8 @@ #!/bin/bash -for i in `seq 1 11`; + +# Exclude examples 7 and 11 as they use random number generator not compatible across platforms + +for i in 1 2 3 4 5 6 8 9 10 12 13; do echo Computing the diff for example b"$i". cd b"$i" diff --git a/examples/run_all b/examples/run_all index e4ed0e4..82da88f 100755 --- a/examples/run_all +++ b/examples/run_all @@ -1,7 +1,7 @@ #!/bin/bash echo "Running all examples. This may take a few minutes." -for i in 1 3 4 5 6 7 8 10 11 20; +for i in 1 3 4 5 6 7 8 10 11 12 13 20; do cd b$i snark14 b${i}.in > b${i}.out -- 2.34.1