Commit 3d964716 authored by Laurent Belcour's avatar Laurent Belcour
Browse files

Fixing the function export precision issue for rational BRDFs.

Updating scripts for the retro paper
parent 5173bb9c
......@@ -99,7 +99,7 @@ void rational_function_1d::update(const vec& in_a,
a.resize(in_a.size()) ;
b.resize(in_b.size()) ;
//#define NORMALIZE
#define NORMALIZE
#ifdef NORMALIZE
const double b0 = (std::abs(in_b[0]) > 1.0E-16) ? in_b[0] : 1.0;
......@@ -537,6 +537,8 @@ bool rational_function::load(std::istream& in)
void rational_function::save_call(std::ostream& out, const arguments& args) const
{
out.precision(64);
out << std::scientific;
out << "#FUNC rational_function" << std::endl;
out << "#NP " << np << std::endl ;
out << "#NQ " << nq << std::endl ;
......
......@@ -21,7 +21,8 @@ set output "yellow_retro_laf.tex"
plot "../papers/retro/mesures/original/3M_jaune/3d/633nm/Fichiers definitifs/densify_helmholtz/3M_jaune_3D+3DS+3DR__BRDF_min_retro_lobe_dense.alta" using (180/pi*$2):($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "Yellow cloth data", "./results/3d/retro/half/3M_jaune_laf.dat" using (180/pi*$2):($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "Lafortune fit"
set ylabel "BRDF x cosine"
set size square
# output rational fits
set output "yellow_retro_rat.tex"
plot "../papers/retro/mesures/original/3M_jaune/3d/633nm/Fichiers definitifs/densify_helmholtz/3M_jaune_3D+3DS+3DR__BRDF_min_retro_lobe_dense.alta" using (180/pi*$2):($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "Yellow cloth data", "./results/3d/retro/half/3M_jaune_rat.dat" using (180/pi*$2):($3 > -0.01 && $3 < 0.05 ? $3 : 1/0) title "rational interpolation"
plot "../papers/retro/mesures/original/3M_jaune/3d/633nm/Fichiers definitifs/densify_helmholtz/3M_jaune_3D+3DS+3DR_dense__nbsgrid_162.alta" using (180/pi*$2):($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "Yellow cloth data", "./results/3d/retro/half/3M_jaune_rat.dat" using (180/pi*$2):($3 > -0.01 && $3 < 0.05 ? $3 : 1/0) title "rational interpolation"
......@@ -36,6 +36,7 @@
<parameter name='np-step' value='5' />
<parameter name="dt" value="0.5" />
<parameter name="dt-max" value="" />
<parameter name="dt-positive" value="" />
<!--<parameter name="dt-relative" value="" />-->
......
......@@ -20,7 +20,8 @@ set output "gray_retro_laf.tex"
plot "../papers/retro/mesures/original/Bande_fluo_grise/3d/633nm/Fichiers\ definitifs/densityHelmholtz/Bande_grise_3D+3DS+3DR__BRDF_min_retro_lobe_dense.alta" using (180/pi*$2):($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "Gray cloth data", "./results/3d/retro/half/Bande_fluo_laf.dat" using (180/pi*$2):($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "Lafortune fit"
set ylabel "BRDF x cosine"
set size square
# output Lafotune fit
set output "gray_retro_rat.tex"
plot "../papers/retro/mesures/original/Bande_fluo_grise/3d/633nm/Fichiers\ definitifs/densityHelmholtz/Bande_grise_3D+3DS+3DR__BRDF_min_retro_lobe_dense.alta" using (180/pi*$2):($3 > -0.01 && $3 < 0.05 ? $4 : 1/0) title "Gray cloth data", "./results/3d/retro/half/Bande_fluo_raf.dat" using (180/pi*$2):($3 > -0.01 && $3 < 0.05 ? $4 : 1/0) title "Rational interpolation"
plot "../papers/retro/mesures/original/Bande_fluo_grise/3d/633nm/Fichiers\ definitifs/densityHelmholtz/Bande_grise_3D_dense__nbsgrid_162.alta" using (180/pi*$2):($3 > -0.01 && $3 < 0.05 ? $4 : 1/0) title "Gray cloth data", "./results/3d/retro/half/Bande_fluo_raf.dat" using (180/pi*$2):($3 > -0.01 && $3 < 0.05 ? $4 : 1/0) title "Rational interpolation"
......@@ -20,7 +20,8 @@ set output "orange_retro_laf.tex"
plot "../papers/retro/mesures/original/Bande_orange/3d/633nm/Fichiers_definitifs/densify_helmholtz/Bande_orange_3D__BRDF_min_retro_lobe_dense.alta" using (180/pi*$2):($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "Orange cloth data", "./results/3d/retro/half/Bande_orange_laf.dat" using (180/pi*$2):($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "Lafortune fit"
set ylabel "BRDF x cosine"
set size square
# output Rational fit
set output "orange_retro_rat.tex"
plot "../papers/retro/mesures/original/Bande_orange/3d/633nm/Fichiers_definitifs/densify_helmholtz/Bande_orange_3D__BRDF_min_retro_lobe_dense.alta" using (180/pi*$2):($3 > -0.01 && $3 < 0.05 ? $4 : 1/0) title "Orange cloth data", "./results/3d/retro/half/Bande_orange_rat.dat" using (180/pi*$2):($3 > -0.01 && $3 < 0.05 ? $4 : 1/0) title "Rational interpolation"
plot "../papers/retro/mesures/original/Bande_orange/3d/633nm/Fichiers_definitifs/densify_helmholtz/Bande_orange_3D_dense__nbsgrid_162.alta" using (180/pi*$2):($3 > -0.01 && $3 < 0.05 ? $4 : 1/0) title "Orange cloth data", "./results/3d/retro/half/Bande_orange_rat.dat" using (180/pi*$2):($3 > -0.01 && $3 < 0.05 ? $4 : 1/0) title "Rational interpolation"
......@@ -5,7 +5,7 @@
./scripts/xml_cmd.py ./xml/3d/retro/half/3M_jaune_laf.xml
./scripts/xml_cmd.py ./xml/3d/retro/half/3M_jaune_beck.xml
./scripts/xml_cmd.py ./xml/3d/retro/half/3M_jaune_blinn.xml
#./scripts/xml_cmd.py ./xml/3d/retro/half/3M_jaune_rat.xml
./scripts/xml_cmd.py ./xml/3d/retro/half/3M_jaune_rat.xml
./scripts/xml_cmd.py ./xml/3d/retro/half/Bande_fluo_abc.xml
./scripts/xml_cmd.py ./xml/3d/retro/half/Bande_fluo_laf.xml
......
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