Commit 78e2196d authored by Laurent Belcour's avatar Laurent Belcour

Adding Kirby2 in unitary test. Not getting the same polynomial

parent 18828667
......@@ -6,12 +6,13 @@ if [ $use_cheby -eq 1 ]; then
function_append="_cheby"
fi
use_relative=0
use_relative=1
if [ $use_relative -eq 1 ]; then
relative="--dt-relative"
fi
test_generated=1
test_generated=0
test_kirby=1
test_alta=0
## Test with generated data
......@@ -22,17 +23,30 @@ for i in `seq $min_test $max_test`
do
./build/generate_data --f $i
mv input.gnuplot input_$i.gnuplot
./build/data2brdf --input input_$i.gnuplot --output output${function_append}.rational $function --fitter /build/librational_fitter_quadprog.so --np 20 --nq 20 --dt 0.05 $relative > output${function_append}_$i.out
./build/data2brdf --input input_$i.gnuplot --output output${function_append}.rational $function --fitter /build/librational_fitter_quadprog.so --np 20 --nq 20 --dt 0.01 $relative > output${function_append}_$i.out
if [ $? -eq 0 ]; then
echo "Test number $i passed"
./build/brdf2gnuplot --input output${function_append}.rational --data input_$i.gnuplot --output output_$i.gnuplot > /dev/null
./build/brdf2gnuplot --input output${function_append}.rational $function --data input_$i.gnuplot --output output_$i.gnuplot > /dev/null
else
echo "Test number $i failed"
fi
done
fi
## Test with Kirby2 dataset
##
if [ $test_kirby -eq 1 ]; then
./build/data2brdf --input ../data/1d/Kirby2/Kirby2.dat --output Kirby2${function_append}.rational $function --fitter /build/librational_fitter_parallel.so --min-np 1 --np 100 --dt 0.01 $relative
if [ $? -eq 0 ]; then
echo "Test Kirby2 passed"
./build/brdf2gnuplot --input Kirby2${function_append}.rational $function --data ../data/1d/Kirby2/Kirby2.dat --output Kirby2.gnuplot > /dev/null
else
echo "Test Kirby2 failed"
fi
fi
## Test with ALTA internal data
##
if [ $test_alta -eq 1 ]; then
......@@ -40,7 +54,7 @@ if [ $test_alta -eq 1 ]; then
if [ $? -eq 0 ]; then
echo "Test beige matusik passed"
./build/brdf2gnuplot --input beige${function_append}.rational --data ../data/2d/matusik_merl/beige-fabric-double-cc-cos-th-td-90deg.dat --output output_beige.gnuplot > beige.out
./build/brdf2gnuplot --input beige${function_append}.rational $function --data ../data/2d/matusik_merl/beige-fabric-double-cc-cos-th-td-90deg.dat --output output_beige.gnuplot > beige.out
else
echo "Test beige matusik failed"
fi
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment