Commit d84a9304 authored by Laurent Belcour's avatar Laurent Belcour

Updating fitters that did not compile and Tutorials typos.

parent 0092ae2c
# This configuration file is part of ALTA library
#
# Configuration file for the Eigen package required for the CORE and
# some PLUGINS. You need to have the env variable ALTA defined.
INCLUDEPATH += $$(ALTA)/external/build/include $$(ALTA)/external/build/include/Eigen
......@@ -22,7 +22,7 @@ First, download the Kirby2 dataset in ALTA format: <a href="http://alta.gforge.i
The result can be exported using the \a brdf2data commands.
\verbatim
$ ./build/data2gnuplot --input Kirby.brdf --output Kirby.dat --in-data ../data/1d/NIST/Kirby2/Kirby2.dat
$ ./build/brdf2data --input Kirby.brdf --output Kirby.dat --data-file ../data/1d/NIST/Kirby2/Kirby2.dat
\endverbatim
The \a brdf2data allows you to export a function into a data file. If no data plugin is specified, the ALTA format is used which is gnuplot compliant. The position of evaluation for the function are taken from a specified data file (here the original Kirby2 file).
......
......@@ -105,7 +105,7 @@ nonlinear_fitter_ceres::~nonlinear_fitter_ceres()
{
}
bool nonlinear_fitter_ceres::fit_data(const ptr<data>& d, const ptr<function>& fit, const arguments &args)
bool nonlinear_fitter_ceres::fit_data(const ptr<data>& d, ptr<function>& fit, const arguments &args)
{
// I need to set the dimension of the resulting function to be equal
// to the dimension of my fitting problem
......
......@@ -61,7 +61,7 @@ class nonlinear_fitter_ceres: public fitter
// Fitting a data object
//
virtual bool fit_data(const ptr<data>& d, const ptr<function>& fit, const arguments& args) ;
virtual bool fit_data(const ptr<data>& d, ptr<function>& fit, const arguments& args) ;
// Provide user parameters to the fitter
//
......
......@@ -275,7 +275,7 @@ nonlinear_fitter_eigen::~nonlinear_fitter_eigen()
{
}
bool nonlinear_fitter_eigen::fit_data(const ptr<data>& d, const ptr<function>& fit, const arguments &args)
bool nonlinear_fitter_eigen::fit_data(const ptr<data>& d, ptr<function>& fit, const arguments &args)
{
// I need to set the dimension of the resulting function to be equal
// to the dimension of my fitting problem
......
......@@ -45,7 +45,7 @@ class nonlinear_fitter_eigen: public fitter
// Fitting a data object
//
virtual bool fit_data(const ptr<data>& d, const ptr<function>& fit, const arguments& args) ;
virtual bool fit_data(const ptr<data>& d, ptr<function>& fit, const arguments& args) ;
// Provide user parameters to the fitter
//
......
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