Commit e5055494 authored by Laurent Belcour's avatar Laurent Belcour

Updating the rational loader

parent 343a1652
...@@ -94,16 +94,16 @@ function* plugins_manager::get_function() const ...@@ -94,16 +94,16 @@ function* plugins_manager::get_function() const
} }
data* plugins_manager::get_data() const data* plugins_manager::get_data() const
{ {
if(_datas.empty()) //if(_datas.empty())
{ {
std::cout << "<<DEBUG>> using vertical segment data loader" << std::endl ; std::cout << "<<DEBUG>> using vertical segment data loader" << std::endl ;
return new vertical_segment() ; return new vertical_segment() ;
} }/*
else else
{ {
std::cout << "<<DEBUG>> using \"" << _datas.begin()->first << "\" data loader" << std::endl ; std::cout << "<<DEBUG>> using \"" << _datas.begin()->first << "\" data loader" << std::endl ;
return _datas.begin()->second ; return _datas.begin()->second ;
} }*/
} }
fitter* plugins_manager::get_fitter() const fitter* plugins_manager::get_fitter() const
{ {
......
...@@ -252,7 +252,7 @@ void rational_function::load(const std::string& filename) ...@@ -252,7 +252,7 @@ void rational_function::load(const std::string& filename)
{ {
continue ; continue ;
} }
else else if(j < nY)
{ {
int index ; double val ; int index ; double val ;
...@@ -281,13 +281,14 @@ void rational_function::load(const std::string& filename) ...@@ -281,13 +281,14 @@ void rational_function::load(const std::string& filename)
} }
} }
} }
/*
for(int i=0; i<a.size(); ++i) { for(int i=0; i<a.size(); ++i) {
std::cout << a[i] << "\t" ; std::cout << a[i] << "\t" ;
} }
for(int i=0; i<b.size(); ++i) { for(int i=0; i<b.size(); ++i) {
std::cout << b[i] << "\t" ; std::cout << b[i] << "\t" ;
} }
*/
} }
void rational_function::save(const std::string& filename, const arguments& args) const void rational_function::save(const std::string& filename, const arguments& args) const
{ {
......
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