Commit 249c995f authored by Laurent Belcour's avatar Laurent Belcour

Removing the clustering. Should be handled by a command line argument.

parent 13c628a9
......@@ -24,7 +24,7 @@ template<class T> void clustering(const T* in_data, int _nY, params::input in_pa
// Fill the input part of the vector
params::convert(&p[0], in_param, out_param, &e[0]);
/*
// Search for duplicates only when the reparametrization is compressing
// the space.
if(out_nX < in_nX)
......@@ -59,6 +59,7 @@ template<class T> void clustering(const T* in_data, int _nY, params::input in_pa
}
}
else
*/
{
// Fill the output part of the vector
for(int j=0; j<_nY; ++j)
......
......@@ -108,7 +108,7 @@ class data_params : public data
//! \brief contructor requires the definition of a base class that
//! has a parametrization, and a new parametrization.
data_params(const data* d, params::input new_param,
data_params::clustrering method = data_params::NONE) :
data_params::clustrering method = data_params::NONE) :
_clustering_method(method)
{
setParametrization(new_param);
......@@ -128,10 +128,10 @@ class data_params : public data
{
NOT_IMPLEMENTED();
}
virtual vec value(vec in) const
{
NOT_IMPLEMENTED();
}
virtual vec value(vec in) const
{
NOT_IMPLEMENTED();
}
// Load data from a file
virtual void load(const std::string& filename)
......@@ -149,13 +149,13 @@ class data_params : public data
// Acces to data
virtual vec get(int i) const
{
return _data[i];
return _data[i];
}
virtual vec operator[](int i) const
{
return this->get(i);
}
//! \todo This should crash at execution.
virtual void set(vec x)
{
......@@ -165,24 +165,24 @@ class data_params : public data
// Get data size, e.g. the number of samples to fit
virtual int size() const
{
return _data.size();
return _data.size();
}
// Get min and max input space values
virtual vec min() const
{
return _min;
return _min;
}
virtual vec max() const
{
return _max;
return _max;
}
protected: // data
data_params::clustrering _clustering_method;
std::vector<vec> _data;
std::vector<vec> _data;
vec _min, _max;
vec _min, _max;
};
......@@ -118,6 +118,11 @@ vec retroblinn_function::parametersJacobian(const vec& x) const
void retroblinn_function::bootstrap(const data* d, const arguments& args)
{
for(int i=0; i<dimY(); ++i)
{
_ks[i] = 1.0;
_N[i] = 1.0;
}
}
void retroblinn_function::save_call(std::ostream& out,
......
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