Commit 11112f85 authored by Laurent Belcour's avatar Laurent Belcour
Browse files

Updating all the figures and adding the rational interpolation.

parent ef0356c9
......@@ -10,7 +10,7 @@ import os, sys
## Compilators build flags
##
CXX = 'g++'
CCFLAGS = ['-O3', '-g', '-Wall', '-m64']
CCFLAGS = ['-O3', '-Wall', '-m64']
LINKFLAGS = []
......
......@@ -67,7 +67,7 @@ INCLUDEPATH += /usr/local/MATLAB/$VERSION/extern/include
LIBS += -L/usr/local/MATLAB/$VERSION/bin/glnxa64 \
-leng -lmx -lmat
\endverbatim
On Windows or MacOS, the paths to include and libraries are different, but the dynamic libraries links remains. Also, note that the Matlab binary should be accessible from PATH during ALTA execution.
On Windows or MacOS, the paths to include and libraries are different, but the dynamic libraries links remain. Also, note that the Matlab binary should be accessible from PATH during ALTA execution.
<br />
......
......@@ -25,4 +25,4 @@ 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_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"
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"
......@@ -18,8 +18,10 @@
<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="../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" />
<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, -2,-2]" />
<parameter name="max" value="[0.9, 2, 2]" />
<!--<input name="/tmp/yellow_slice_inc30.dat" />-->
......@@ -33,7 +35,7 @@
<plugin type="fitter" name="rational_fitter_parallel" />
<!--<plugin type="fitter" name="rational_fitter_matlab" />-->
<parameter name="min-np" value="30" />
<parameter name="min-np" value="50" />
<!--<parameter name="min-np" value="53" />-->
<parameter name="min-nq" value="30" />
<parameter name="np" value="1000" />
......@@ -55,8 +57,8 @@
<input name="./results/3d/retro/half/3M_jaune_rat.brdf" />
<output name="./results/3d/retro/half/3M_jaune_rat.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="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" />
<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" />-->
<!--<parameter name="data" value="/tmp/yellow_slice_inc30.dat" />-->
</action>
......
......@@ -24,4 +24,4 @@ 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_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"
plot "../papers/retro/mesures/original/Bande_fluo_grise/3d/633nm/Fichiers\ definitifs/densityHelmholtz/Bande_grise_3D+3DS+3DR_dense__nbsgrid_162.alta" using (180/pi*$2):($2 > 0.0 && $3 > -0.01 && $3 < 0.01 ? $4 : 1/0) title "Gray cloth data", "./results/3d/retro/half/Bande_fluo_rat.dat" using (180/pi*$2):($2 > 0.0 && $3 > -0.01 && $3 < 0.01 ? $4 : 1/0) title "Rational interpolation"
......@@ -24,4 +24,4 @@ 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"
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"
......@@ -19,8 +19,8 @@
<!-- Input arguments of the action -->
<input name="../papers/retro/mesures/original/Bande_orange/3d/633nm/Fichiers_definitifs/densify_helmholtz/Bande_orange_3D_dense__nbsgrid_162.alta" />
<parameter name="min" value="[0, 0,-2]" />
<parameter name="max" value="[2, 2, 2]" />
<parameter name="min" value="[0, 0,-2]" />
<parameter name="max" value="[0.9, 2, 2]" />
<parameter name="dt" value="0.5" />
<!--<parameter name="dt-relative" value="" />-->
<parameter name="dt-positive" value="" />
......@@ -34,9 +34,9 @@
<!-- Define the ftting procedure to use -->
<plugin type="fitter" name="rational_fitter_parallel" />
<parameter name="min-np" value="45" />
<parameter name="min-np" value="56" />
<parameter name="np" value="100" />
<parameter name="np-step" value="5" />
<parameter name="np-step" value="1" />
<parameter name="nb-starting-points" value="1000" />
</action>
......@@ -63,8 +63,8 @@
<!--- Input data file -->
<input name="../papers/retro/mesures/original/Bande_orange/3d/633nm/Fichiers_definitifs/densify_helmholtz/Bande_orange_3D_dense__nbsgrid_162.alta" />
<parameter name="min" value="[0, 0,-2]" />
<parameter name="max" value="[2, 2, 2]" />
<parameter name="min" value="[0, 0,-2]" />
<parameter name="max" value="[0.9, 2, 2]" />
<!-- Output data file -->
<output name="/tmp/Bande_orange_back.dat" />
......@@ -117,9 +117,11 @@
<!-- Input arguments of the action -->
<input name="../papers/retro/mesures/original/Bande_orange/3d/633nm/Fichiers_definitifs/densify_helmholtz/Bande_orange_3D_dense__nbsgrid_162.alta" />
<parameter name="dt" value="0.1" />
<parameter name="dt" value="0.5" />
<parameter name="data-positive" value="" />
<!--<parameter name="dt-relative" value="" />-->
<parameter name="min" value="[0, 0,-2]" />
<parameter name="max" value="[0.9, 2, 2]" />
<!-- Output arguments of the action -->
<output name="./results/3d/retro/half/Bande_orange_rat.brdf" />
......
......@@ -11,13 +11,13 @@
./scripts/xml_cmd.py ./xml/3d/retro/half/Bande_fluo_laf.xml
./scripts/xml_cmd.py ./xml/3d/retro/half/Bande_fluo_beck.xml
./scripts/xml_cmd.py ./xml/3d/retro/half/Bande_fluo_blinn.xml
#./scripts/xml_cmd.py ./xml/3d/retro/half/Bande_fluo_rat.xml
./scripts/xml_cmd.py ./xml/3d/retro/half/Bande_fluo_rat.xml
./scripts/xml_cmd.py ./xml/3d/retro/half/Bande_orange_abc.xml
./scripts/xml_cmd.py ./xml/3d/retro/half/Bande_orange_laf.xml
./scripts/xml_cmd.py ./xml/3d/retro/half/Bande_orange_beck.xml
./scripts/xml_cmd.py ./xml/3d/retro/half/Bande_orange_blinn.xml
#./scripts/xml_cmd.py ./xml/3d/retro/half/Bande_orange_rat.xml
./scripts/xml_cmd.py ./xml/3d/retro/half/Bande_orange_rat.xml
# Generate latex files with figures
gnuplot ./xml/3d/retro/half/3M_jaune.gnuplot
......
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