lib/dydx/algebra/operator/parts/num.rb in dydx-0.1.3 vs lib/dydx/algebra/operator/parts/num.rb in dydx-0.1.4

@@ -1,33 +1,38 @@
 module Dydx
   module Algebra
     module Operator
       module Parts
         module Num
-          %w(+ * ^).map(&:to_sym).each do |operator|
+          %w(+ * **).map(&:to_sym).each do |operator|
             define_method(operator) do |x|
-              if is_0?
+              if x.is_a?(Num)
+                _(n.send(operator, x.n))
+              elsif operator == :+ && x.inverse?(:+) && x.x.is_a?(Num)
+                _(n - x.x.n)
+              elsif operator == :* && x.inverse?(:*) && x.x.is_a?(Num) && n % x.x.n == 0
+                _(n / x.x.n)
+              elsif zero?
                 case operator
                 when :+ then x
                 when :* then e0
-                when :^ then e0
+                when :** then e0
                 end
-              elsif is_1?
+              elsif one?
                 case operator
                 when :+ then super(x)
                 when :* then x
-                when :^ then e1
+                when :** then e1
                 end
-              elsif x.is_a?(Num)
-                _(n.send(operator, x.n))
-              elsif operator == :+ && x.inverse?(:+) && x.x.is_a?(Num)
-                _(n - x.x.n)
-              elsif operator == :* && x.inverse?(:*) && x.x.is_a?(Num)
-                _(n / x.x.n)
               else
                 super(x)
               end
             end
+          end
+
+          def %(num)
+            fail ArgumentError, "#{num} should be Num class object" unless num.is_a?(Num)
+            _(n % num.n)
           end
         end
       end
     end
   end