perf: faster dilate operator (#11)

* perf: use network sort for 9-elements

* perf: also sort the neighbors vector with smallsort

* perf: add more network sorts to smallsort

* refactor: remove old commented code

* install: add smallsort to MANIFEST.in

Author: william-silversmith

MANIFEST.in

@@ -1,4 +1,5 @@
 include fastmorph/threadpool.h
+include fastmorph/smallsort.hpp
 include fastmorph/fastmorph.hpp
 include fastmorph/fastmorphops.cpp
 include COPYING

fastmorph/fastmorph.hpp

@@ -5,6 +5,8 @@
 #include <cstdlib>
 #include <cmath>
 #include <functional>
+
+#include "smallsort.hpp"
 #include "threadpool.h"
 
 namespace fastmorph {
@@ -203,8 +205,8 @@ void multilabel_dilate(
 						continue;
 					} 
 
-					std::sort(middle.begin(), middle.end());
-					std::sort(right.begin(), right.end());
+					fastmorph::sort(middle);
+					fastmorph::sort(right);
 
 					if ((right.size() + middle.size() >= 14)
 						&& right[0] == right[right.size() - 1]
@@ -229,7 +231,7 @@ void multilabel_dilate(
 					neighbors.insert(neighbors.end(), middle.begin(), middle.end());
 					neighbors.insert(neighbors.end(), right.begin(), right.end());
 
-					std::sort(neighbors.begin(), neighbors.end());
+					fastmorph::sort(neighbors);
 
 					int size = neighbors.size();
 
@@ -387,8 +389,8 @@ void multilabel_dilate(
 					continue;
 				} 
 
-				std::sort(middle.begin(), middle.end());
-				std::sort(right.begin(), right.end());
+				fastmorph::sort(middle);
+				fastmorph::sort(right);
 
 				if ((right.size() + middle.size() >= 5)
 					&& right[0] == right[right.size() - 1]
@@ -413,7 +415,7 @@ void multilabel_dilate(
 				neighbors.insert(neighbors.end(), middle.begin(), middle.end());
 				neighbors.insert(neighbors.end(), right.begin(), right.end());
 
-				std::sort(neighbors.begin(), neighbors.end());
+				fastmorph::sort(neighbors);
 
 				int size = neighbors.size();