magick 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ae8b9cd9f9526ea3adac12fd63ab30cd38895c035493a3f4866c83d25df015b
-  data.tar.gz: d60e88dbedd1c8d9c7bedf778beeefed2c3012678ce5022a741c02471ba76abd
+  metadata.gz: b0239f6b8fc615275fa674559061c52c111913e971a49b3ab292630cca826b96
+  data.tar.gz: fa2a9c746508d7d10d89d883a84745509435e8ca2e931f8b862ef9a0409ec184
 SHA512:
-  metadata.gz: 9f033baf4e66b21b0c542d7f99ab95a717fb864acb48e5f51ba06e3c7eec9cd8e68f3d659272942fe4ffb487c618bb563e2b6c6765f4e016e196826cfd6cc45b
-  data.tar.gz: c967a3d6c062ee01b0f804cae609d8f281d4a33f66ba7449edaf2a08f8c505f52607090f769811c1db205745bf458bebdcd506cacfadc2f29b6295b3acf74bf9
+  metadata.gz: 16881788b5f302b8a6a06276351ec676e65cd97c21818347ce76910190e7068cce0cb52dc0338d28cbb1d5f747d64ab2129b3f71b19d482e917c00ae7497eeeb
+  data.tar.gz: 077b86c81e1e46d236fea5b4ed40492d9f646ae89da69c89987a5fdc1d0e7c6587b6c5a11a80a69e5b7797297ee5a12910537cb98278d5091ec38eee71172de2

data/lib/magick/maths.rb

@@ -15,17 +15,26 @@ module Magick
       end
       alias :mult :multiply
 
+      # See note on `mod`
       def divide
         Smullyan::Birds::Y.(->(f){ 
           ->(n){ 
             ->(d){ 
-              n < d ? 0 : 1 + f.(n - d).(d)
+              n < d ? 0 : 1 + f.(subtract.(n).(d)).(d)
             }
           }
         })
       end
       alias :div :divide
 
+      def div
+        ->(n){
+          ->(d){
+            n/d
+          }
+        }
+      end
+
       def div_to_f
         ->(n){
           ->(d){
@@ -37,11 +46,16 @@ module Magick
         }
       end
 
+      # This implementation of mod _works_ but is mostly 
+      # provided as a curiousity: ie, how could we implement 
+      # modulus with the Y combinator and repeated subtraction?
+      # It isn't efficient, as you will find if you ever try, say,
+      # mod.(65536).(2)
       def mod
         Smullyan::Birds::Y.(->(f){
           ->(n){
             ->(d){
-              n < d ? n : f.(n - d).(d)
+              n < d ? n : f.(subtract.(n).(d)).(d)
             }
           }
         })
@@ -63,8 +77,8 @@ module Magick
                 ->(b) {
                   ->(e) {
                     e == 1 ? b :
-                    mod.(e).(2) == 0 ? f.(op.(b).(b)).(divide.(e).(2)) :
-                    op.(f.(op.(b).(b)).(divide.(e).(2))).(b)
+                    mod.(e).(2) == 0 ? f.(op.(b).(b)).(div.(e).(2)) :
+                    op.(f.(op.(b).(b)).(div.(e).(2))).(b)
                   }
                 }
               }).(base).(exponent)
@@ -90,7 +104,7 @@ module Magick
                     return r if n == 1
                   end
                   a = op.(a).(a)
-                  n = n/2
+                  n = div.(n).(2)
                 end
               }
             }
@@ -119,7 +133,7 @@ module Magick
                 b = op.(b).(b)
                 e = e/2
               end
-              e = e / 2
+              e = e/2
               return b if e == 0
               power_accumulate.(op).(b).(op.(b).(b)).(e)
             }
@@ -127,6 +141,8 @@ module Magick
         }
       end
 
+      # average expects an array
+      # eg: average.([1,2,3]) => 2.0
       def average
         Smullyan::Birds::Phi.
           (Magick::Maths::div_to_f).

data/lib/magick/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Magick
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: magick
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Phil Crissman