Attention une mise à jour du service Gitlab va être effectuée le mardi 30 novembre entre 17h30 et 18h00. Cette mise à jour va générer une interruption du service dont nous ne maîtrisons pas complètement la durée mais qui ne devrait pas excéder quelques minutes. Cette mise à jour intermédiaire en version 14.0.12 nous permettra de rapidement pouvoir mettre à votre disposition une version plus récente.

Commit 8af6d07f authored by Laurent Belcour's avatar Laurent Belcour
Browse files

Updating building scripts

parent 29e26958
......@@ -80,5 +80,5 @@ if not env.GetOption('help'):
external = env.SConscript('external/SConscript')
sources = env.SConscript('sources/SConscript')
env.Depends(sources, external)
env.Requires(sources, external)
#end
......@@ -2,5 +2,5 @@ core = SConscript('core/SConscript')
plugins = SConscript('plugins/SConscript')
softs = SConscript('softs/SConscript')
Depends(softs, core)
Depends(plugins, core)
Requires(softs, core)
Requires(plugins, core)
......@@ -3,8 +3,6 @@ import sys
Import('env')
env = env.Clone()
#env = Environment()
#env.Append(CPPPATH = ['../../external/build/include'])
# Library sources
sources = ['common.cpp',
......
......@@ -10,6 +10,7 @@ SUBDIRS = \
# rational_fitter_dca \
rational_function_chebychev \
rational_function_legendre \
rational_function_cosine \
nonlinear_fitter_eigen \
nonlinear_fitter_ceres \
# nonlinear_fitter_ipopt \
......
......@@ -12,8 +12,3 @@ SOURCES = rational_function.cpp
LIBS += -L../../build \
-lcore
#QMAKE_CXXFLAGS += -frounding-math \
# -fPIC \
# -g
......@@ -15,3 +15,7 @@ plot "../papers/retro/mesures/original/3M_jaune/3d/633nm/Fichiers definitifs/den
# 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"
# 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 1:($2 > 0.0 && $2 < 0.005 ? $3 : 1/0) title "rational interpolation"
<?xml version="1.0"?>
<alta>
<!-- This script file compute the fitting of the retro-reflecting materials
present in the ALTA library. This script file should be executed in
the sources directory of repository as all directories are relative.
It is also necessary to create a results/3d/retro directory to store
the resulting fits and exports to BRDF-explorer and matlab.
-->
<configuration>
<parameter name="lib-dir" value="./build" />
</configuration>
<!-- Extract only one slice of the BRDF data
-->
<action name="data2data">
<!-- 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_dense.alta" />
<output name="/tmp/yellow_slice_inc30.dat" />
<!-- Parameters -->
<parameter name="param" value="ISOTROPIC_TV_PROJ_DPHI" />
<parameter name="max" value="[0.3, 2, 2]" />
</action>
<!-- Fitting the lobe using a back parametrization:
The ABC model uses the dot product between the back and the
normal vectors.
-->
<action name="data2brdf">
<!-- Input and output arguments of the action -->
<input name="/tmp/yellow_slice_inc30.dat" />
<output name="./results/3d/retro/half/3M_jaune_rat.brdf" />
<!-- Define the function to use -->
<function name="rational_function_cosine" />
<!-- Define the ftting procedure to use -->
<!--<plugin type="fitter" name="rational_fitter_quadprog" />-->
<plugin type="fitter" name="rational_fitter_parallel" />
<parameter name="min-np" value="53" />
<parameter name="min-nq" value="10" />
<parameter name="np" value="100" />
<parameter name="nq" value="100" />
<parameter name="dt" value="0.5" />
<parameter name="data-positive" value="" />
<!--<parameter name="dt-relative" value="" />-->
</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" />
<parameter name="data" value="/tmp/yellow_slice_inc30.dat" />
</action>
</alta>
......@@ -5,6 +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/Bande_fluo_abc.xml
./scripts/xml_cmd.py ./xml/3d/retro/half/Bande_fluo_laf.xml
......@@ -27,6 +28,7 @@ pdflatex yellow_retro_abc.tex
pdflatex yellow_retro_laf.tex
pdflatex yellow_retro_beck.tex
pdflatex yellow_retro_blinn.tex
pdflatex yellow_retro_rat.tex
pdflatex gray_retro_abc.tex
pdflatex gray_retro_laf.tex
......
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