using nanoflann instead of kdtree++ for kdtree-interpolation

magnusuMET · Dec 12, 2011 · 70b4586 · 70b4586
1 parent a78cee0
commit 70b4586
Show file tree

Hide file tree

Showing 22 changed files with 1,894 additions and 2,480 deletions.
diff --git a/COPYING b/COPYING
@@ -1,6 +1,7 @@
-This software comes bundled with libkdtree++-0.7.0, which has the
-'Artistic License', see include/kdtree++/COPYING. Everything else is:
-
+This software comes bundled with nanoflann 1.0.0 ( http://code.google.com/p/nanoflann/ ),
+which has the 'BSD License', see include/nanoflann/COPYING.
+Everything else is:
+
 
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991

diff --git a/configure b/configure
@@ -19352,7 +19352,7 @@ $as_echo "#define DO_NOT_CATCH_EXCEPTIONS_FROM_MAIN /**/" >>confdefs.h
 
 ac_config_headers="$ac_config_headers config.h"
 
-ac_config_files="$ac_config_files fimex.pc Doxyfile Makefile src/Makefile src/felt/Makefile src/binSrc/Makefile test/Makefile share/etc/Makefile include/Makefile include/fimex/Makefile include/fimex/coordSys/Makefile include/felt/Makefile include/kdtree++/Makefile"
+ac_config_files="$ac_config_files fimex.pc Doxyfile Makefile src/Makefile src/felt/Makefile src/binSrc/Makefile test/Makefile share/etc/Makefile include/Makefile include/fimex/Makefile include/fimex/coordSys/Makefile include/felt/Makefile include/nanoflann/Makefile"
 
 ac_config_files="$ac_config_files test/testVerticalInterpolator.sh"
 
@@ -20464,7 +20464,7 @@ do
     "include/fimex/Makefile") CONFIG_FILES="$CONFIG_FILES include/fimex/Makefile" ;;
     "include/fimex/coordSys/Makefile") CONFIG_FILES="$CONFIG_FILES include/fimex/coordSys/Makefile" ;;
     "include/felt/Makefile") CONFIG_FILES="$CONFIG_FILES include/felt/Makefile" ;;
-    "include/kdtree++/Makefile") CONFIG_FILES="$CONFIG_FILES include/kdtree++/Makefile" ;;
+    "include/nanoflann/Makefile") CONFIG_FILES="$CONFIG_FILES include/nanoflann/Makefile" ;;
     "test/testVerticalInterpolator.sh") CONFIG_FILES="$CONFIG_FILES test/testVerticalInterpolator.sh" ;;
     "test/testVerticalInterpolator2.sh") CONFIG_FILES="$CONFIG_FILES test/testVerticalInterpolator2.sh" ;;
     "test/testVerticalInterpolatorHeight.sh") CONFIG_FILES="$CONFIG_FILES test/testVerticalInterpolatorHeight.sh" ;;

diff --git a/configure.ac b/configure.ac
@@ -143,7 +143,7 @@ AC_CONFIG_FILES([fimex.pc
                  include/fimex/Makefile
                  include/fimex/coordSys/Makefile
                  include/felt/Makefile
-                 include/kdtree++/Makefile])
+                 include/nanoflann/Makefile])
 AC_CONFIG_FILES([test/testVerticalInterpolator.sh],[chmod +x test/testVerticalInterpolator.sh])
 AC_CONFIG_FILES([test/testVerticalInterpolator2.sh],[chmod +x test/testVerticalInterpolator2.sh])
 AC_CONFIG_FILES([test/testVerticalInterpolatorHeight.sh],[chmod +x test/testVerticalInterpolatorHeight.sh])

diff --git a/include/Makefile.am b/include/Makefile.am
@@ -1 +1 @@
-SUBDIRS = fimex kdtree++ felt
+SUBDIRS = fimex nanoflann felt
diff --git a/include/Makefile.in b/include/Makefile.in
@@ -252,7 +252,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = fimex kdtree++ felt
+SUBDIRS = fimex nanoflann felt
 all: all-recursive
 
 .SUFFIXES:

diff --git a/include/kdtree++/AUTHORS b/include/kdtree++/AUTHORS
diff --git a/include/kdtree++/COPYING b/include/kdtree++/COPYING
diff --git a/include/kdtree++/Makefile.am b/include/kdtree++/Makefile.am
diff --git a/include/kdtree++/NEWS b/include/kdtree++/NEWS
diff --git a/include/kdtree++/README b/include/kdtree++/README
diff --git a/include/kdtree++/allocator.hpp b/include/kdtree++/allocator.hpp
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		SUBDIRS = fimex kdtree++ felt
		SUBDIRS = fimex nanoflann felt