Commit e23239c2 authored by PACANOWSKI Romain's avatar PACANOWSKI Romain
Browse files

Merge

parents 28b970c7 3d964716
......@@ -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 ;
......
......@@ -167,6 +167,11 @@ void vertical_segment::load(const std::string& filename, const arguments& args)
v[dimX() + dimY()+i] = v[dimX() + i] * (1.0 + min_dt) ;
v[dimX() + 2*dimY()+i] = v[dimX() + i] * (1.0 + max_dt) ;
}
else if(args.is_defined("dt-max"))
{
v[dimX() + dimY()+i] = v[dimX() + i] + std::max(v[dimX() + i] * min_dt, min_dt);
v[dimX() + 2*dimY()+i] = v[dimX() + i] + std::max(v[dimX() + i] * max_dt, max_dt);
}
else
{
v[dimX() + dimY()+i] = v[dimX() + i] + min_dt ;
......
......@@ -34,7 +34,9 @@
* option <b>\-\-dt-relative</b> is not set, this size is absolute: \f$ [x,
* x - dt, x + dt] \f$. If the <b>\-\-dt-relative</b> option is set, the
* vertical segment size is relative to the middle point value \f$ x \f$:
* \f$ [x, x (1 - dt), x (1 + dt)] \f$.
* \f$ [x, x (1 - dt), x (1 + dt)] \f$. You can specify the vertical
* segment to be equal to the max of the relative and absolute sizes
* using the <b>\-\-dt-max</b> option.
* <li><b>\-\-data-positive</b> for the vertical segment to stay in the
* positive region. The negative values are replaced by zeros.
* </ul>
......
set term epslatex standalone color font 8
set xlabel "incidence elevation (in degrees)"
set ylabel "BRDF"
set key on inside left
# output ABC fits
set output "yellow_retro_abc.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 2:($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "Yellow cloth data", "./results/3d/retro/half/3M_jaune_abc_retro.dat" using 2:($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "retro ABC fit", "./results/3d/retro/half/3M_jaune_abc_back.dat" using 2:($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "back ABC fit"
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_abc_retro.dat" using (180/pi*$2):($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "retro ABC fit", "./results/3d/retro/half/3M_jaune_abc_back.dat" using (180/pi*$2):($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "back ABC fit"
# output Beckmann fits
set output "yellow_retro_beck.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 2:($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "Yellow cloth data", "./results/3d/retro/half/3M_jaune_beck_retro.dat" using 2:($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "retro Beckmann fit", "./results/3d/retro/half/3M_jaune_beck_back.dat" using 2:($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "back Beckmann fit"
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_beck_retro.dat" using (180/pi*$2):($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "retro Beckmann fit", "./results/3d/retro/half/3M_jaune_beck_back.dat" using (180/pi*$2):($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "back Beckmann fit"
# output Blinn fits
set output "yellow_retro_blinn.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 2:($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "Yellow cloth data", "./results/3d/retro/half/3M_jaune_blinn_retro.dat" using 2:($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "retro Blinn fit", "./results/3d/retro/half/3M_jaune_blinn_back.dat" using 2:($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "back Blinn fit"
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_blinn_retro.dat" using (180/pi*$2):($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "retro Blinn fit", "./results/3d/retro/half/3M_jaune_blinn_back.dat" using (180/pi*$2):($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "back Blinn fit"
# output Lafotune fit
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 2:($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "Yellow cloth data", "./results/3d/retro/half/3M_jaune_laf.dat" using 2:($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "Lafortune fit"
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 2:($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "Yellow cloth data", "./results/3d/retro/half/3M_jaune_rat.dat" using 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="" />-->
......
set term epslatex standalone color font 8
set xlabel "incidence elevation (in degrees)"
set ylabel "BRDF"
# output ABC fits
set output "gray_retro_abc.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 2:($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "Gray cloth data", "./results/3d/retro/half/Bande_fluo_abc_retro.dat" using 2:($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "retro ABC fit", "./results/3d/retro/half/Bande_fluo_abc_back.dat" using 2:($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "back ABC fit"
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_abc_retro.dat" using (180/pi*$2):($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "retro ABC fit", "./results/3d/retro/half/Bande_fluo_abc_back.dat" using (180/pi*$2):($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "back ABC fit"
# output Beckmann fits
set output "gray_retro_beck.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 2:($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "Gray cloth data", "./results/3d/retro/half/Bande_fluo_beck_retro.dat" using 2:($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "retro Beckmann fit", "./results/3d/retro/half/Bande_fluo_beck_back.dat" using 2:($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "back Beckmann fit"
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_beck_retro.dat" using (180/pi*$2):($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "retro Beckmann fit", "./results/3d/retro/half/Bande_fluo_beck_back.dat" using (180/pi*$2):($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "back Beckmann fit"
# output Blinn fits
set output "gray_retro_blinn.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 2:($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "Gray cloth data", "./results/3d/retro/half/Bande_fluo_blinn_retro.dat" using 2:($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "retro Blinn fit", "./results/3d/retro/half/Bande_fluo_blinn_back.dat" using 2:($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "back Blinn fit"
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_blinn_retro.dat" using (180/pi*$2):($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "retro Blinn fit", "./results/3d/retro/half/Bande_fluo_blinn_back.dat" using (180/pi*$2):($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "back Blinn fit"
# output Lafotune fit
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 2:($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "Gray cloth data", "./results/3d/retro/half/Bande_fluo_laf.dat" using 2:($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "Lafortune fit"
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 2:($3 > -0.01 && $3 < 0.05 ? $4 : 1/0) title "Gray cloth data", "./results/3d/retro/half/Bande_fluo_raf.dat" using 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"
set term epslatex standalone color font 8
set xlabel "incidence elevation (in degrees)"
set ylabel "BRDF"
# output ABC fits
set output "orange_retro_abc.tex"
plot "../papers/retro/mesures/original/Bande_orange/3d/633nm/Fichiers_definitifs/densify_helmholtz/Bande_orange_3D__BRDF_min_retro_lobe_dense.alta" using 2:($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "Orange cloth data", "./results/3d/retro/half/Bande_orange_abc_retro.dat" using 2:($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "retro ABC fit", "./results/3d/retro/half/Bande_orange_abc_back.dat" using 2:($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "back ABC fit"
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_abc_retro.dat" using (180/pi*$2):($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "retro ABC fit", "./results/3d/retro/half/Bande_orange_abc_back.dat" using (180/pi*$2):($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "back ABC fit"
# output Beckmann fits
set output "orange_retro_beck.tex"
plot "../papers/retro/mesures/original/Bande_orange/3d/633nm/Fichiers_definitifs/densify_helmholtz/Bande_orange_3D__BRDF_min_retro_lobe_dense.alta" using 2:($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "Orange cloth data", "./results/3d/retro/half/Bande_orange_beck_retro.dat" using 2:($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "retro Beckmann fit", "./results/3d/retro/half/Bande_orange_beck_back.dat" using 2:($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "back Beckmann fit"
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_beck_retro.dat" using (180/pi*$2):($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "retro Beckmann fit", "./results/3d/retro/half/Bande_orange_beck_back.dat" using (180/pi*$2):($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "back Beckmann fit"
# output Blinn fits
set output "orange_retro_blinn.tex"
plot "../papers/retro/mesures/original/Bande_orange/3d/633nm/Fichiers_definitifs/densify_helmholtz/Bande_orange_3D__BRDF_min_retro_lobe_dense.alta" using 2:($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "Orange cloth data", "./results/3d/retro/half/Bande_orange_blinn_retro.dat" using 2:($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "retro Blinn fit", "./results/3d/retro/half/Bande_orange_blinn_back.dat" using 2:($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "back Blinn fit"
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_blinn_retro.dat" using (180/pi*$2):($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "retro Blinn fit", "./results/3d/retro/half/Bande_orange_blinn_back.dat" using (180/pi*$2):($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "back Blinn fit"
# output Lafotune fit
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 2:($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "Orange cloth data", "./results/3d/retro/half/Bande_orange_laf.dat" using 2:($3 > 0.0 && $3 < 0.005 ? $4 : 1/0) title "Lafortune fit"
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_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
......@@ -44,3 +44,6 @@ pdflatex orange_retro_blinn.tex
pdflatex orange_retro_rat.tex
rm *-inc.eps *.log *.tex *.aux *-to.pdf
mv yellow_retro_*.pdf ../papers/retro/josa/fits
mv gray_retro_*.pdf ../papers/retro/josa/fits
mv orange_retro*.pdf ../papers/retro/josa/fits
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