lib/dydx/algebra/formula.rb in dydx-0.1.314 vs lib/dydx/algebra/formula.rb in dydx-0.1.412

@@ -1,44 +1,69 @@
 module Dydx
   module Algebra
     class Formula
       include Helper
-      attr_accessor :f, :operator, :g
+      attr_accessor :operator, :terms
 
-      def initialize(f, g, operator)
-        g, f = f, g if g.is_num? && operator.commutative?
-        @f, @g, @operator = f, g, operator
+      def initialize(operator, *terms)
+        @operator, @terms = operator, terms
+        commutate! if (terms[1].num? && operator.commutative?)
       end
 
-      def differentiate(sym=:x)
+      def f
+        @terms[0]
+      end
+
+      def g
+        @terms[1]
+      end
+
+      def f=(x)
+        @terms[0] = x
+      end
+
+      def g=(x)
+        @terms[1] = x
+      end
+
+      def tms
+        terms
+      end
+
+      # TODO: Cylomatic complexity for differentiate is too high. [7/6]
+      def differentiate(sym = :x)
         case @operator
         when :+ then f.d(sym) + g.d(sym)
         when :* then (f.d(sym) * g) + (f * g.d(sym))
-        when :^
+        when :**
           # TODO:
-          if g.is_num?
-            f.d(sym) * g * (f ^ (g - 1) )
+          if g.num?
+            f.d(sym) * g * (f ** (g - 1))
           elsif f == sym
-            g * (f ^ (g - 1))
+            g * (f ** (g - 1))
           elsif f == e
             g.d(sym) * self
           else
             self * (g * log(f)).d(sym)
           end
         end
       end
       alias_method :d, :differentiate
 
       def to_s
-        if (formula?(:*) && (f.is_minus1? || g.is_minus1?)  )
-          "( - #{g.to_s} )"
+        if formula?(:*) && (f.minus1? || g.minus1?)
+          "( - #{g} )"
         elsif g.inverse?(operator)
-          "( #{f.to_s} #{inverse_ope(operator)} #{g.x.to_s} )"
+          "( #{f} #{operator.inv} #{g.x} )"
         elsif f.inverse?(operator)
-          "( #{g.to_s} #{inverse_ope(operator)} #{f.x.to_s} )"
+          "( #{g} #{operator.inv} #{f.x} )"
+        elsif formula?(:*) && !rationals.empty?
+          terms = [f, g]
+          terms.delete(rationals.first)
+          "( #{(terms.first * rationals.first.n.numerator)} / #{rationals.first.n.denominator} )"
         else
-          "( #{f.to_s} #{operator} #{g.to_s} )"
+          "( #{f} #{operator} #{g} )"
         end
       end
 
       def subst(hash = {})
         f.subst(hash).send(operator, g.subst(hash))
@@ -55,35 +80,35 @@
       def openable?(operator, x)
         distributive?(self.operator, operator) &&
         (f.combinable?(x, operator) || g.combinable?(x, operator))
       end
 
+      def rationals
+        [f, g].select{ |term| term.num? && term.n.is_a?(Rational) }
+      end
+
       def ==(x)
         if to_s == x.to_s
           true
         else
           result = commutate!.to_s == x.to_s
           commutate!
           result
         end
       end
 
-      def common_factors(formula)
-        nil unless formula.is_a?(Formula)
-        if f == formula.f
-          [:f, :f]
-        elsif g == formula.g
-          [:g, :g]
-        elsif f == formula.g
-          [:f, :g]
-        elsif g == formula.f
-          [:g, :f]
-        end
-      end
-
       def commutate!
-        @f, @g = @g, @f
+        @terms.reverse!
         self
+      end
+
+      def index(tm)
+        tms.index(tm)
+      end
+
+      def delete(tm)
+        tms.delete(tm)
+        tms.count.one? ? tms.first : self
       end
     end
   end
 end