mirror of
https://github.com/ultimatepp/ultimatepp.git
synced 2026-08-30 23:02:39 -06:00
ScatterDraw: Added trend lines and doc
git-svn-id: svn://ultimatepp.org/upp/trunk@6009 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
parent
fc9a35b1a5
commit
799256ce41
25 changed files with 2024 additions and 367 deletions
|
|
@ -7,7 +7,7 @@ NAMESPACE_UPP
|
|||
double DataSource::Min(Getdatafun getdata)
|
||||
{
|
||||
double minVal = -DOUBLE_NULL;
|
||||
for (int i = 0; i < GetCount(); ++i) {
|
||||
for (int64 i = 0; i < GetCount(); ++i) {
|
||||
double d = Membercall(getdata)(i);
|
||||
if (!IsNull(d) && minVal > d)
|
||||
minVal = d;
|
||||
|
|
@ -18,7 +18,7 @@ double DataSource::Min(Getdatafun getdata)
|
|||
double DataSource::Max(Getdatafun getdata)
|
||||
{
|
||||
double maxVal = DOUBLE_NULL;
|
||||
for (int i = 0; i < GetCount(); ++i) {
|
||||
for (int64 i = 0; i < GetCount(); ++i) {
|
||||
double d = Membercall(getdata)(i);
|
||||
if (!IsNull(d) && maxVal < d)
|
||||
maxVal = d;
|
||||
|
|
@ -29,9 +29,22 @@ double DataSource::Max(Getdatafun getdata)
|
|||
double DataSource::Avg(Getdatafun getdata)
|
||||
{
|
||||
double ret = 0;
|
||||
for (int i = 0; i < GetCount(); ++i)
|
||||
for (int64 i = 0; i < GetCount(); ++i)
|
||||
ret += Membercall(getdata)(i);
|
||||
return ret/GetCount();
|
||||
}
|
||||
|
||||
double CArray::xn(int n, int64 id) {
|
||||
switch (n) {
|
||||
case 0: ASSERT(yData);
|
||||
return yData[id];
|
||||
case 1: ASSERT(x1Data);
|
||||
return x1Data[id];
|
||||
case 2: ASSERT(x2Data);
|
||||
return x2Data[id];
|
||||
}
|
||||
NEVER();
|
||||
return Null;
|
||||
}
|
||||
|
||||
END_UPP_NAMESPACE
|
||||
Loading…
Add table
Add a link
Reference in a new issue