#40 Performance improvements #45

artem-ogre · 2021-10-21T19:17:52Z

Implement randomized vertex insertion option and make it default
Allow custom nearest point locators
Implement boost::rtree and random-nearest as locators
Implement kd-tree for nearest point location
Switch index types used in CDT (e.g., vertices, triangles) from 64-bit to 32-bit
64-bit index types can be enabled with CDT_USE_64_BIT_INDEX_TYPE
CDT code refactoring, some APIs changed
Make necessary adjustments to visualizer code
Compatibility with c++98 standard

- Implement randomized vertex insertion option and make it default - Allow custom nearest point locators - Implement boost::rtree and random-nearest as locators - Implement kd-tree for nearest point location - Switch index types used in CDT (e.g., vertices, triangles) from 64-bit to 32-bit - 64-bit index types can be enabled with CDT_USE_64_BIT_INDEX_TYPE - CDT code refactoring, some APIs changed - Make necessary adjustments to visualizer code - Compatibility with c++98 standard

…wise)

AndreFecteau

Everything looks good, a few questions/recommendations but nothing that I can tell is a show stopper.

AndreFecteau · 2021-10-23T18:24:04Z

CDT/include/CDT.h

@@ -180,27 +198,22 @@ class CDT_EXPORT Triangulation
 private:
    /*____ Detail __*/
    void addSuperTriangle(const Box2d<T>& box);
-    void insertVertex(const V2d<T>& pos);
+    void addNexVertex(const V2d<T>& pos, const TriIndVec& tris);


I'm assuming this should be addNextVertex(...)?

Suggested change

void addNexVertex(const V2d<T>& pos, const TriIndVec& tris);

void addNextVertex(const V2d<T>& pos, const TriIndVec& tris);

Thanks, fixed in b3143fb
It was supposed to be addNewVertex :)

AndreFecteau · 2021-10-23T18:24:45Z

CDT/include/CDT.h

+
+    vertices.reserve(nExistingVerts + std::distance(first, last));
+    for(TVertexIter it = first; it != last; ++it)
+        addNexVertex(V2d<T>::make(getX(*it), getY(*it)), TriIndVec());


Suggested change

addNexVertex(V2d<T>::make(getX(*it), getY(*it)), TriIndVec());

addNextVertex(V2d<T>::make(getX(*it), getY(*it)), TriIndVec());

AndreFecteau · 2021-10-23T18:37:41Z

CDT/include/KDTree.h

+/// @tparam MaxStackDepth size of statically allocated stack for nearest query.
+template <
+    typename TCoordType,
+    size_t NumVerticesInLeaf = 20,


Did you test to see if this is a good enough leaf size. I did some testing with my original tree but it had to compete against pointer calls. It might be more efficient to use smaller leafs.

I did some quick testing and smaller size does not improve the situation but makes it slightly worse. Bigger sized can speed-up things just a notch. I've ended up setting 32 as default for now.

AndreFecteau · 2021-10-23T19:17:24Z

CDT/include/KDTree.h

+        {}
+    };
+    // allocated in class (not in the 'nearest' method) for better performance
+    mutable CDT::array<NearestTask, MaxStackDepth> m_tasksStack;


I personally don't like mutable, I do understand that this is probably a good efficiency boost.

I would warn though that since we always split in half. We don't have access to all the data at the start. This tree is not balanced, if you add lets say 100 points close together and then one point really far away I believe (I haven't tried it) you will hit the MaxStackDepth pretty easily.

a4c7808
I switched array to std::vector so now we should not run out of stack depth. Performance looks to be virtually the same.

AndreFecteau · 2021-10-23T19:25:53Z

CDT/include/KDTree.h

+    struct Node
+    {
+        children_type children; ///< two children if not leaf; {0,0} if leaf
+        point_data_vec data;    ///< points' data if leaf


In my experience allocation of deallocation of vectors is expensive. Without testing it I can't tell if this will be significant in this case. Just something to keep an eye on in the future.

In this implementation it's reserved to NumVerticesInLeaf on construction and deallocated when the leaf is split.
So re-allocations should not be causing too many problems I hope.

Make initial stack size and stack increment when re-sizing template parameters Performance is the same

…ee, nearest-random)

