From 300c5b35eaadc63c3a687f3f48d12663df862d73 Mon Sep 17 00:00:00 2001
From: Andrew Kirmse <akirmse@users.noreply.github.com>
Date: Fri, 14 Jun 2024 08:05:06 -0700
Subject: [PATCH] Micro-optimizations for prominence. (#37)

Saves 7% on flat, slow tiles.
---
 code/divide_tree.cpp | 16 ++++++++++++----
 code/divide_tree.h   |  3 ++-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/code/divide_tree.cpp b/code/divide_tree.cpp
index 07a863f..859753c 100644
--- a/code/divide_tree.cpp
+++ b/code/divide_tree.cpp
@@ -322,6 +322,7 @@ bool DivideTree::setOrigin(const CoordinateSystem &coordinateSystem) {
 void DivideTree::compact() {
   unordered_set<int> removedIndices;
   unordered_set<int> emptyIndices;
+  removedIndices.reserve(mSaddles.size());
 
   // TODO: May want to save basin saddles for debugging, only delete during merge
   for (int i = 0; i < (int) mSaddles.size(); ++i) {
@@ -542,8 +543,14 @@ void DivideTree::makeNodeIntoRoot(int nodeId) {
 
 int DivideTree::findCommonAncestor(int nodeId1, int nodeId2) {
   // First go up tree on one side until both nodes are at the same depth
-  int depth1 = getDepth(nodeId1);
-  int depth2 = getDepth(nodeId2);
+  int ancestor1, ancestor2;
+  int depth1 = getDepth(nodeId1, &ancestor1);
+  int depth2 = getDepth(nodeId2, &ancestor2);
+
+  // If the topmost ancestors aren't the same, they're in different trees entirely.
+  if (ancestor1 != ancestor2) {
+    return Node::Null;
+  }
 
   while (depth1 > depth2) {
     nodeId1 = mNodes[nodeId1].parentId;
@@ -576,14 +583,15 @@ int DivideTree::findCommonAncestor(int nodeId1, int nodeId2) {
   }
 }
 
-int DivideTree::getDepth(int nodeId) {
+int DivideTree::getDepth(int nodeId, int *ancestorId) {
   int depth = 0;
 
   do {
     depth += 1;
+    *ancestorId = nodeId;
     nodeId = mNodes[nodeId].parentId;
   } while (nodeId != Node::Null);
-  
+
   return depth;
 }
 
diff --git a/code/divide_tree.h b/code/divide_tree.h
index 8d626f9..8a51ce3 100644
--- a/code/divide_tree.h
+++ b/code/divide_tree.h
@@ -131,7 +131,8 @@ class DivideTree {
   int findCommonAncestor(int nodeId1, int nodeId2);
 
   // Return the depth of the given node in the tree.  A node with no parent has depth 1.
-  int getDepth(int nodeId);
+  // ancestor is set to the highest (non-Null) ancestor ID.
+  int getDepth(int nodeId, int *ancestorId);
 
   // Convert pairs of runoffs at the same location into saddles
   void spliceAllRunoffs();