BigInt fixes and optimization (read comments)
Fixed a nasty division bug where intermediate operations could result in negative zero. Optimized exponentiation to use exponentiation by squaring.pull/16/head
parent
38947e00c0
commit
1dda12e4be
|
@ -451,11 +451,17 @@ function bigint.exponentiate(big, power)
|
||||||
elseif (bigint.compare(exp, bigint.new(1), "==")) then
|
elseif (bigint.compare(exp, bigint.new(1), "==")) then
|
||||||
return big
|
return big
|
||||||
else
|
else
|
||||||
local result = big:clone()
|
local result = bigint.new(1)
|
||||||
|
local base = big:clone()
|
||||||
|
|
||||||
while (bigint.compare(exp, bigint.new(1), ">")) do
|
while (bigint.compare(exp, bigint.new(0), ">")) do
|
||||||
result = bigint.multiply(result, big)
|
if (bigint.compare(
|
||||||
exp = bigint.subtract(exp, bigint.new(1))
|
bigint.modulus(exp, bigint.new(2)), bigint.new(1), "=="
|
||||||
|
)) then
|
||||||
|
result = bigint.multiply(result, base)
|
||||||
|
end
|
||||||
|
exp = bigint.divide(exp, bigint.new(2))
|
||||||
|
base = bigint.multiply(base, base)
|
||||||
end
|
end
|
||||||
|
|
||||||
return result
|
return result
|
||||||
|
@ -479,54 +485,30 @@ function bigint.divide_raw(big1, big2)
|
||||||
|
|
||||||
local result = bigint.new()
|
local result = bigint.new()
|
||||||
|
|
||||||
local dividend = bigint.new() -- Dividend of a single operation, not the
|
local dividend = bigint.new() -- Dividend of a single operation
|
||||||
-- dividend of the overall function
|
|
||||||
local divisor = big2:clone()
|
|
||||||
local factor = 1
|
|
||||||
|
|
||||||
-- Walk left to right among digits in the dividend, like in long
|
local neg_zero = bigint.new(0)
|
||||||
-- division
|
neg_zero.sign = "-"
|
||||||
for _, digit in pairs(big1.digits) do
|
|
||||||
dividend.digits[#dividend.digits + 1] = digit
|
|
||||||
|
|
||||||
-- The dividend is smaller than the divisor, so a zero is appended
|
for i = 1, #big1.digits do
|
||||||
-- to the result and the loop ends
|
-- Fixes a negative zero bug
|
||||||
if (bigint.compare(dividend, divisor, "<")) then
|
if (#dividend.digits ~= 0) and (bigint.compare(dividend, neg_zero, "==")) then
|
||||||
if (#result.digits > 0) then -- Don't add leading zeroes
|
dividend = bigint.new()
|
||||||
result.digits[#result.digits + 1] = 0
|
|
||||||
end
|
end
|
||||||
else
|
|
||||||
-- Find the maximum number of divisors that fit into the
|
table.insert(dividend.digits, big1.digits[i])
|
||||||
-- dividend
|
|
||||||
factor = 0
|
local factor = 0
|
||||||
while (bigint.compare(divisor, dividend, "<=")) do
|
while bigint.compare(dividend, big2, ">=") do
|
||||||
divisor = bigint.add(divisor, big2)
|
dividend = bigint.subtract(dividend, big2)
|
||||||
factor = factor + 1
|
factor = factor + 1
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Append the factor to the result
|
if (factor ~= 0) or (factor == 0 and #result.digits ~= 0) then
|
||||||
if (factor == 10) then
|
table.insert(result.digits, factor)
|
||||||
-- Fixes a weird bug that introduces a new bug if fixed by
|
end
|
||||||
-- changing the comparison in the while loop to "<="
|
|
||||||
result.digits[#result.digits] = 1
|
|
||||||
result.digits[#result.digits + 1] = 0
|
|
||||||
else
|
|
||||||
result.digits[#result.digits + 1] = factor
|
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Subtract the divisor from the dividend to obtain the
|
|
||||||
-- remainder, which is the new dividend for the next loop
|
|
||||||
dividend = bigint.subtract(dividend,
|
|
||||||
bigint.subtract(divisor, big2))
|
|
||||||
|
|
||||||
-- Reset the divisor
|
|
||||||
divisor = big2:clone()
|
|
||||||
end
|
|
||||||
|
|
||||||
end
|
|
||||||
|
|
||||||
-- The remainder of the final loop is returned as the function's
|
|
||||||
-- overall remainder
|
|
||||||
return result, dividend
|
return result, dividend
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue