Merge remote-tracking branch 'origin/develop' into ObliqueNesting
This commit is contained in:
+11
-10
@@ -890,17 +890,18 @@ function BeamLib.BinaryToDecimal( dNumber)
|
||||
local sNumberToConvert = tostring( dNumber)
|
||||
local dResult = 0
|
||||
local k = 0
|
||||
|
||||
|
||||
for i = #sNumberToConvert, 1, -1 do
|
||||
k = k + 1
|
||||
local n = string.sub(sNumberToConvert, k, k)
|
||||
dResult = dResult + n*(2^(i-1))
|
||||
local n = string.sub( sNumberToConvert, k, k)
|
||||
dResult = dResult + n * ( 2^( i-1))
|
||||
end
|
||||
|
||||
|
||||
return dResult
|
||||
end
|
||||
|
||||
-------------------------------------------------------------------------------------------------------------
|
||||
-- TODO si può sostituire con funzione EgtNumToBitString
|
||||
function BeamLib.DecimalToBinary( dNumber)
|
||||
local sNumberToConvert = tostring( dNumber)
|
||||
local n = sNumberToConvert
|
||||
@@ -908,12 +909,12 @@ function BeamLib.DecimalToBinary( dNumber)
|
||||
local sResult = ""
|
||||
|
||||
for i = sNumberToConvert, 0, -1 do
|
||||
local q = math.modf(n)
|
||||
n = n/2
|
||||
local b = q%2
|
||||
table.insert(tmp, b)
|
||||
local q = math.modf( n)
|
||||
n = n / 2
|
||||
local b = q % 2
|
||||
table.insert( tmp, b)
|
||||
|
||||
if (q == 1) then
|
||||
if ( q == 1) then
|
||||
break
|
||||
end
|
||||
end
|
||||
@@ -921,7 +922,7 @@ function BeamLib.DecimalToBinary( dNumber)
|
||||
for i = #tmp, 1, -1 do
|
||||
sResult = sResult..tmp[i]
|
||||
end
|
||||
|
||||
|
||||
return tonumber( sResult)
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user