diff options
author | Marius Kintel <marius@kintel.net> | 2011-10-26 22:49:55 (GMT) |
---|---|---|
committer | Marius Kintel <marius@kintel.net> | 2011-10-26 22:49:55 (GMT) |
commit | 3080932440266b1f67ba106a536f3e6e6305fa80 (patch) | |
tree | fc1556b9807e0113b234057c95a01843278379c1 /src/CGALEvaluator.h | |
parent | ed54572c9b6d31abc7dddd14d0acc7a153db11a4 (diff) |
Bugfix: Changed caching strategy to avoid the risk of sibling nodes being evicted from the cache before the parent node has evaluated.
Diffstat (limited to 'src/CGALEvaluator.h')
-rw-r--r-- | src/CGALEvaluator.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/CGALEvaluator.h b/src/CGALEvaluator.h index 6a26043..1dce4d9 100644 --- a/src/CGALEvaluator.h +++ b/src/CGALEvaluator.h @@ -30,14 +30,14 @@ public: const Tree &getTree() const { return this->tree; } private: - void addToParent(const State &state, const AbstractNode &node); + void addToParent(const State &state, const AbstractNode &node, const CGAL_Nef_polyhedron &N); bool isCached(const AbstractNode &node) const; void process(CGAL_Nef_polyhedron &target, const CGAL_Nef_polyhedron &src, CGALEvaluator::CsgOp op); CGAL_Nef_polyhedron applyToChildren(const AbstractNode &node, CGALEvaluator::CsgOp op); CGAL_Nef_polyhedron applyHull(const CgaladvNode &node); std::string currindent; - typedef std::pair<const AbstractNode *, std::string> ChildItem; + typedef std::pair<const AbstractNode *, CGAL_Nef_polyhedron> ChildItem; typedef std::list<ChildItem> ChildList; std::map<int, ChildList> visitedchildren; |