合成数の入力が正常に行われない不具合を修正

Author: satoshin-des

lat_fact.dll

@@ -23,7 +23,7 @@ def lat_fact(N: int, input_bit: int = 1, print_info: int = 1) -> list:
             os.add_dll_directory(os.getcwd())
             LatFact = ctypes.cdll.LoadLibrary('lat_fact.dll')
         LatFact.lattice_factorization.restype = ctypes.POINTER(ctypes.c_longlong)
-        LatFact.lattice_factorization.argtypes = ctypes.c_int, ctypes.c_double, ctypes.c_int
+        LatFact.lattice_factorization.argtypes = ctypes.c_int, ctypes.c_char_p, ctypes.c_int
 
-        a = LatFact.lattice_factorization(input_bit, N, print_info)
+        a = LatFact.lattice_factorization(input_bit, str(N).encode('utf-8'), print_info)
         return int(a[0]), int(a[1])

lat_fact.py

@@ -510,7 +510,7 @@ bool sr_test(const NTL::ZZ u, const NTL::ZZ v, const NTL::ZZ N, const std::vecto
     return false;
 }
 
-extern "C" ll *lattice_factorization(const int bit_flag, const double NN, const int info_flag){
+extern "C" ll *lattice_factorization(const int bit_flag, const char* NN, const int info_flag){
      NTL::RR::SetPrecision(60);
 
     bool new_pair = false;
@@ -524,7 +524,7 @@ extern "C" ll *lattice_factorization(const int bit_flag, const double NN, const
     std::vector<std::vector<double>> mu;
     std::vector<std::vector<ll>> L, close_vecs;
     NTL::mat_ZZ LL;
-
+    std::cout << NN << std::endl;
     if(bit_flag) GenSemiPrime(N);
     //if(argc >= 4){n = atoi(argv[3]); if(argc >= 5) c = atof(argv[4]); }else
     n = 2.2 * NTL::NumBits(N) / log(NTL::NumBits(N)) - 8;

libfact.so

@@ -44,6 +44,6 @@ std::vector<std::vector<ll>> ENUM_CVP_all(const std::vector<std::vector<double>>
 std::tuple<std::vector<std::vector<ll>>, NTL::mat_ZZ> imp_prime_mat(const double c, const std::vector<long> p, const long n);
 std::vector<ll> target(const NTL::ZZ N, const double c, const long n);
 bool sr_test(const NTL::ZZ u, const NTL::ZZ v, const NTL::ZZ N, const std::vector<long> p, const long n);
-extern "C" ll *lattice_factorization(const int bit_flag, const double NN, const int info_flag);
+extern "C" ll *lattice_factorization(const int bit_flag, const char* NN, const int info_flag);
 
 #endif // !LAT_FACT