Commit 72a160b1 authored by Laurent Belcour's avatar Laurent Belcour
Browse files

Merge

parents b26540ea 47e3d8e4
......@@ -178,7 +178,7 @@ bool rational_fitter_parallel::fit_data(const vertical_segment* d, int np, int n
rational_function* r, const arguments &args,
vec& P, vec& Q, double& delta, double& linf_dist, double& l2_dist)
{
// Fit the different outptu dimension independantly
// Fit the different output dimension independantly
for(int j=0; j<d->dimY(); ++j)
{
vec p(np), q(nq);
......@@ -201,7 +201,7 @@ bool rational_fitter_parallel::fit_data(const vertical_segment* d, int np, int n
// dat is the data object, it contains all the points to fit
// np and nq are the degree of the RP to fit to the data
// y is the dimension to fit on the y-data (e.g. R, G or B for RGB signals)
// the function return a ration BRDF function and a boolean
// the function returns a rational BRDF function and a boolean
bool rational_fitter_parallel::fit_data(const vertical_segment* d, int np, int nq, int ny,
rational_function_1d* r, vec& p, vec& q, double& delta)
{
......@@ -272,7 +272,7 @@ void rational_fitter_parallel::get_constraint(int i, int np, int nq, int ny,
cu.resize(np+nq);
cl.resize(np+nq);
// Create two vector of constraints
// Create two vectors of constraints
for(int j=0; j<np+nq; ++j)
{
// Filling the p part
......
......@@ -19,7 +19,7 @@
<input name="../papers/retro/mesures/original/3M_jaune/3d/633nm/Fichiers\ definitifs/3M_jaune_iso_tvproj_brdfcc_rescaled.alta" />
<output name="./results/3d/retro/half/3M_jaune_rat.brdf" />
<output name="./results/3d/retro/pac_tests/3M_jaune_rat.brdf" />
<!-- Define the function to use -->
<function name="rational_function_cosine" />
......@@ -49,10 +49,10 @@
<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/pac_tests/3M_jaune_rat.brdf" />
<output name="./results/3d/retro/pac_tests/3M_jaune_rat.dat" />
<parameter name="data" value="../papers/retro/mesures/original/3M_jaune/3d/633nm/Fichiers\ definitifs/bande_orange_iso_tvproj_brdfcc_rescaled.alta" />
<parameter name="data" value="../papers/retro/mesures/original/3M_jaune/3d/633nm/Fichiers\ definitifs/3M_jaune_iso_tvproj_brdfcc_rescaled.alta" />
<!--<parameter name="data" value="/tmp/yellow_slice_inc30.dat" />-->
</action>
......
......@@ -15,17 +15,18 @@
<!-- Input and output arguments of the action -->
<!-- DATA NOT DENSE WIH NO VS -->
<!-- DATA DENSIFIED WIH NO VS -->
<input name="../papers/retro/mesures/original/3M_jaune/3d/633nm/Fichiers\ definitifs/3M_jaune_iso_tvproj_brdfcc_rescaled-densified.alta" />
<output name="./results/3d/retro/half/3M_jaune_rat.brdf" />
<output name="./results/3d/retro/pac_tests/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" />-->
<!-- THis is the parallel version of the Rational Fitter -->
<plugin type="fitter" name="rational_fitter_parallel" />
<!--<plugin type="fitter" name="rational_fitter_matlab" />-->
......@@ -49,8 +50,8 @@
<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/pac_tests/3M_jaune_rat.brdf" />
<output name="./results/3d/retro/pac_tests/3M_jaune_rat.dat" />
<parameter name="data" value="../papers/retro/mesures/original/3M_jaune/3d/633nm/Fichiers\ definitifs/3M_jaune_iso_tvproj_brdfcc_rescaled-densified.alta" />
......
......@@ -16,11 +16,10 @@
<!-- Input and output arguments of the action -->
<!-- DATA NOT DENSE WITH VS SPECIFIED INSIDE -->
<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/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/3M_jaune_iso_tvproj_brdfcc_rescaled_vs_lsq.alta" />
<output name="./results/3d/retro/half/3M_jaune_rat.brdf" />
<output name="./results/3d/retro/pac_tests/3M_jaune_rat.brdf" />
<!-- Define the function to use -->
<function name="rational_function_cosine" />
......@@ -46,8 +45,8 @@
<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/pac_tests/3M_jaune_rat.brdf" />
<output name="./results/3d/retro/pac_tests/3M_jaune_rat.dat" />
<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" />
......
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