Skip to content

GitLab

A
alta
Commit 8a5f12df authored by Laurent Belcour's avatar Laurent Belcour
Browse files
Options

Adding export function for the rational function

parent c39cda9b
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 30 deletions
sources/core/function.h
View file @ 8a5f12df
......@@ -114,29 +114,29 @@ class function
protected: // function
//! \brief Standard saving function.
virtual void save(const std::string& filename) const
{
NOT_IMPLEMENTED();
virtual void save(const std::string& filename) const
{
NOT_IMPLEMENTED();
}
//! \brief Output the rational function as a gnuplot file. It requires
//! the data object to output the function at the input location only.
virtual void save_gnuplot(const std::string& filename, const data* d,
const arguments& args) const
const arguments& args) const
{
NOT_IMPLEMENTED();
}
//! \brief Output the rational function using a C++ function formating.
virtual void save_cpp(const std::string& filename, const arguments& args) const
{
{
NOT_IMPLEMENTED();
}
//! \brief Output the rational function using a C++ function formating.
virtual void save_matlab(const std::string& filename, const arguments& args) const
{
NOT_IMPLEMENTED();
{
NOT_IMPLEMENTED();
}
......
sources/core/rational_function.cpp
View file @ 8a5f12df
......@@ -357,7 +357,10 @@ void rational_function::save_matlab(const std::string& filename, const arguments
std::ofstream file(filename.c_str(), std::ios_base::trunc);
file << "global s = [";
file << "function y = brdf(x)" << std::endl;
file << std::endl;
file << "\ts = [";
for(int i=0; i<dimX(); ++i)
{
file << 1.0 / (_max[i]-_min[i]);
......@@ -367,7 +370,7 @@ void rational_function::save_matlab(const std::string& filename, const arguments
}
}
file << "];" << std::endl;
file << "global c = [";
file << "\tc = [";
for(int i=0; i<dimX(); ++i)
{
file << _min[i];
......@@ -379,33 +382,31 @@ void rational_function::save_matlab(const std::string& filename, const arguments
file << "];" << std::endl;
file << std::endl ;
file << "function y = brdf(x)" << std::endl;
file << std::endl;
file << "\tp, q;" << std::endl;
// Export each color channel independantly
for(int j=0; j<dimY(); ++j)
{
// Export the numerator of the jth color channel
file << "\tp = ";
file << "\tp(" << j+1 << ",:) = ";
for(unsigned int i=0; i<np; ++i)
{
if(i > 0 && a[np*j + i] >= 0.0)
{
file << " + ";
}
else if(a[np*j + i] < 0.0)
file << " " ;
file << a[np*j + i];
std::vector<int> degree = index2degree(i);
for(unsigned int k=0; k<degree.size(); ++k)
{
file << "*l(2.0*((x\[" << k << "\]-c[" << k << "])/s[" << k << "] - 0.5), " << degree[k] << ")" ;
file << ".*legendrepoly(" << degree[k] << ", 2.0*((x(" << k+1 << ",:)"
<< "-c(" << k+1 << "))/s(" << k+1 << ") - 0.5))" ;
}
}
file << ";" << std::endl;
// Export the denominator of the jth color channel
file << "\tq = ";
file << "\tq(" << j+1 << ",:) = ";
for(unsigned int i=0; i<nq; ++i)
{
if(i > 0 && b[np*j + i] >= 0.0)
......@@ -418,12 +419,13 @@ void rational_function::save_matlab(const std::string& filename, const arguments
std::vector<int> degree = index2degree(i);
for(unsigned int k=0; k<degree.size(); ++k)
{
file << "*l(2.0*((x\[" << k << "\]-c[" << k << "])/s[" << k << "] - 0.5), " << degree[k] << ")" ;
file << ".*legendrepoly(" << degree[k] << ", 2.0*((x(" << k+1 << ",:)"
<< "-c(" << k+1 << "))/s(" << k+1 << ") - 0.5))" ;
}
}
file << ";" << std::endl;
file << "\ty[" << j << "] = p/q;" << std::endl;
file << "\ty(" << j+1 << ",:) = p./q;" << std::endl;
if(j < dimY()-1)
{
file << std::endl;
......@@ -479,7 +481,7 @@ void rational_function::save_cpp(const std::string& filename, const arguments& a
file << " }" << std::endl;
file << " else" << std::endl;
file << " {" << std::endl;
file << " return ((2*i-1)*x*legendre(x, i-1) - (i-1)*legendre(x, i-2)) / (double)i ;" << std::endl;
file << " return ((2*i-1)*x*l(x, i-1) - (i-1)*l(x, i-2)) / (double)i ;" << std::endl;
file << " }" << std::endl;
file << "}" << std::endl;
file << std::endl;
......@@ -504,7 +506,7 @@ void rational_function::save_cpp(const std::string& filename, const arguments& a
std::vector<int> degree = index2degree(i);
for(unsigned int k=0; k<degree.size(); ++k)
{
file << "*l(2.0*((x\[" << k << "\]-c[" << k << "])/s[" << k << "] - 0.5), " << degree[k] << ")" ;
file << "*l(2.0*((x\[" << k << "\]-c[" << k << "])*s[" << k << "] - 0.5), " << degree[k] << ")" ;
}
}
file << ";" << std::endl;
......@@ -523,7 +525,7 @@ void rational_function::save_cpp(const std::string& filename, const arguments& a
std::vector<int> degree = index2degree(i);
for(unsigned int k=0; k<degree.size(); ++k)
{
file << "*l(2.0*((x\[" << k << "\]-c[" << k << "])/s[" << k << "] - 0.5), " << degree[k] << ")" ;
file << "*l(2.0*((x\[" << k << "\]-c[" << k << "])*s[" << k << "] - 0.5), " << degree[k] << ")" ;
}
}
file << ";" << std::endl;
......@@ -568,7 +570,7 @@ void rational_function::save(const std::string& filename) const
file << "#DIM " << _nX << " " << _nY << std::endl ;
file << "#NP " << a.size() / _nY << std::endl ;
file << "#NQ " << b.size() / _nY << std::endl ;
file << "#BASIS LEGENDRE" << std::endl ;
file << "#BASIS LEGENDRE" << std::endl ;
unsigned int np = a.size() / _nY ;
unsigned int nq = b.size() / _nY ;
......
sources/core/rational_function.h
View file @ 8a5f12df
......@@ -38,7 +38,6 @@ class rational_function : public QObject, public function
// IO function to text files
virtual void load(const std::string& filename) ;
virtual void save(const std::string& filename, const arguments& args) const ;
// Update the function
virtual void update(const std::vector<double>& in_a,
......@@ -59,15 +58,17 @@ class rational_function : public QObject, public function
std::vector<int> index2degree(int i) const ;
//! \brief Save the rational function to the rational format (see \ref formating).
void save(const std::string& filename) const ;
virtual void save(const std::string& filename) const ;
//! \brief Output the rational function as a gnuplot file. It requires
//! the data object to output the function at the input location only.
void save_gnuplot(const std::string& filename, const data* d, const arguments& args) const ;
virtual void save_gnuplot(const std::string& filename, const data* d, const arguments& args) const ;
//! \brief Output the rational function using a C++ function formating.
void save_cpp(const std::string& filename, const arguments& args) const ;
virtual void save_cpp(const std::string& filename, const arguments& args) const ;
//! \brief Output the rational function using a C++ function formating.
void save_matlab(const std::string& filename, const arguments& args) const ;
virtual void save_matlab(const std::string& filename, const arguments& args) const ;
protected: // data
......
sources/plugins/rational_fitter_quadprog/rational_fitter.cpp
View file @ 8a5f12df
......@@ -19,6 +19,11 @@
using namespace std;
fitter* provide_fitter()
{
return new rational_fitter_quadprog();
}
data* rational_fitter_quadprog::provide_data() const
{
return new vertical_segment() ;
......
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