Commit ef0356c9 authored by Laurent Belcour's avatar Laurent Belcour
Browse files

Merge

parents 9e836626 15646a4f
......@@ -38,6 +38,10 @@ vars.Add('NLOPT_INC', 'NLOPT include directory')
vars.Add('NLOPT_DIR', 'NLOPT libraries directory')
vars.Add('NLOPT_LIBS', 'NLOPT libraries')
vars.Add('NLOPT_OPT_LIBS', 'NLOPT optional libraries')
vars.Add('MATLAB_INC', 'MATLAB include directory')
vars.Add('MATLAB_DIR', 'MATLAB directory')
vars.Add('MATLAB_LIBS', 'MATLAB libraries')
env = Environment(variables = vars)
......
......@@ -55,3 +55,8 @@ NLOPT_INC = ['#external/build/include']
NLOPT_DIR = ['#external/build/lib']
NLOPT_LIBS = ['nlopt']
NLOPT_OPT_LIBS = []
# MATLAB library and Engine
MATLAB_INC = ['/home/pac/MATLAB/R2013b/extern/include/']
MATLAB_DIR = ['/home/pac/MATLAB/R2013b/bin/glnxa64/']
MATLAB_LIBS = ['']
......@@ -61,6 +61,14 @@ you to install Matlab and to provide a matlab.prf file or to create your
scons configuration file with MATLAB_INC, MATLAB_LIB, and MATLAB_DIR
variables.
The resulting .prf file should however look similar to this on Linux:
\verbatim
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.
<br />
<h3>CGAL</h3>
......
......@@ -34,6 +34,9 @@ vars.Add('NLOPT_INC', 'NLOPT include directory')
vars.Add('NLOPT_DIR', 'NLOPT libraries directory')
vars.Add('NLOPT_LIBS', 'NLOPT libraries')
vars.Add('NLOPT_OPT_LIBS', 'NLOPT optional libraries')
vars.Add('MATLAB_INC', 'MATLAB include directory')
vars.Add('MATLAB_DIR', 'MATLAB directory')
vars.Add('MATLAB_LIBS', 'MATLAB libraries')
env = Environment(variables = vars)
......
......@@ -22,6 +22,8 @@ SConscript('nonlinear_shadowing_smith/SConscript')
SConscript('rational_fitter_eigen/SConscript')
SConscript('rational_fitter_quadprog/SConscript')
SConscript('rational_fitter_parallel/SConscript')
SConscript('rational_fitter_matlab/SConscript')
# Building rational functions
SConscript('rational_function_legendre/SConscript')
......@@ -29,6 +31,7 @@ SConscript('rational_function_chebychev/SConscript')
SConscript('rational_function_chebychev_opt/SConscript')
SConscript('rational_function_cosine/SConscript')
# Building retro functions
SConscript('nonlinear_function_retroblinn/SConscript')
SConscript('nonlinear_function_retroyoo/SConscript')
......
......@@ -14,6 +14,8 @@
#include <cmath>
#include <string>
#include <list>
#include <omp.h>
#include "quadratic_program.h"
......
......@@ -18,7 +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/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="/tmp/yellow_slice_inc30.dat" />-->
<output name="./results/3d/retro/half/3M_jaune_rat.brdf" />
......@@ -28,17 +31,19 @@
<!-- 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="60" />
<!--<plugin type="fitter" name="rational_fitter_matlab" />-->
<parameter name="min-np" value="30" />
<!--<parameter name="min-np" value="53" />-->
<parameter name="min-nq" value="60" />
<parameter name="np" value="200" />
<parameter name="nq" value="200" />
<parameter name='np-step' value='5' />
<parameter name="min-nq" value="30" />
<parameter name="np" value="1000" />
<parameter name="nq" value="1000" />
<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="" />-->
<!-- <parameter name="dt-max" value="" /> -->
<parameter name="dt-positive" value="" />
<!-- <parameter name="dt-relative" value="" />-->
<parameter name="nb-starting-points" value="1000" />
</action>
......@@ -50,7 +55,9 @@
<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/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>
</alta>
This is the repository where Pac tests the Rational Function Fitting
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