added userdefined statistics #20
Conversation
| @@ -328,6 +328,76 @@ class ClaspFacade : public ModelHandler { | |||
| */ | |||
| bool read(); | |||
| //@} | |||
|
|
|||
| /*! | |||
| * \name Userdefimed statistics functions | |||
There was a problem hiding this comment.
Userdefimed -> Userdefined
There was a problem hiding this comment.
Or, even better, “User-defined,” UserDefinedStats, and so on.
| UserdefinedStats(); | ||
| const char* name() const; | ||
| size_t root() const; | ||
| /// check whether an Object (of a certain type) is already attached to a map |
There was a problem hiding this comment.
Please be consistent in the use of comment styles and please also document any exceptions and/or preconditions.
| size_t root() const; | ||
| /// check whether an Object (of a certain type) is already attached to a map | ||
| /// if yes, target is set to the objects key | ||
| bool exists(size_t key, const std::string& name, size_t& target) const; |
There was a problem hiding this comment.
A more natural interface would be to use a size_t-pointer as return value and then use nullptr to indicate the absence of name.
| bool exists(size_t key, size_t index, size_t& target) const; | ||
| bool exists(size_t key, size_t index, Potassco::Statistics_t type, size_t& target) const; | ||
| /// attach a new Object to a Map or Array, or return the old one if if already exists | ||
| size_t get(size_t key, const std::string& name, Potassco::Statistics_t type); |
There was a problem hiding this comment.
Having get() to actually create an object feeels kinda wrong.
| void set(size_t key, double v); | ||
|
|
||
| StatisticObject toStats(); | ||
| private: |
| @@ -449,6 +519,8 @@ class ClaspFacade : public ModelHandler { | |||
| BuilderPtr builder_; | |||
| SummaryPtr accu_; | |||
| StatsPtr stats_; // statistics: only if requested | |||
| std::vector<UserdefinedStatsCallback> userStatsCbs_; | |||
There was a problem hiding this comment.
Consider using a single vector storing pairs of function pointer and corresponding data.
| return root_; | ||
| } | ||
|
|
||
| bool ClaspFacade::UserdefinedStats::exists(size_t key, const std::string& name, size_t& target) const { |
There was a problem hiding this comment.
This is way to much duplication!
| } | ||
| auto v = connections_.find(key); | ||
| if (v == connections_.end()) { return false; } | ||
| for (const auto& i : v->second) { |
There was a problem hiding this comment.
Are sparse arrays really needed? The existing stats arrays all behave like normal c++ arrays, i.e. all elements in the range [0, size) are considered valid.
| } | ||
| case Potassco::Statistics_t::Array: { | ||
| size_t size = vecs_[origin].size(); | ||
| /// initialize empty fields with zeros ? |
There was a problem hiding this comment.
See comment above. I would already setup the arrays on construction.
| size_t ClaspFacade::UserdefinedStats::get(size_t key, const std::string& name, Potassco::Statistics_t type) { | ||
| size_t target; | ||
| if (!exists(key,name,type,target)) { | ||
| switch(type) { |
There was a problem hiding this comment.
Please follow clasp's indentation style (this also applies to other places)
|
Closed. Superseded by #23 |
added the option to add userdefined statistics to be set from outside, e.g. clingo scripts