remove IsPrimeIntensive and replace it with IsPrimeTable (and is_prime_intensive() for > 32 bit tests). Also add is_prime_ultimate()

Author: hurchalla

CMakeLists.txt

@@ -74,7 +74,8 @@ target_sources(hurchalla_factoring INTERFACE
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/hurchalla/factoring/resource_intensive_api/FactorByTable32.h>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/hurchalla/factoring/resource_intensive_api/factorize_intensive_uint32.h>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/hurchalla/factoring/resource_intensive_api/is_prime_intensive.h>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/hurchalla/factoring/resource_intensive_api/IsPrimeIntensive.h>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/hurchalla/factoring/resource_intensive_api/IsPrimeTable.h>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/hurchalla/factoring/resource_intensive_api/is_prime_ultimate.h>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/hurchalla/factoring/detail/DualMontgomeryForm.h>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/hurchalla/factoring/detail/FactorizeStage2.h>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/hurchalla/factoring/detail/factorize_trialdivision.h>
@@ -84,7 +85,6 @@ target_sources(hurchalla_factoring INTERFACE
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/hurchalla/factoring/detail/impl_is_prime.h>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/hurchalla/factoring/detail/impl_is_prime_intensive.h>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/hurchalla/factoring/detail/ImplFactorByTable32.h>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/hurchalla/factoring/detail/ImplIsPrimeIntensive.h>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/hurchalla/factoring/detail/is_prime_bruteforce.h>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/hurchalla/factoring/detail/is_prime_miller_rabin.h>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/hurchalla/factoring/detail/is_prime_trialdivision.h>

include/hurchalla/factoring/detail/ImplIsPrimeIntensive.h

@@ -41,7 +41,7 @@ typename std::enable_if<
    (ut_numeric_limits<typename MontType::IntegerType>::digits==128), bool>::type
 operator()(const MontType& mf) const
 {
-    return is_prime_miller_rabin::call(mf);
+    return is_prime_miller_rabin::call_mont(mf);
 }
 
 

include/hurchalla/factoring/detail/IsPrimeFactor.h

@@ -30,10 +30,10 @@ namespace hurchalla { namespace detail {
 // if you want, by simply substituting that name for PrimeTrialDivisionMayer in
 // the template function call below and including its header file.
 // Note that this impl_is_prime() function (and the associated is_prime) is
-// intended to be relatively lightweight, while in contrast IsPrimeIntensive is
-// intended to be a more heavyweight option for repeated intensive primality
-// testing.  That is why this function uses the lightweight functor
-// PrimeTrialDivisionMayer.
+// intended to be relatively lightweight, while in contrast is_prime_intensive()
+// and IsPrimeTable are intended to be more heavyweight options for repeated
+// intensive primality testing.  That is why this function uses the lightweight
+// functor PrimeTrialDivisionMayer.
 
 // FYI, size 54 would trial all prime factors < 256
 #  define HURCHALLA_ISPRIME_TRIALDIV_SIZE (21)