Rearrange files to be more glob-build (*.cpp) friendly

Author: mrcslws

make-tests.sh

@@ -8,7 +8,7 @@ debug=true
 
 outbin="run-tests"
 
-cmd="g++ -o $outbin ./src/test/*.cpp ./src/GridUniqueness.cpp ./src/external/gtest/src/gtest-all.cc -I./src -I./src/external -I./src/external/gtest -lpthread -std=c++14"
+cmd="g++ -o $outbin ./src/test/*.cpp ./src/*.cpp ./src/external/gtest/src/gtest-all.cc -I./src -I./src/external -I./src/external/gtest -lpthread -std=c++14"
 
 if [ "$debug" = true ] ; then
     cmd="$cmd -g -D NTA_ASSERTIONS_ON"

setup.py

@@ -17,8 +17,8 @@ def __str__(self):
 
 
 sources = [
-    'src/gridcodingrange_module.cpp',
-    'src/GridUniqueness.cpp',
+    'src/pyextension/gridcodingrange_module.cpp',
+    'src/grid_coding_range.cpp',
 ]
 
 
@@ -42,7 +42,8 @@ def __str__(self):
     sources=sources,
     extra_compile_args=compile_args,
     extra_link_args=link_args,
-    include_dirs=['./src/external',
+    include_dirs=['./src/',
+                  './src/external',
                   get_pybind_include(),
                   get_pybind_include(user=True)]
 )

src/GridUniqueness.cpp renamed to src/grid_coding_range.cpp

@@ -24,7 +24,7 @@
  * Implementations for GridUniqueness.hpp
  */
 
-#include "GridUniqueness.hpp"
+#include "grid_coding_range.hpp"
 #include "box_expansion.hpp"
 #include <nta_logging.hpp>
 

src/GridUniqueness.hpp renamed to src/grid_coding_range.hpp

@@ -24,8 +24,8 @@
  * Functions that analyze the uniqueness of locations in grid cell spaces
  */
 
-#ifndef NTA_GRID_UNIQUENESS_HPP
-#define NTA_GRID_UNIQUENESS_HPP
+#ifndef NTA_GRIDCODINGRANGE
+#define NTA_GRIDCODINGRANGE
 
 #include <vector>
 #include <utility>
@@ -240,4 +240,4 @@ namespace gridcodingrange
 
 } // end namespace gridcodingrange
 
-#endif // NTA_GRID_UNIQUENESS_HPP
+#endif // NTA_GRIDCODINGRANGE

src/gridcodingrange_module.cpp renamed to src/pyextension/gridcodingrange_module.cpp

@@ -26,7 +26,7 @@
 
 #include <vector>
 
-#include "GridUniqueness.hpp"
+#include "grid_coding_range.hpp"
 #include <nta_logging.hpp>
 
 using std::pair;

src/test/GridUniquenessTest.cpp renamed to src/test/grid_coding_range_test.cpp

@@ -25,7 +25,7 @@
 
 #include <nta_logging.hpp>
 
-#include "GridUniqueness.hpp"
+#include "grid_coding_range.hpp"
 #include <gtest/gtest.h>
 
 #include <vector>