Few fixes (#9)

* Fix selection error. * Add subdirectory tests if BUILD_TESTING is ON
joeydumont · Apr 26, 2024 · 5fade56 · 5fade56
1 parent 9c39f56
commit 5fade56
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -50,7 +50,9 @@ SET_TARGET_PROPERTIES(${PROJECT_NAME}
  VERSION ${wignerSymbols_VERSION_MAJOR}.${wignerSymbols_VERSION_MINOR}.${wignerSymbols_VERSION_RELEASE}
  SOVERSION ${wignerSymbols_VERSION_MAJOR}.${wignerSymbols_VERSION_MINOR}.${wignerSymbols_VERSION_RELEASE})
 
-add_subdirectory(tests)
+if(BUILD_TESTING)
+ add_subdirectory(tests)
+endif()
 
 # Install directories
 install(TARGETS ${PROJECT_NAME} DESTINATION lib)

diff --git a/src/wignerSymbols-cpp.cpp b/src/wignerSymbols-cpp.cpp
@@ -429,15 +429,15 @@ double wigner6j(double l1, double l2, double l3,
  bool select(true);
 
  // Triangle relations for the four tryads
- select = (
+ select &= (
  std::fabs(l1-l2) <= l3 && l3 <= l1+l2
  && std::fabs(l1-l5) <= l6 && l6 <= l1+l5
  && std::fabs(l4-l2) <= l6 && l6 <= l4+l2
  && std::fabs(l4-l5) <= l3 && l3 <= l4+l5
  );
 
  // Sum rule of the tryads
- select = (
+ select &= (
  std::floor(l1+l2+l3)==(l1+l2+l3)
  && std::floor(l1+l5+l6)==(l1+l5+l6)
  && std::floor(l4+l2+l6)==(l4+l2+l6)