Andre Fecteau contributed original KD-tree implementation: https://github.com/AndreFecteau/CDT/tree/OptimizationByUsingKDTree It was heavily modified and included into CDT source.

artem-ogre · 2021-10-24T09:01:57Z

Removed other locators and make kd-tree the only default one. The reason is to have less code to maintain as kd-tree is clearly superior.

Add Andre Fecteau to contributors list

After changes from pull request artem-ogre#45 initialization with a grid no longer worked and the file didn't compile at all.

After changes from pull request #45 initialization with a grid no longer worked and the file didn't compile at all.

commit 6e86109 Author: artem-ogre <artem.ogre@gmail.com> Date: Tue Oct 26 21:17:32 2021 +0200 Update CDT version in CMakeLists.txt commit a5e1339 Author: artem-ogre <artem.ogre@gmail.com> Date: Tue Oct 26 21:00:06 2021 +0200 Fix InitializeWithGrid and VerifyTopology after CDT re-factoring Add instantiations to CDT.cpp to avoid such problems in the future commit 6008441 Author: Zhivko Bogdanov <zhivkobog@gmail.com> Date: Tue Oct 26 19:51:31 2021 +0200 Fixed output from `generateGridVertices`. After changes from pull request artem-ogre#45 initialization with a grid no longer worked and the file didn't compile at all.

commit 42fdbb7 Author: artem-ogre <artem.ogre@gmail.com> Date: Thu Oct 28 14:14:21 2021 +0200 Bump version to 1.1.2 in CMakeLists.txt commit 37fe95d Author: artem-ogre <artem.ogre@gmail.com> Date: Wed Oct 27 15:14:37 2021 +0200 Update doxygen comments commit 62c6047 Author: artem-ogre <artem.ogre@gmail.com> Date: Wed Oct 27 14:18:30 2021 +0200 Remove default template arguments from KDTree class commit 9b7ad4f Author: Zhivko Bogdanov <zhivkobog@gmail.com> Date: Wed Oct 27 12:42:21 2021 +0200 Format changes using the provided .clang-format style. commit 1b356db Author: Zhivko Bogdanov <zhivkobog@gmail.com> Date: Wed Oct 27 09:29:18 2021 +0200 Renamed coordinate type template argument failing compilation. commit 6ceafa5 Author: Zhivko Bogdanov <zhivkobog@gmail.com> Date: Wed Oct 27 09:22:27 2021 +0200 Added missing additional template argument to the triangulation. After the refactor there is an additional template argument that was missing from the output parameter in `initializeWithRegularGrid` and `initializeWithIrregularGrid`. commit b8cf8f8 Author: Zhivko Bogdanov <zhivkobog@gmail.com> Date: Wed Oct 27 09:10:31 2021 +0200 Provide customization points to the k-d tree in the locator. If we want to customize any of the k-d tree template values, we have to change the instance within the locator. To support multiple locators with different configurations, it's best to have the template arguments available in the locator declaration as well. commit 86510f5 Author: Artem Amirkhanov <artem.ogre@gmail.com> Date: Wed Oct 27 10:04:23 2021 +0200 Change 'C++03' to 'C++98' in README commit 8f1b434 Author: artem-ogre <artem.ogre@gmail.com> Date: Wed Oct 27 09:51:00 2021 +0200 Move in generateGridVertices if c++11 is supported commit 6e86109 Author: artem-ogre <artem.ogre@gmail.com> Date: Tue Oct 26 21:17:32 2021 +0200 Update CDT version in CMakeLists.txt commit a5e1339 Author: artem-ogre <artem.ogre@gmail.com> Date: Tue Oct 26 21:00:06 2021 +0200 Fix InitializeWithGrid and VerifyTopology after CDT re-factoring Add instantiations to CDT.cpp to avoid such problems in the future commit 6008441 Author: Zhivko Bogdanov <zhivkobog@gmail.com> Date: Tue Oct 26 19:51:31 2021 +0200 Fixed output from `generateGridVertices`. After changes from pull request artem-ogre#45 initialization with a grid no longer worked and the file didn't compile at all.

artem-ogre linked an issue Oct 21, 2021 that may be closed by this pull request

Performance improvements #40

Closed

artem-ogre force-pushed the feature/40-performance-improvements branch from a38de72 to eddbe7c Compare October 21, 2021 19:25

