Improving and, andnot

Author: lemire

include/ewah/boolarray.h

@@ -16,8 +16,6 @@
 #include <vector>
 
 #include "ewahutil.h"
-// uncomment this for debugging
-//#define EWAHASSERT
 
 namespace ewah {
 /**

include/ewah/ewah-inl.h

@@ -330,15 +330,18 @@ template <class uword> size_t EWAHBoolArray<uword>::numberOfWords() const {
 }
 
 template <class uword>
-void EWAHBoolArray<uword>::checkWordCount(std::string message) const {
+void EWAHBoolArray<uword>::assertWordCount(std::string message) const {
 #ifdef EWAHASSERT
   size_t tot = numberOfWords();
   size_t expected = (sizeinbits + wordinbits - 1) / wordinbits;
   if (expected != tot) {
-    std::cerr << "[checkWordCount] " << message << std::endl;
-    std::cerr << "[checkWordCount] number of words " << tot << std::endl;
-    std::cerr << "[checkWordCount] expected number of words " << expected
+    std::cerr << "[assertWordCount] wordinbits " << wordinbits << std::endl;
+    std::cerr << "[assertWordCount] sizeinbits " << sizeinbits << std::endl;
+    std::cerr << "[assertWordCount] " << message << std::endl;
+    std::cerr << "[assertWordCount] number of words " << tot << std::endl;
+    std::cerr << "[assertWordCount] expected number of words " << expected
               << std::endl;
+    debugprintout();
     throw std::runtime_error("bug");
   }
 #endif
@@ -1413,11 +1416,14 @@ void EWAHBoolArray<uword>::logicaland(const EWAHBoolArray &a,
       rlwj.discardLiteralWordsWithReload(nbre_literal);
     }
   }
-  container.setSizeInBits(sizeInBits());
+  BufferedRunningLengthWord<uword> &remain = rlwj.size() > 0 ? rlwj : rlwi;
+  while(remain.size() > 0) {
+    container.addStreamOfEmptyWords(false, remain.size());
+    if (!remain.next()) { break; }
+  }
   container.setSizeInBits(sizeInBits() > a.sizeInBits() ? sizeInBits()
                                                         : a.sizeInBits());
-  container.correctWordCount();
-  container.checkWordCount("logicaland");
+  container.assertWordCount("logicaland");
 }
 
 template <class uword>
@@ -1473,13 +1479,17 @@ void EWAHBoolArray<uword>::logicalandnot(const EWAHBoolArray &a,
       rlwj.discardLiteralWordsWithReload(nbre_literal);
     }
   }
-  const bool i_remains = rlwi.size() > 0;
-  if (i_remains) {
+  if(rlwi.size() > 0) {
     rlwi.discharge(container);
+    container.setSizeInBits(sizeInBits());
+  } else {
+    while(rlwj.size() > 0) {
+      container.addStreamOfEmptyWords(false, rlwj.size());
+      if (!rlwj.next()) { break; }
+    }
+    container.setSizeInBits(a.sizeInBits());
   }
-  container.setSizeInBits(sizeInBits());
-  container.correctWordCount();
-  container.checkWordCount("logicalandnot");
+  container.assertWordCount("logicalandnot");
 }
 
 template <class uword>

include/ewah/ewah.h

@@ -687,7 +687,7 @@ template <class uword = uint32_t> class EWAHBoolArray {
   inline void fastaddStreamOfDirtyWords(const uword *v, const size_t number);
 
 private:
-  void checkWordCount(std::string message) const;
+  void assertWordCount(std::string message) const;
   void correctWordCount();
   size_t numberOfWords() const;
   // private because does not increment the size in bits

tests/CMakeLists.txt

@@ -8,7 +8,19 @@ function(add_cpp_test TEST_NAME)
     target_include_directories(${TEST_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/cpp)
     add_test(NAME ${TEST_NAME} COMMAND "${TEST_NAME}" "${CMAKE_CURRENT_BINARY_DIR}/data/" )
     target_link_libraries(${TEST_NAME} PUBLIC ewah)
+    if(NOT MSVC)  
+    target_compile_options(
+      ${TEST_NAME} PUBLIC
+      -Werror -Wall -Wextra -Weffc++ -Wsign-compare -Wshadow -Wwrite-strings
+      -Wpointer-arith -Winit-self -Wconversion -Wno-sign-conversion
+    )
+    endif()
+    
 endfunction(add_cpp_test)
 
 add_cpp_test(unit)
 
+
+
+
+

tests/unit.cpp

@@ -4,6 +4,7 @@
  *
  * (c) Daniel Lemire, http://lemire.me/en/
  */
+#define EWAHASSERT
 #include "ewah/boolarray.h"
 #include "ewah/ewah.h"
 #include <fstream>
@@ -290,6 +291,7 @@ template <class uword> bool testAndNotEWAHBoolArray() {
   cout << bout << endl;
   if (bout.numberOfOnes() != 1) {
     cout << "expected answer : 1 " << endl;
+    cout << "got      answer : " << bout.numberOfOnes() << endl;
     return false;
   }
   return true;