diff --git a/quanttp/data/qng_wrapper_linux.py b/quanttp/data/qng_wrapper_linux.py index 868b799..fda16db 100644 --- a/quanttp/data/qng_wrapper_linux.py +++ b/quanttp/data/qng_wrapper_linux.py @@ -25,59 +25,59 @@ from ctypes import cdll, c_void_p, c_int, c_double, POINTER, c_char class QngWrapperLinux: def __init__(self): - self.qwqng_wrapper = cdll.LoadLibrary('./libqwqng-wrapper-x86-64.so' if platform.machine().endswith('64') else './libqwqng-wrapper.so') - self.qwqng_wrapper.GetQwqngInstance.restype = c_void_p - self.qwqng_wrapper.RandInt32.argtypes = [c_void_p] - self.qwqng_wrapper.RandInt32.restype = c_int - self.qwqng_wrapper.RandUniform.argtypes = [c_void_p] - self.qwqng_wrapper.RandUniform.restype = c_double - self.qwqng_wrapper.RandNormal.argtypes = [c_void_p] - self.qwqng_wrapper.RandNormal.restype = c_double - self.qwqng_wrapper.RandBytes.argtypes = [c_void_p, c_int] - self.qwqng_wrapper.RandBytes.restype = POINTER(c_char) - self.qwqng_wrapper.Clear.argtypes = [c_void_p] - self.qwqng_wrapper.Reset.argtypes = [c_void_p] - self.qng_pointer = self.qwqng_wrapper.GetQwqngInstance() + self._qwqng_wrapper = cdll.LoadLibrary('./libqwqng-wrapper-x86-64.so' if platform.machine().endswith('64') else './libqwqng-wrapper.so') + self._qwqng_wrapper.GetQwqngInstance.restype = c_void_p + self._qwqng_wrapper.RandInt32.argtypes = [c_void_p] + self._qwqng_wrapper.RandInt32.restype = c_int + self._qwqng_wrapper.RandUniform.argtypes = [c_void_p] + self._qwqng_wrapper.RandUniform.restype = c_double + self._qwqng_wrapper.RandNormal.argtypes = [c_void_p] + self._qwqng_wrapper.RandNormal.restype = c_double + self._qwqng_wrapper.RandBytes.argtypes = [c_void_p, c_int] + self._qwqng_wrapper.RandBytes.restype = POINTER(c_char) + self._qwqng_wrapper.Clear.argtypes = [c_void_p] + self._qwqng_wrapper.Reset.argtypes = [c_void_p] + self._qng_pointer = self._qwqng_wrapper.GetQwqngInstance() def randint32(self): try: - return self.qwqng_wrapper.RandInt32(self.qng_pointer) + return self._qwqng_wrapper.RandInt32(self._qng_pointer) except: - self.qwqng_wrapper.Reset(self.qng_pointer) - return self.qwqng_wrapper.RandInt32(self.qng_pointer) + self._qwqng_wrapper.Reset(self._qng_pointer) + return self._qwqng_wrapper.RandInt32(self._qng_pointer) def randuniform(self): try: - return self.qwqng_wrapper.RandUniform(self.qng_pointer) + return self._qwqng_wrapper.RandUniform(self._qng_pointer) except: - self.qwqng_wrapper.Reset(self.qng_pointer) - return self.qwqng_wrapper.RandUniform(self.qng_pointer) + self._qwqng_wrapper.Reset(self._qng_pointer) + return self._qwqng_wrapper.RandUniform(self._qng_pointer) def randnormal(self): try: - return self.qwqng_wrapper.RandNormal(self.qng_pointer) + return self._qwqng_wrapper.RandNormal(self._qng_pointer) except: - self.qwqng_wrapper.Reset(self.qng_pointer) - return self.qwqng_wrapper.RandNormal(self.qng_pointer) + self._qwqng_wrapper.Reset(self._qng_pointer) + return self._qwqng_wrapper.RandNormal(self._qng_pointer) def randbytes(self, length): try: return self._randbytes_arbitrary_length(length) except: - self.qwqng_wrapper.Reset(self.qng_pointer) + self._qwqng_wrapper.Reset(self._qng_pointer) return self._randbytes_arbitrary_length(length) def _randbytes_arbitrary_length(self, length): if length <= 8192: - return self.qwqng_wrapper.RandBytes(self.qng_pointer, length)[:length] + return self._qwqng_wrapper.RandBytes(self._qng_pointer, length)[:length] else: data = bytearray() for x in range(length // 8192): - data.extend(self.qwqng_wrapper.RandBytes(self.qng_pointer, 8192)[:8192]) + data.extend(self._qwqng_wrapper.RandBytes(self._qng_pointer, 8192)[:8192]) bytes_needed = length % 8192 if bytes_needed != 0: - data.extend(self.qwqng_wrapper.RandBytes(self.qng_pointer, bytes_needed)[:bytes_needed]) + data.extend(self._qwqng_wrapper.RandBytes(self._qng_pointer, bytes_needed)[:bytes_needed]) return bytes(data) def clear(self): - self.qwqng_wrapper.Clear(self.qng_pointer) + self._qwqng_wrapper.Clear(self._qng_pointer) diff --git a/quanttp/data/qng_wrapper_windows.py b/quanttp/data/qng_wrapper_windows.py index 8618567..fca0e6f 100644 --- a/quanttp/data/qng_wrapper_windows.py +++ b/quanttp/data/qng_wrapper_windows.py @@ -23,47 +23,47 @@ class QngWrapperWindows: def __init__(self): import win32com.client - self.qng = win32com.client.Dispatch("QWQNG.QNG") + self._qng = win32com.client.Dispatch("QWQNG.QNG") def randint32(self): try: - return self.qng.RandInt32 + return self._qng.RandInt32 except: - self.qng.Reset() - return self.qng.RandInt32 + self._qng.Reset() + return self._qng.RandInt32 def randuniform(self): try: - return self.qng.RandUniform + return self._qng.RandUniform except: - self.qng.Reset() - return self.qng.RandUniform + self._qng.Reset() + return self._qng.RandUniform def randnormal(self): try: - return self.qng.RandNormal + return self._qng.RandNormal except: - self.qng.Reset() - return self.qng.RandNormal + self._qng.Reset() + return self._qng.RandNormal def randbytes(self, length): try: return self._randbytes_arbitrary_length(length) except: - self.qng.Reset() + self._qng.Reset() return self._randbytes_arbitrary_length(length) def _randbytes_arbitrary_length(self, length): if length <= 8192: - return bytes(self.qng.RandBytes(length)) + return bytes(self._qng.RandBytes(length)) else: data = bytearray() for x in range(length // 8192): - data.extend(bytearray(self.qng.RandBytes(8192))) + data.extend(bytearray(self._qng.RandBytes(8192))) bytes_needed = length % 8192 if bytes_needed != 0: - data.extend(bytearray(self.qng.RandBytes(bytes_needed))) + data.extend(bytearray(self._qng.RandBytes(bytes_needed))) return bytes(data) def clear(self): - self.qng.Clear() + self._qng.Clear()