github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-08-20 06:12:41 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

ScatterDraw: Hopefully fixed warnings reported by Pradip

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@14683 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
koldo 2020-07-15 07:56:03 +00:00
parent 74f660ecdf
commit b11be82ec1
4 changed files with 37 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/ScatterDraw/DataSource.cpp
View file

@ -10,7 +10,7 @@ double DataSource::Min(Getdatafun getdata, int64& id) {
for (int64 i = 0; i < GetCount(); ++i) {
double d = Membercall(getdata)(i);
if (!IsNull(d) && minVal > d) {
minVal = d;
minVal = d;
id = i;
}
}

58
uppsrc/ScatterDraw/DataSource.h
View file

@ -343,14 +343,14 @@ protected:
class CArray : public DataSource {
private:
double *yData, *xData, *zData;
const double *yData, *xData, *zData;
int64 numData;
double x0, deltaX;
public:
CArray(double *_yData, int _numData, double _x0, double _deltaX) : yData(_yData), numData(_numData), x0(_x0), deltaX(_deltaX) {xData = NULL;}
CArray(double *_yData, double *_xData, int _numData) : yData(_yData), xData(_xData), numData(_numData) {zData = nullptr; x0 = deltaX = 0;}
CArray(double *_yData, double *_xData, double *_zData, int _numData) : yData(_yData), xData(_xData), zData(_zData), numData(_numData) {x0 = deltaX = 0;}
CArray(const double *_yData, int _numData, double _x0, double _deltaX) : yData(_yData), numData(_numData), x0(_x0), deltaX(_deltaX) {xData = NULL;}
CArray(const double *_yData, const double *_xData, int _numData) : yData(_yData), xData(_xData), numData(_numData) {zData = nullptr; x0 = deltaX = 0;}
CArray(const double *_yData, const double *_xData, const double *_zData, int _numData) : yData(_yData), xData(_xData), zData(_zData), numData(_numData) {x0 = deltaX = 0;}
virtual inline double y(int64 id) {return yData[ptrdiff_t(id)];}
virtual inline double x(int64 id) {return xData ? xData[ptrdiff_t(id)] : id*deltaX + x0;}
virtual double znFixed(int n, int64 id);
@ -360,18 +360,18 @@ public:
class EigenVector : public DataSource {
private:
Eigen::VectorXd *yData, *xData, *zData;
const Eigen::VectorXd *yData, *xData, *zData;
double x0, deltaX;
public:
EigenVector(Eigen::VectorXd &_yData, double _x0, double _deltaX) : yData(&_yData), x0(_x0), deltaX(_deltaX) {xData = nullptr;}
EigenVector(Eigen::VectorXd &_yData, Eigen::VectorXd &_xData) : yData(&_yData), xData(&_xData) {zData = nullptr; x0 = deltaX = 0;}
EigenVector(Eigen::VectorXd &_yData, Eigen::VectorXd &_xData, Eigen::VectorXd &_zData) : yData(&_yData), xData(&_xData), zData(&_zData) {x0 = deltaX = 0;}
virtual inline double y(int64 id) {return (*yData)(id);}
virtual inline double x(int64 id) {return xData ? (*xData)(id) : id*deltaX + x0;}
EigenVector(const Eigen::VectorXd &_yData, double _x0, double _deltaX) : yData(&_yData), x0(_x0), deltaX(_deltaX) {xData = nullptr;}
EigenVector(const Eigen::VectorXd &_yData, const Eigen::VectorXd &_xData) : yData(&_yData), xData(&_xData) {zData = nullptr; x0 = deltaX = 0;}
EigenVector(const Eigen::VectorXd &_yData, const Eigen::VectorXd &_xData, const Eigen::VectorXd &_zData) : yData(&_yData), xData(&_xData), zData(&_zData) {x0 = deltaX = 0;}
virtual inline double y(int64 id) {return (*yData)(Eigen::Index(id));}
virtual inline double x(int64 id) {return xData ? (*xData)(Eigen::Index(id)) : id*deltaX + x0;}
virtual double znFixed(int n, int64 id) {
if (n == 0)
return (*zData)(id);
return (*zData)(Eigen::Index(id));
NEVER();
return Null;
}
@ -382,13 +382,13 @@ public:
template <class Y>
class VectorY : public DataSource {
private:
Vector<Y> *yData;
const Vector<Y> *yData;
double x0, deltaX;
public:
VectorY() : yData(0), x0(0), deltaX(0) {}
VectorY(Vector<Y> &_yData, double _x0, double _deltaX) {Init(_yData, _x0, _deltaX);}
void Init(Vector<Y> &_yData, double _x0, double _deltaX) {
VectorY(const Vector<Y> &_yData, double _x0, double _deltaX) {Init(_yData, _x0, _deltaX);}
void Init(const Vector<Y> &_yData, double _x0, double _deltaX) {
this->yData = &_yData;
this->x0 = _x0;
this->deltaX = _deltaX;
@ -404,13 +404,13 @@ public:
template <class Y>
class ArrayY : public DataSource {
private:
Upp::Array<Y> *yData = 0;
const Upp::Array<Y> *yData = 0;
double x0 = 0, deltaX = 0;
public:
ArrayY() {}
ArrayY(Upp::Array<Y> &_yData, double _x0, double _deltaX) {Init(_yData, _x0, _deltaX);}
void Init(Upp::Array<Y> &_yData, double _x0, double _deltaX) {
ArrayY(const Upp::Array<Y> &_yData, double _x0, double _deltaX) {Init(_yData, _x0, _deltaX);}
void Init(const Upp::Array<Y> &_yData, double _x0, double _deltaX) {
this->yData = &_yData;
this->x0 = _x0;
this->deltaX = _deltaX;
@ -426,7 +426,7 @@ public:
template <class Y>
class VectorVectorY : public DataSource {
private:
Vector<Vector<Y> > *data = 0;
const Vector<Vector<Y> > *data = 0;
bool useRows = true;
int idx = 0, idy = 1;
Vector<int> idsx, idsy, idsFixed;
@ -435,13 +435,13 @@ private:
public:
VectorVectorY() {}
VectorVectorY(Vector<Vector<Y> > &_data, int _idx, int _idy,
Vector<int> &_idsx, Vector<int> &_idsy, Vector<int> &_idsFixed,
VectorVectorY(const Vector<Vector<Y> > &_data, int _idx, int _idy,
const Vector<int> &_idsx, const Vector<int> &_idsy, const Vector<int> &_idsFixed,
bool _useRows = true, int _beginData = 0, int _numData = Null) {
Init(_data, _idx, _idy, _idsx, _idsy, _idsFixed, _useRows, _beginData, _numData);
}
void Init(Vector<Vector<Y> > &_data, int _idx, int _idy, Vector<int> &_idsx, Vector<int> &_idsy, Vector<int> &_idsFixed,
bool _useRows = true, int _beginData = 0, int _numData = Null) {
void Init(const Vector<Vector<Y> > &_data, int _idx, int _idy, const Vector<int> &_idsx, const Vector<int> &_idsy,
const Vector<int> &_idsFixed, bool _useRows = true, int _beginData = 0, int _numData = Null) {
this->data = &_data;
this->useRows = _useRows;
@ -462,7 +462,7 @@ public:
this->numData = _data.GetCount() - _beginData;
}
}
void Init(Vector<Vector<Y> > &_data, int _idx, int _idy, bool _useRows = true, int _beginData = 0, int _numData = Null) {
void Init(const Vector<Vector<Y> > &_data, int _idx, int _idy, bool _useRows = true, int _beginData = 0, int _numData = Null) {
static Vector<int> idsVoid;
Init(_data, _idx, _idy, idsVoid, idsVoid, idsVoid, _useRows, _beginData, _numData);
}
@ -541,10 +541,10 @@ public:
class ArrayPointf : public DataSource {
private:
Upp::Array<Pointf> *data;
const Upp::Array<Pointf> *data;
public:
ArrayPointf(Upp::Array<Pointf> &_data) : data(&_data) {}
ArrayPointf(const Upp::Array<Pointf> &_data) : data(&_data) {}
virtual inline double y(int64 id) {return (*data)[int(id)].y;}
virtual inline double x(int64 id) {return (*data)[int(id)].x;}
virtual inline int64 GetCount() const {return data->GetCount();}
@ -553,10 +553,10 @@ public:
template <class X, class Y>
class VectorMapXY : public DataSource {
private:
VectorMap<X, Y> *data;
const VectorMap<X, Y> *data;
public:
VectorMapXY(VectorMap<X, Y> &_data) : data(&_data) {}
VectorMapXY(const VectorMap<X, Y> &_data) : data(&_data) {}
virtual inline double y(int64 id) {return (*data)[int(id)];}
virtual inline double x(int64 id) {return (*data).GetKey(int(id));}
virtual inline int64 GetCount() const {return data->GetCount();}
@ -565,10 +565,10 @@ public:
template <class X, class Y>
class ArrayMapXY : public DataSource {
private:
ArrayMap<X, Y> *data;
const ArrayMap<X, Y> *data;
public:
ArrayMapXY(ArrayMap<X, Y> &_data) : data(&_data) {}
ArrayMapXY(const ArrayMap<X, Y> &_data) : data(&_data) {}
virtual inline double y(int64 id) {return (*data)[int(id)];}
virtual inline double x(int64 id) {return (*data).GetKey(int(id));}
virtual inline int64 GetCount() const {return data->GetCount();}

4
uppsrc/ScatterDraw/Equation.cpp
View file

@ -45,7 +45,7 @@ ExplicitEquation::FitError ExplicitEquation::Fit(DataSource &serie, double &r2)
functor.series = &serie;
functor.fSource = this;
functor.unknowns = numUnknowns;
functor.datasetLen = serie.GetCount();
functor.datasetLen = Eigen::Index(serie.GetCount());
NumericalDiff<Equation_functor> numDiff(functor);
LevenbergMarquardt<NumericalDiff<Equation_functor> > lm(numDiff);
@ -600,7 +600,7 @@ void Spline::Fit(const double *x, const double *y, int num) {
}
}
double Spline::f(double x) {
double Spline::f(double x) const {
int j;
for (j = 0; j < ncoeff; j++) {
if (coeff[j].x > x) {

12
uppsrc/ScatterDraw/Equation.h
View file

@ -324,8 +324,8 @@ public:
class WeibullEquation : public ExplicitEquation {
public:
WeibullEquation() {SetCoeff(1, 1, 1); factor = Null;}
WeibullEquation(double k, double lambda) {ASSERT(k > 0); ASSERT(lambda > 0); SetCoeff(k, lambda, 1); factor = Null;}
WeibullEquation() {SetCoeff(1, 1, 1);}
WeibullEquation(double k, double lambda, double factor) {ASSERT(k > 0); ASSERT(lambda > 0); SetCoeff(k, lambda, factor);}
double f(double x) {
if (x < 0)
return 0;
@ -346,9 +346,9 @@ public:
virtual void GuessCoeff(DataSource &) {}
virtual void _GuessCoeff(DataSource &series) {
Vector<Pointf> cumulative = series.CumulativeY();
double factor = cumulative.Top().y;
double fac = cumulative.Top().y;
for (int i = 0; i < cumulative.GetCount(); ++i)
cumulative[i].y /= factor;
cumulative[i].y /= fac;
VectorPointf data(cumulative);
WeibullCumulativeEquation weibullCumulative;
ExplicitEquation::FitError error = weibullCumulative.Fit(data);
@ -364,8 +364,6 @@ public:
}
FitError Fit(DataSource &series) {double dummy; return Fit(series, dummy);}
void SetDegree(int ) {NEVER();}
private:
double factor;
};
class NormalEquation : public ExplicitEquation {
@ -426,7 +424,7 @@ public:
void Fit(const Vector<double> &x, const Vector<double> &y) {Fit(x.begin(), y.begin(), x.GetCount());}
void Fit(const Eigen::VectorXd &x, const Eigen::VectorXd &y) {Fit(x.data(), y.data(), int(x.size()));}
void Fit(const double *x, const double *y, int n);
double f(double x);
double f(double x) const;
private:
struct Coeff {double a, b, c, d, x;};