Clean up and consolidate tests

CMakeLists.txt

-cmake_minimum_required(VERSION 3.16)
-project(grouper)      
-
-set(CMAKE_CXX_STANDARD 14)
-
-find_package(Python 3.8 COMPONENTS Interpreter Development REQUIRED)
-find_package(OpenMP)
-
-if(Python_FOUND)
-    message(STATUS "Python Found: ${Python_EXECUTABLE}")
-    message(STATUS "Python Found: ${Python_INCLUDE_DIRS}")
-    message(STATUS "Python Found: ${Python_LIBRARIES}")
-    message(STATUS "Python Found: ${Python_LIBRARY_DIRS}")
-    include_directories(${Python_INCLUDE_DIRS})
-endif()
-
-add_library(grouper   SHARED meanshift.cpp)  
-SET_TARGET_PROPERTIES(grouper   PROPERTIES PREFIX "")
-if(Python_FOUND)
-    target_link_libraries(grouper ${Python_LIBRARIES} OpenMP::OpenMP_CXX)                     
-endif()
-

test.py

-import grouper
-import numpy as np
-
-a = np.array([[1.0, 2.0],[3.0,4.0],[5.0,6.0]])
-f = np.array([1.0,2.0,3.0])
-
-g = grouper.Grouper()
-
-g.readCoordinates(a,f)
-
-g.setLookDistance(5.0)
-g.setGroupingDistance(5.0)
-
-g.run()
-b = []
-g.group(b)
-
-print(b)

testlsm.py

-import lsmtool
-
-s = lsmtool.load('test_large.sky')
-
-s.group('meanshift', byPatch=True,lookDistance=0.075,groupingDistance=0.01)
-

tests/test_group.py

-import lsmtool
-
-s = lsmtool.load('test_apparent_sky.txt')
-
-s.group('meanshift', byPatch=True,lookDistance=0.075,groupingDistance=0.01)
-
-if (len(s.getPatchPositions()) == 67):
-    print("Test successful.")
-else:
-    print("Test failed. (Did you build with c++ extensions? This test may fail for the pure python code.)")
-
-

tests/test_lsmtool.py

@@ -5,6 +5,7 @@ import os
 
 
 s = lsmtool.load('tests/no_patches.sky')
+s2 = lsmtool.load('tests/apparent.sky')
 
 
 def test_select():
@@ -94,3 +95,8 @@ def test_plot():
     s.plot('tests/plot.pdf')
     assert os.path.exists('tests/plot.pdf')
 
+
+def test_meanshift():
+    print('Group the model with the meanshift algorithm')
+    s2.group('meanshift', byPatch=True, lookDistance=0.075, groupingDistance=0.01)
+    assert len(s2.getPatchPositions()) == 67