Attention une mise à jour du serveur va être effectuée le lundi 17 mai entre 13h et 13h30. Cette mise à jour va générer une interruption du service de quelques minutes.

Commit 963d5573 authored by Laurent Belcour's avatar Laurent Belcour

Updating comparison.

parent c163d25e
......@@ -24,7 +24,7 @@ set ylabel "BRDF x cosine"
# output rational fits
set term unknown
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):($2 > 0.0 && $3 > -0.01 && $3 < 0.01 ? $4 : 1/0) title "Yellow cloth data", "./results/3d/retro/half/3M_jaune_rat.dat" using (180/pi*$2):($2 > 0.0 && $3 > -0.01 && $3 < 0.01) ? $4 : 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):($2 > 0.0 && $3 > -0.01 && $3 < 0.01 ? $4 : 1/0) title "Yellow cloth data", "./results/3d/retro/half/3M_jaune_rat_TK.dat" using (180/pi*$2):($2 > 0.0 && $3 > -0.01 && $3 < 0.01) ? $4 : 1/0 title "rational interpolation"
set term epslatex standalone color font 8
set output "yellow_retro_rat.tex"
......
......@@ -32,7 +32,7 @@
<!-- Parameters -->
<parameter name="min" value="[0.1, -2, -2]" />
<parameter name="max" value="[1.7, 2, 2]" />
<parameter name="max" value="[0.5, 2, 2]" />
</action>
<action name="data2brdf">
......@@ -93,7 +93,7 @@
<!-- Parameters -->
<parameter name="min" value="[0.1, -2, -2]" />
<parameter name="max" value="[1.7, 2, 2]" />
<parameter name="max" value="[0.5, 2, 2]" />
</action>
<action name="data2brdf">
......
......@@ -18,7 +18,7 @@
<action name="data2brdf">
<!-- Input and output arguments of the action -->
<input name="../papers/retro/mesures/original/3M_jaune/3d/633nm/Fichiers\ definitifs/densify_helmholtz/3M_jaune_3D+3DS+3DR__BRDF_min_retro_lobe.alta" />
<input name="../papers/retro/mesures/original/3M_jaune/3d/633nm/Fichiers\ definitifs/densify_helmholtz/3M_jaune_3D+3DS+3DR__BRDF_min_retro_lobe_dense.alta" />
<output name="./results/3d/retro/half/3M_jaune_laf.brdf" />
<!-- Define the function to use -->
......@@ -31,7 +31,7 @@
<!-- Parameters -->
<parameter name="min" value="[0.1, -2, -2]" />
<parameter name="max" value="[0.9, 2, 2]" />
<parameter name="max" value="[1.7, 2, 2]" />
</action>
<!-- Export the fit -->
......
......@@ -15,21 +15,94 @@
The ABC model uses the dot product between the back and the
normal vectors.
-->
<action name="data2data">
<!-- Input arguments of the action -->
<input name="../papers/retro/mesures/original/3M_jaune/3d/633nm/Fichiers\ definitifs/densify_helmholtz/3M_jaune_3D+3DS+3DR_dense__nbsgrid_162.alta" />
<parameter name="min" value="[0, 0,-2]" />
<parameter name="max" value="[1.5, 2, 2]" />
<!-- Output arguments of the action -->
<output name="/tmp/3M_jaune_3D+3DS+3DR_dense__nbsgrid_162_TK.alta" />
<parameter name="param" value="SCHLICK_TL_TK_PROJ_DPHI" />
</action>
<action name="data2brdf">
<!-- Input and output arguments of the action -->
<input name="/tmp/3M_jaune_3D+3DS+3DR_dense__nbsgrid_162_TK.alta" />
<!--<input name="/tmp/yellow_slice_inc30.dat" />-->
<output name="./results/3d/retro/half/3M_jaune_rat_TK.brdf" />
<!-- Define the function to use -->
<function name="rational_function_cosine" />
<!--<function name="rational_function_chebychev" />-->
<!--<function name="rational_function_chebychev_opt" />-->
<!-- Define the ftting procedure to use -->
<!--<plugin type="fitter" name="rational_fitter_quadprog" />-->
<plugin type="fitter" name="rational_fitter_parallel" />
<!--<plugin type="fitter" name="rational_fitter_matlab" />-->
<parameter name="min-np" value="47" />
<!--<parameter name="min-np" value="53" />-->
<parameter name="min-nq" value="30" />
<parameter name="np" value="1000" />
<parameter name="nq" value="1000" />
<parameter name='np-step' value='1' />
<parameter name="dt" value="0.5" />
<!-- <parameter name="dt-max" value="" /> -->
<parameter name="dt-positive" value="" />
<!-- <parameter name="dt-relative" value="" />-->
<parameter name="nb-starting-points" value="10000" />
</action>
<!-- Export the fit -->
<action name="brdf2gnuplot">
<!-- Input and output arguments of the action -->
<input name="./results/3d/retro/half/3M_jaune_rat_TK.brdf" />
<output name="./results/3d/retro/half/3M_jaune_rat_TK.dat" />
<parameter name="data" value="../papers/retro/mesures/original/3M_jaune/3d/633nm/Fichiers\ definitifs/densify_helmholtz/3M_jaune_3D+3DS+3DR_dense__nbsgrid_162.alta" />
<parameter name="min" value="[0, 0,-2]" />
<parameter name="max" value="[1.5, 2, 2]" />
</action>
<!-- Fitting the lobe using a light-view parametrization:
The ABC model uses the dot product between the back and the
normal vectors.
-->
<action name="data2data">
<!-- Input arguments of the action -->
<input name="../papers/retro/mesures/original/3M_jaune/3d/633nm/Fichiers\ definitifs/densify_helmholtz/3M_jaune_3D+3DS+3DR_dense__nbsgrid_162.alta" />
<parameter name="min" value="[0, 0,-2]" />
<parameter name="max" value="[1.5, 2, 2]" />
<!-- Output arguments of the action -->
<output name="/tmp/3M_jaune_3D+3DS+3DR_dense__nbsgrid_162_TVL.alta" />
<parameter name="param" value="SCHLICK_TL_TVL_PROJ_DPHI" />
</action>
<action name="data2brdf">
<!-- Input and output arguments of the action -->
<input name="../papers/retro/mesures/original/3M_jaune/3d/633nm/Fichiers\ definitifs/densify_helmholtz/3M_jaune_3D+3DS+3DR_dense__nbsgrid_162.alta" />
<input name="/tmp/3M_jaune_3D+3DS+3DR_dense__nbsgrid_162_TVL.alta" />
<!--<input name="../papers/retro/mesures/original/3M_jaune/3d/633nm/Fichiers\ definitifs/densify_helmholtz/3M_jaune_3D+3DS+3DR_dense__nbsgrid_162.alta" />-->
<!--<input name="../papers/retro/mesures/original/3M_jaune/3d/633nm/Fichiers\ definitifs/3M_jaune_iso_tvproj_brdfcc_rescaled_vs_relative_min_0.4_max_0.9.alta" />-->
<parameter name="min" value="[0, 0,-2]" />
<parameter name="max" value="[1.5, 2, 2]" />
<!--<input name="/tmp/yellow_slice_inc30.dat" />-->
<output name="./results/3d/retro/half/3M_jaune_rat.brdf" />
<output name="./results/3d/retro/half/3M_jaune_rat_TVL.brdf" />
<!-- Define the function to use -->
<!--<function name="rational_function_cosine" />-->
<function name="rational_function_chebychev" />
<function name="rational_function_cosine" />
<!--<function name="rational_function_chebychev" />-->
<!--<function name="rational_function_chebychev_opt" />-->
<!-- Define the ftting procedure to use -->
......@@ -37,31 +110,32 @@
<plugin type="fitter" name="rational_fitter_parallel" />
<!--<plugin type="fitter" name="rational_fitter_matlab" />-->
<parameter name="min-np" value="50" />
<parameter name="min-np" value="47" />
<!--<parameter name="min-np" value="53" />-->
<parameter name="min-nq" value="30" />
<parameter name="np" value="1000" />
<parameter name="nq" value="1000" />
<parameter name='np-step' value='5' />
<parameter name='np-step' value='1' />
<parameter name="dt" value="0.5" />
<!-- <parameter name="dt-max" value="" /> -->
<parameter name="dt-positive" value="" />
<!-- <parameter name="dt-relative" value="" />-->
<parameter name="nb-starting-points" value="1000" />
<parameter name="nb-starting-points" value="10000" />
</action>
<!-- Export the fit -->
<action name="brdf2gnuplot">
<!-- Input and output arguments of the action -->
<input name="./results/3d/retro/half/3M_jaune_rat.brdf" />
<output name="./results/3d/retro/half/3M_jaune_rat.dat" />
<input name="./results/3d/retro/half/3M_jaune_rat_TVL.brdf" />
<parameter name="data" value="../papers/retro/mesures/original/3M_jaune/3d/633nm/Fichiers\ definitifs/densify_helmholtz/3M_jaune_3D+3DS+3DR_dense__nbsgrid_162.alta" />
<!--<parameter name="data" value="../papers/retro/mesures/original/3M_jaune/3d/633nm/Fichiers\ definitifs/bande_orange_iso_tvproj_brdfcc_rescaled_vs_relative_min_0.4_max_0.9.alta" />-->
<!-- Output arguments of the action -->
<output name="./results/3d/retro/half/3M_jaune_rat_TVL.dat" />
<!--<parameter name="data" value="/tmp/yellow_slice_inc30.dat" />-->
<parameter name="data" value="../papers/retro/mesures/original/3M_jaune/3d/633nm/Fichiers\ definitifs/densify_helmholtz/3M_jaune_3D+3DS+3DR_dense__nbsgrid_162.alta" />
<parameter name="min" value="[0, 0,-2]" />
<parameter name="max" value="[1.5, 2, 2]" />
</action>
</alta>
......@@ -26,6 +26,6 @@ set term unknown
plot "../papers/retro/mesures/original/Bande_orange/3d/633nm/Fichiers_definitifs/densify_helmholtz/Bande_orange_3D_dense__nbsgrid_162.alta" using (180/pi*$2):($2 > 0.0 && $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):($2 > 0.0 && $3 > -0.01 && $3 < 0.05 ? $4 : 1/0) title "Rational interpolation"
set term epslatex standalone color font 8
set output "gray_retro_rat.tex"
set output "orange_retro_rat.tex"
set yrange [0:GPVAL_Y_MAX]
replot
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