artem-ogre mentioned this pull request Oct 21, 2021

Performance improvements #40

Closed

#40 Assert that max stack depth is not exceeded (stack overflow other…

21ca8bb

…wise)

artem-ogre requested a review from AndreFecteau October 22, 2021 19:57

AndreFecteau approved these changes Oct 23, 2021

View reviewed changes

artem-ogre added 5 commits October 23, 2021 21:50

#40 Fix a typo 'addNexVertex' -> 'addNewVertex'

b3143fb

#40 Make nearest-task stack dynamic (array to vector)

a4c7808

Make initial stack size and stack increment when re-sizing template parameters Performance is the same

#40 Use default KDTree template parameters in LocatorKDTree

34b9992

#40 Make KDTree locator default and delete other locators (boost::rtr…

d9e1960

…ee, nearest-random)

#40 Change comment header to clarify contribution

22b783b

Andre Fecteau contributed original KD-tree implementation: https://github.com/AndreFecteau/CDT/tree/OptimizationByUsingKDTree It was heavily modified and included into CDT source.

#40 Update README to reflect the introduced changes

43dd70c

Add Andre Fecteau to contributors list

artem-ogre force-pushed the feature/40-performance-improvements branch from bbcf5c4 to 43dd70c Compare October 26, 2021 08:29

artem-ogre merged commit ff12d27 into master Oct 26, 2021

artem-ogre deleted the feature/40-performance-improvements branch October 26, 2021 12:17

zhivkob added a commit to zhivkob/CDT that referenced this pull request Oct 26, 2021

Fixed output from generateGridVertices.

3ea678d

After changes from pull request artem-ogre#45 initialization with a grid no longer worked and the file didn't compile at all.

zhivkob mentioned this pull request Oct 26, 2021

Fixed a compilation issue in generateGridVertices. #47

Closed

artem-ogre pushed a commit that referenced this pull request Oct 26, 2021

Fixed output from generateGridVertices.

6008441

After changes from pull request #45 initialization with a grid no longer worked and the file didn't compile at all.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

#40 Performance improvements #45

#40 Performance improvements #45

artem-ogre commented Oct 21, 2021 •

edited

Loading

AndreFecteau left a comment

AndreFecteau Oct 23, 2021

artem-ogre Oct 23, 2021

AndreFecteau Oct 23, 2021

AndreFecteau Oct 23, 2021

artem-ogre Oct 23, 2021

AndreFecteau Oct 23, 2021

artem-ogre Oct 23, 2021 •

edited

Loading

AndreFecteau Oct 23, 2021

artem-ogre Oct 23, 2021 •

edited

Loading

artem-ogre commented Oct 24, 2021

	void addNexVertex(const V2d<T>& pos, const TriIndVec& tris);
	void addNextVertex(const V2d<T>& pos, const TriIndVec& tris);

	addNexVertex(V2d<T>::make(getX(it), getY(it)), TriIndVec());
	addNextVertex(V2d<T>::make(getX(it), getY(it)), TriIndVec());

#40 Performance improvements #45

#40 Performance improvements #45

Conversation

artem-ogre commented Oct 21, 2021 • edited Loading

AndreFecteau left a comment

Choose a reason for hiding this comment

AndreFecteau Oct 23, 2021

Choose a reason for hiding this comment

artem-ogre Oct 23, 2021

Choose a reason for hiding this comment

AndreFecteau Oct 23, 2021

Choose a reason for hiding this comment

AndreFecteau Oct 23, 2021

Choose a reason for hiding this comment

artem-ogre Oct 23, 2021

Choose a reason for hiding this comment

AndreFecteau Oct 23, 2021

Choose a reason for hiding this comment

artem-ogre Oct 23, 2021 • edited Loading

Choose a reason for hiding this comment

AndreFecteau Oct 23, 2021

Choose a reason for hiding this comment

artem-ogre Oct 23, 2021 • edited Loading

Choose a reason for hiding this comment

artem-ogre commented Oct 24, 2021

artem-ogre commented Oct 21, 2021 •

edited

Loading

artem-ogre Oct 23, 2021 •

edited

Loading

artem-ogre Oct 23, 2021 •

edited

Loading