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

Changing scripts and makefile to work with scons.

parent 7b3a6569
...@@ -363,9 +363,15 @@ function* plugins_manager::get_function(const arguments& args) ...@@ -363,9 +363,15 @@ function* plugins_manager::get_function(const arguments& args)
} }
nonlinear_function* func_fres = dynamic_cast<nonlinear_function*>(get_function(arguments::create_arguments(n))); nonlinear_function* func_fres = dynamic_cast<nonlinear_function*>(get_function(arguments::create_arguments(n)));
// func_fres->setBase(nl_func); if(func_fres != NULL)
// return func_fres; {
return new product_function(nl_func, func_fres); return new product_function(nl_func, func_fres);
}
else
{
std::cerr << "<<ERROR>> the right part of the product is not a nonlinear function. Will use only the left part." << std::endl;
return func;
}
} }
......
...@@ -3,5 +3,5 @@ env.Append(CPPPATH = ['../../../external/build/include', '../../']) ...@@ -3,5 +3,5 @@ env.Append(CPPPATH = ['../../../external/build/include', '../../'])
env.Append(LIBPATH = ['../../../external/build/lib', '../../build']) env.Append(LIBPATH = ['../../../external/build/lib', '../../build'])
sources = ['fitter.cpp'] sources = ['fitter.cpp']
libs = ['-lceres', '-lglog', '-lgomp', '-lcore'] libs = ['-lceres', '-lglog', '-lgomp', '-lcore', '-llapack']
env.SharedLibrary('../../build/nonlinear_fitter_ceres', sources, LIBS=libs) env.SharedLibrary('../../build/nonlinear_fitter_ceres', sources, LIBS=libs)
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<action name="data2brdf"> <action name="data2brdf">
<!-- Input and output arguments of the action --> <!-- Input and output arguments of the action -->
<input name="../papers/retro/mesures/original/3M_jaune/3d/633nm/Fichiers\ definitifs/3M_jaune_3D+3DS+3DR_BRDF_dense__nbsgrid_162.alta" /> <input name="../papers/retro/mesures/original/3M_jaune/3d/633nm/Fichiers\ definitifs/3M_jaune_3D+3DS+3DR_BRDF_dense__nbsgrid_81.alta" />
<output name="./results/3d/retro/3M_jaune_abc.brdf" /> <output name="./results/3d/retro/3M_jaune_abc.brdf" />
<!-- Define the function to use --> <!-- Define the function to use -->
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
<action name="data2brdf"> <action name="data2brdf">
<!-- Input and output arguments of the action --> <!-- Input and output arguments of the action -->
<input name="../papers/retro/mesures/original/3M_jaune/3d/633nm/Fichiers\ definitifs/3M_jaune_3D+3DS+3DR_BRDF_dense__nbsgrid_162.alta" /> <input name="../papers/retro/mesures/original/3M_jaune/3d/633nm/Fichiers\ definitifs/3M_jaune_3D+3DS+3DR_BRDF_dense__nbsgrid_81.alta" />
<output name="./results/3d/retro/3M_jaune_abc.brdf" /> <output name="./results/3d/retro/3M_jaune_abc.brdf" />
<!-- Define the function to use --> <!-- Define the function to use -->
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
<action name="data2brdf"> <action name="data2brdf">
<!-- Input and output arguments of the action --> <!-- Input and output arguments of the action -->
<input name="../papers/retro/mesures/original/3M_jaune/3d/633nm/Fichiers\ definitifs/3M_jaune_3D+3DS+3DR_BRDF_dense__nbsgrid_162.alta" /> <input name="../papers/retro/mesures/original/3M_jaune/3d/633nm/Fichiers\ definitifs/3M_jaune_3D+3DS+3DR_BRDF_dense__nbsgrid_81.alta" />
<output name="./results/3d/retro/3M_jaune_abc.brdf" /> <output name="./results/3d/retro/3M_jaune_abc.brdf" />
<!-- Define the function to use --> <!-- Define the function to use -->
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
<action name="data2brdf"> <action name="data2brdf">
<!-- Input and output arguments of the action --> <!-- Input and output arguments of the action -->
<input name="../papers/retro/mesures/original/3M_jaune/3d/633nm/Fichiers\ definitifs/3M_jaune_3D+3DS+3DR_BRDF_dense__nbsgrid_162.alta" /> <input name="../papers/retro/mesures/original/3M_jaune/3d/633nm/Fichiers\ definitifs/3M_jaune_3D+3DS+3DR_BRDF_dense__nbsgrid_81.alta" />
<output name="./results/3d/retro/3M_jaune_abc.brdf" /> <output name="./results/3d/retro/3M_jaune_abc.brdf" />
<!-- Define the function to use --> <!-- Define the function to use -->
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
<input name="./results/3d/retro/3M_jaune_abc.brdf" /> <input name="./results/3d/retro/3M_jaune_abc.brdf" />
<output name="./results/3d/retro/3M_jaune_abc.dat" /> <output name="./results/3d/retro/3M_jaune_abc.dat" />
<parameter name="data" value="../papers/retro/mesures/original/3M_jaune/3d/633nm/Fichiers\ definitifs/3M_jaune_3D+3DS+3DR_BRDF_dense__nbsgrid_162.alta" /> <parameter name="data" value="../papers/retro/mesures/original/3M_jaune/3d/633nm/Fichiers\ definitifs/3M_jaune_3D+3DS+3DR_BRDF_dense__nbsgrid_81.alta" />
<parameter name="min" value="[0.1, -2, -2]" /> <parameter name="min" value="[0.1, -2, -2]" />
<parameter name="max" value="[1.7, 2, 2]" /> <parameter name="max" value="[1.7, 2, 2]" />
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<action name="data2brdf"> <action name="data2brdf">
<!-- Input and output arguments of the action --> <!-- Input and output arguments of the action -->
<input name="../papers/retro/mesures/original/3M_jaune/3d/633nm/Fichiers\ definitifs/3M_jaune_3D+3DS+3DR_BRDF_dense__nbsgrid_162.alta" /> <input name="../papers/retro/mesures/original/3M_jaune/3d/633nm/Fichiers\ definitifs/3M_jaune_3D+3DS+3DR_BRDF_dense__nbsgrid_81.alta" />
<output name="./results/3d/retro/3M_jaune_beck.brdf" /> <output name="./results/3d/retro/3M_jaune_beck.brdf" />
<!-- Define the function to use --> <!-- Define the function to use -->
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
<action name="data2brdf"> <action name="data2brdf">
<!-- Input and output arguments of the action --> <!-- Input and output arguments of the action -->
<input name="../papers/retro/mesures/original/3M_jaune/3d/633nm/Fichiers\ definitifs/3M_jaune_3D+3DS+3DR_BRDF_dense__nbsgrid_162.alta" /> <input name="../papers/retro/mesures/original/3M_jaune/3d/633nm/Fichiers\ definitifs/3M_jaune_3D+3DS+3DR_BRDF_dense__nbsgrid_81.alta" />
<output name="./results/3d/retro/3M_jaune_beck.brdf" /> <output name="./results/3d/retro/3M_jaune_beck.brdf" />
<!-- Define the function to use --> <!-- Define the function to use -->
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
<input name="./results/3d/retro/3M_jaune_beck.brdf" /> <input name="./results/3d/retro/3M_jaune_beck.brdf" />
<output name="./results/3d/retro/3M_jaune_beck.dat" /> <output name="./results/3d/retro/3M_jaune_beck.dat" />
<parameter name="data" value="../papers/retro/mesures/original/3M_jaune/3d/633nm/Fichiers\ definitifs/3M_jaune_3D+3DS+3DR_BRDF_dense__nbsgrid_162.alta" /> <parameter name="data" value="../papers/retro/mesures/original/3M_jaune/3d/633nm/Fichiers\ definitifs/3M_jaune_3D+3DS+3DR_BRDF_dense__nbsgrid_81.alta" />
<parameter name="min" value="[0.1, -2, -2]" /> <parameter name="min" value="[0.1, -2, -2]" />
<parameter name="max" value="[1.7, 2, 2]" /> <parameter name="max" value="[1.7, 2, 2]" />
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
<action name="data2brdf"> <action name="data2brdf">
<!-- Input and output arguments of the action --> <!-- Input and output arguments of the action -->
<input name="../papers/retro/mesures/original/3M_jaune/3d/633nm/Fichiers\ definitifs/3M_jaune_3D+3DS+3DR_BRDF_dense__nbsgrid_162.alta" /> <input name="../papers/retro/mesures/original/3M_jaune/3d/633nm/Fichiers\ definitifs/3M_jaune_3D+3DS+3DR_BRDF_dense__nbsgrid_81.alta" />
<output name="./results/3d/retro/3M_jaune_beck.brdf" /> <output name="./results/3d/retro/3M_jaune_beck.brdf" />
<!-- Define the function to use --> <!-- Define the function to use -->
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
<action name="data2brdf"> <action name="data2brdf">
<!-- Input and output arguments of the action --> <!-- Input and output arguments of the action -->
<input name="../papers/retro/mesures/original/3M_jaune/3d/633nm/Fichiers\ definitifs/3M_jaune_3D+3DS+3DR_BRDF_dense__nbsgrid_162.alta" /> <input name="../papers/retro/mesures/original/3M_jaune/3d/633nm/Fichiers\ definitifs/3M_jaune_3D+3DS+3DR_BRDF_dense__nbsgrid_81.alta" />
<output name="./results/3d/retro/3M_jaune_beck.brdf" /> <output name="./results/3d/retro/3M_jaune_beck.brdf" />
<!-- Define the function to use --> <!-- Define the function to use -->
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
<input name="./results/3d/retro/3M_jaune_beck.brdf" /> <input name="./results/3d/retro/3M_jaune_beck.brdf" />
<output name="./results/3d/retro/3M_jaune_beck.dat" /> <output name="./results/3d/retro/3M_jaune_beck.dat" />
<parameter name="data" value="../papers/retro/mesures/original/3M_jaune/3d/633nm/Fichiers\ definitifs/3M_jaune_3D+3DS+3DR_BRDF_dense__nbsgrid_162.alta" /> <parameter name="data" value="../papers/retro/mesures/original/3M_jaune/3d/633nm/Fichiers\ definitifs/3M_jaune_3D+3DS+3DR_BRDF_dense__nbsgrid_81.alta" />
<parameter name="min" value="[0.1, -2, -2]" /> <parameter name="min" value="[0.1, -2, -2]" />
<parameter name="max" value="[1.7, 2, 2]" /> <parameter name="max" value="[1.7, 2, 2]" />
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<action name="data2brdf"> <action name="data2brdf">
<!-- Input and output arguments of the action --> <!-- Input and output arguments of the action -->
<input name="../papers/retro/mesures/original/3M_jaune/3d/633nm/Fichiers\ definitifs/3M_jaune_3D+3DS+3DR_BRDF_dense__nbsgrid_162.alta" /> <input name="../papers/retro/mesures/original/3M_jaune/3d/633nm/Fichiers\ definitifs/3M_jaune_3D+3DS+3DR_BRDF_dense__nbsgrid_81.alta" />
<output name="./results/3d/retro/3M_jaune_blinn.brdf" /> <output name="./results/3d/retro/3M_jaune_blinn.brdf" />
<!-- Define the function to use --> <!-- Define the function to use -->
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<action name="data2brdf"> <action name="data2brdf">
<!-- Input and output arguments of the action --> <!-- Input and output arguments of the action -->
<input name="../papers/retro/mesures/original/3M_jaune/3d/633nm/Fichiers\ definitifs/3M_jaune_3D+3DS+3DR_BRDF_dense__nbsgrid_162.alta" /> <input name="../papers/retro/mesures/original/3M_jaune/3d/633nm/Fichiers\ definitifs/3M_jaune_3D+3DS+3DR_BRDF_dense__nbsgrid_81.alta" />
<output name="./results/3d/retro/3M_jaune_blinn.brdf" /> <output name="./results/3d/retro/3M_jaune_blinn.brdf" />
<!-- Define the function to use --> <!-- Define the function to use -->
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
<action name="data2brdf"> <action name="data2brdf">
<!-- Input and output arguments of the action --> <!-- Input and output arguments of the action -->
<input name="../papers/retro/mesures/original/3M_jaune/3d/633nm/Fichiers\ definitifs/3M_jaune_3D+3DS+3DR_BRDF_dense__nbsgrid_162.alta" /> <input name="../papers/retro/mesures/original/3M_jaune/3d/633nm/Fichiers\ definitifs/3M_jaune_3D+3DS+3DR_BRDF_dense__nbsgrid_81.alta" />
<output name="./results/3d/retro/3M_jaune_blinn.brdf" /> <output name="./results/3d/retro/3M_jaune_blinn.brdf" />
<!-- Define the function to use --> <!-- Define the function to use -->
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
<input name="./results/3d/retro/3M_jaune_blinn.brdf" /> <input name="./results/3d/retro/3M_jaune_blinn.brdf" />
<output name="./results/3d/retro/3M_jaune_blinn.dat" /> <output name="./results/3d/retro/3M_jaune_blinn.dat" />
<parameter name="data" value="../papers/retro/mesures/original/3M_jaune/3d/633nm/Fichiers\ definitifs/3M_jaune_3D+3DS+3DR_BRDF_dense__nbsgrid_162.alta" /> <parameter name="data" value="../papers/retro/mesures/original/3M_jaune/3d/633nm/Fichiers\ definitifs/3M_jaune_3D+3DS+3DR_BRDF_dense__nbsgrid_81.alta" />
<parameter name="min" value="[0.1, -2, -2]" /> <parameter name="min" value="[0.1, -2, -2]" />
<parameter name="max" value="[1.7, 2, 2]" /> <parameter name="max" value="[1.7, 2, 2]" />
......
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