noiioiu/nimbers - Change 2Q7SZHYMAFCYLG5MROYQ4BJ7HDIASPLIZJP7SM7BNX4GESUCZXJQC

Add squaring function

Created by noiioiu on April 21, 2024

2Q7SZHYMAFCYLG5MROYQ4BJ7HDIASPLIZJP7SM7BNX4GESUCZXJQC

Dependencies

In channels

main

Change contents

Deletion in test/Main.hs at line 1 [6.22]
B:BD[6.22] → [6.23:56]
B:BD[6.56] → [7.2:48]
```
{-# OPTIONS_GHC -Wno-orphans #-}
{-# OPTIONS_GHC -Wno-unrecognised-pragmas #-}
```

Insertion in test/Main.hs at line 3 [6.22]

[8.35]

[9.2]

{-# OPTIONS_GHC -Wno-orphans #-}
{-# OPTIONS_GHC -Wno-unrecognised-pragmas #-}

Insertion in test/Main.hs at line 11 [6.22]
[2.21]
[6.120]
```
import Data.Word (Word64)
```
Deletion in test/Main.hs at line 14 [6.22]
B:BD[10.58] → [8.36:62]
```
import Data.Word (Word64)
```

Replacement in test/Main.hs at line 42 [6.22]

B:BD[5.3] → [5.3:66]

prop_sqrt :: Nimber -> Bool
prop_sqrt a = sqrt a * sqrt a == a

[5.3]

[9.45]

prop_sqr :: Nimber -> Bool
prop_sqr a = sqr a == a*a

Insertion in test/Main.hs at line 45 [6.22]

[9.46]

[5.67]

prop_sqrt :: Nimber -> Bool
prop_sqrt a = sqr (sqrt a) == a

Replacement in test/Main.hs at line 69 [6.22]

B:BD[3.3] → [3.3:197]

--prop_def_add :: Small Int -> Small Int -> Bool
--prop_def_add Small {getSmall = a} Small {getSmall = b} = abs a `nimberAdd` abs b == fromIntegral (getNimber $ fromIntegral a + fromIntegral b)

[3.3]

[3.197]

-- prop_def_add :: Small Int -> Small Int -> Bool
-- prop_def_add Small {getSmall = a} Small {getSmall = b} = abs a `nimberAdd` abs b == fromIntegral (getNimber $ fromIntegral a + fromIntegral b)

Replacement in test/Main.hs at line 72 [6.22]

B:BD[3.198] → [3.198:392]

--prop_def_mul :: Small Int -> Small Int -> Bool
--prop_def_mul Small {getSmall = a} Small {getSmall = b} = abs a `nimberMul` abs b == fromIntegral (getNimber $ fromIntegral a * fromIntegral b)

[3.198]

[9.965]

-- prop_def_mul :: Small Int -> Small Int -> Bool
-- prop_def_mul Small {getSmall = a} Small {getSmall = b} = abs a `nimberMul` abs b == fromIntegral (getNimber $ fromIntegral a * fromIntegral b)

Insertion in test/Main.hs at line 76 [6.22]
[8.133]
[8.133]

Replacement in test/Main.hs at line 81 [6.22]

B:BD[6.605] → [8.235:302]

main = do success <- runTests
          unless success exitFailure

[6.605]

main = do
  success <- runTests
  unless success exitFailure

Replacement in src/Data/Nimber.hs at line 69 [6.880]

B:BD[8.1259] → [11.5:58]

     in (aD + a + b) / (semiD * a ^ 2 + b * (a + b))

[8.1259]

[4.5]

     in (aD + a + b) / (semiD * a * a + b * (a + b))
-- | Squaring function.  Faster than multiplying @n@ by itself.
sqr :: Nimber -> Nimber
sqr 0 = 0
sqr 1 = 1
sqr n =
  let m = floorLog @Int $ floorLog n -- D = 2^2^m is the largest Fermat 2-power less than or equal to n
      a = n `shiftR` bit m -- n = aD+b
      aD = a `shiftL` bit m
      b = n .^. aD
      semiD = bit (bit m - 1) -- semimultiple of D
      sqra = sqr a
   in sqra `shiftL` bit m + sqra * semiD + sqr b

Replacement in src/Data/Nimber.hs at line 94 [6.880]

B:BD[4.456] → [4.456:517]

     in sqrt a `shiftL` bit m + sqrt a * sqrt semiD + sqrt b

[4.456]

[4.517]

        sqrta = sqrt a
     in sqrta `shiftL` bit m + sqrta * sqrt semiD + sqrt b