diff options
Diffstat (limited to 'src/base')
| -rw-r--r-- | src/base/statistics.hh | 15 | ||||
| -rw-r--r-- | src/base/stats/info.hh | 2 | ||||
| -rw-r--r-- | src/base/stats/text.cc | 4 |
3 files changed, 18 insertions, 3 deletions
diff --git a/src/base/statistics.hh b/src/base/statistics.hh index a21bf81d1..f8e651b97 100644 --- a/src/base/statistics.hh +++ b/src/base/statistics.hh @@ -159,6 +159,8 @@ class Vector2dInfoProxy : public InfoProxy<Stat, Vector2dInfo> { public: Vector2dInfoProxy(Stat &stat) : InfoProxy<Stat, Vector2dInfo>(stat) {} + + Result total() const { return this->s.total(); } }; struct StorageParams @@ -1298,6 +1300,19 @@ class Vector2dBase : public DataWrapVec2d<Derived, Vector2dInfoProxy> #endif } + /** + * Return a total of all entries in this vector. + * @return The total of all vector entries. + */ + Result + total() const + { + Result total = 0.0; + for (off_type i = 0; i < size(); ++i) + total += data(i)->result(); + return total; + } + void prepare() { diff --git a/src/base/stats/info.hh b/src/base/stats/info.hh index b2ba41485..6ce7376a4 100644 --- a/src/base/stats/info.hh +++ b/src/base/stats/info.hh @@ -229,6 +229,8 @@ class Vector2dInfo : public Info mutable VCounter cvec; void enable(); + + virtual Result total() const = 0; }; class FormulaInfo : public VectorInfo diff --git a/src/base/stats/text.cc b/src/base/stats/text.cc index 05ce33cdf..ae09b9b8d 100644 --- a/src/base/stats/text.cc +++ b/src/base/stats/text.cc @@ -588,7 +588,6 @@ Text::visit(const Vector2dInfo &info) } VResult tot_vec(info.y); - VResult super_total(1, 0.0); for (off_type i = 0; i < info.x; ++i) { if (havesub && (i >= info.subnames.size() || info.subnames[i].empty())) continue; @@ -601,7 +600,6 @@ Text::visit(const Vector2dInfo &info) yvec[j] = info.cvec[iy + j]; tot_vec[j] += yvec[j]; total += yvec[j]; - super_total[0] += yvec[j]; } print.name = info.name + "_" + @@ -620,7 +618,7 @@ Text::visit(const Vector2dInfo &info) print.name = info.name; print.subnames = total_subname; print.desc = info.desc; - print.vec = super_total; + print.vec = VResult(1, info.total()); print.flags = print.flags & ~total; print(*stream); } |