ragni-cas 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b2ffa2dcbd78af09927a604e69f2a565a81a37e
-  data.tar.gz: 134be78382ccefbada1ab75dbcc3869c4d4204e9
+  metadata.gz: a4242043e0dc955dc78fbb741acc0ddea85e53e5
+  data.tar.gz: ddb216f2b7e4fdda8abe923b0b73aa572387d878
 SHA512:
-  metadata.gz: df5f85762fccdfce9d886aaadaec1b0648867e05bde256c0d24c3b8ae3b89bfb71863023bc14b36811352ca2b89f03002c5a80768a7f451da8e31566015bb643
-  data.tar.gz: c43b45ee2efab3ed5d4a786d76a9b4d10a1b69f0fa01949d03422b6ac21a8b35817c03aaf05f73129e2ceb2e4111892323790d83aa9a45daa0eee2f0bd822af8
+  metadata.gz: fe985e5da5eacf6e38194b4973f076e93c219e29140172f4cc296058287c39452a65c47b5ab4cf38f67c361e240c38905ffb1920bf6fd6b61f1dc457b259c24b
+  data.tar.gz: 7f80d8eaf5983d19de5bdda2886bd05f521ed7d2543d61b99ea54717a29bbf5946f18c5b45f0c221ab18e55f850bd5064f42b57fa9ed366ac7557ee627743d0a

data/lib/fnc-base.rb

@@ -32,12 +32,19 @@ module CAS
       if @x == @y
         return @x * 2.0
       end
+      if @x == -@y or -@x == @y
+        return CAS::Zero
+      end 
       if @x.is_a? CAS::Constant and @y.is_a? CAS::Constant
         return CAS.const(self.call({}))
       end
       return self
     end
 
+    def ==(op)
+      self.class == op.class and ((@x == op.x and @y == op.y) or (@y == op.x and @x == op.y))
+    end
+
     def to_code
       "(#{@x.to_code} + #{@y.to_code})"
     end
@@ -80,6 +87,10 @@ module CAS
       return self
     end
 
+    def ==(op)
+      self.class == op.class and ((@x == op.x and @y == op.y) or (@y == op.x and @x == op.y))
+    end
+
     def to_code
       "(#{@x.to_code} - #{@y.to_code})"
     end
@@ -125,6 +136,10 @@ module CAS
       return self
     end
 
+    def ==(op)
+      self.class == op.class and ((@x == op.x and @y == op.y) or (@y == op.x and @x == op.y))
+    end
+
     def to_code
       "(#{@x.to_code} * #{@y.to_code})"
     end

data/lib/numbers.rb

@@ -11,9 +11,13 @@ module CAS
     end
 
     def diff(v); CAS::Zero; end
-    def call(f = {}); @x; end
+
+    def call(f); @x; end
+
     def depend?(v); false; end
+
     def to_s; "#{@x}"; end
+
     def simplify
       case x
       when 0
@@ -30,7 +34,20 @@ module CAS
         return self
       end
     end
+
+    def args
+      []
+    end
+
+    def ==(op)
+      @x == op.x
+    end
+
+    def inspect
+      "Const(#{@x})"
+    end
   end
+  
   def self.const(f)
     CAS::Constant.new f
   end
@@ -40,22 +57,20 @@ module CAS
   #  \ V / _` | '_| / _` | '_ \ / -_)
   #   \_/\__,_|_| |_\__,_|_.__/_\___|
   class Variable < CAS::Op
-    @@counter = 0
     @@vars = {}
+    @@counter = 0
 
-    def self.all_variables
-      @@vars
-    end
-
-    def initialize(name = "x")
-      self.is(name)
-      @@vars[@identifier] = self
-      @@counter = @@counter + 1
+    def self.list; @@vars; end
+    def self.size; @@counter; end
+    def self.exist?(name)
+      @@vars.keys.include? name
     end
 
-    def is(name)
+    def initialize(name)
+      raise CASError, "Variable #{name} already exists" if CAS::Variable.exist? name
       @name = name
-      @identifier = "var[#{@@counter}]"
+      @@vars[@name] = self
+      @@counter = @@counter + 1
     end
 
     def diff(v)
@@ -66,8 +81,13 @@ module CAS
       self == v
     end
 
+    def ==(op)
+      self.inspect == op.inspect
+    end
+
     def call(f)
-      f[self]
+      return f[self] if f[self]
+      return f[@name] if f[@name]
     end
 
     def to_s
@@ -75,14 +95,26 @@ module CAS
     end
 
     def to_code
-      "#{@identifier}"
+      "#{@name}.call(fd)"
+    end
+
+    def args
+      [self]
+    end
+
+    def inspect
+      "Var(#{@name})"
     end
 
     def simplify
-      return self
+      self
     end
   end # Number
 
+  def self.variable(name)
+    CAS::Variable.new name
+  end
+
   #  _______ ___  ___
   # |_  / __| _ \/ _ \
   #  / /| _||   / (_) |

data/lib/op.rb

@@ -40,6 +40,10 @@ module CAS
       @x.call(f)
     end
 
+    def subs(dt)
+      @x == dt[@x] if dt[@x].inspect == @x.inspect
+    end
+
     def to_s
       "#{@x}"
     end
@@ -68,6 +72,10 @@ module CAS
       CAS.pow(self, op)
     end
 
+    def -@
+      CAS.invert(self)
+    end
+
     def simplify # TODO: improve this
       hash = @x.to_s
       @x = @x.simplify
@@ -78,15 +86,25 @@ module CAS
     end
 
     def inspect
-      self.to_code
+      "#{self.class}(#{@x.inspect})"
     end
 
-    def as_proc
-      eval <<-EOP
-      Proc.new do |var|
-        #{self.to_code}
-      end
-      EOP
+
+    def ==(op)
+      self.class == op.class and @x == op.x
+    end
+
+    def !=(op)
+      not self.==(op)
+    end
+
+    def as_proc(bind)
+      arguments = (self.args.map { |e| e.to_s }).join(" ")
+      bind.eval("Proc.new do |#{arguments}, fd|; #{self.to_code}; end")
+    end
+
+    def args
+      @x.args.uniq
     end
   end # Op
 
@@ -133,6 +151,11 @@ module CAS
       return left, right
     end
 
+    def subs(dt)
+      @x = dt[@x] if dt[@x].inspect @x.inspect
+      @y = dt[@y] if dt[@y].inspect @y.inspect
+    end
+
     def call
       raise CASError, "Not Implemented. This is a virtual method"
     end
@@ -145,6 +168,18 @@ module CAS
       raise CASError, "Not implemented. This is a virtual method"
     end
 
+    def args
+      (@x.args + @y.args).uniq
+    end
+
+    def inspect
+      "#{self.class}(#{@x.inspect}, #{@y.inspect})"
+    end
+
+    def ==(op)
+      self.class == op.class and @x == op.x and @y == op.y
+    end
+
     def simplify # TODO: improve this
       hash = @x.to_s
       @x = @x.simplify

data/lib/ragni-cas.rb

@@ -5,9 +5,3 @@ require_relative 'numbers.rb'
 require_relative 'fnc-base.rb'
 require_relative 'fnc-trig.rb'
 require_relative 'fnc-trsc.rb'
-
-module CAS
-  def self.as_proc(obj, op)
-    eval("Proc.new do |var|; #{op.to_code}; end")
-  end
-end

data/lib/version.rb

@@ -2,6 +2,6 @@
 #!/usr/bin/env ruby
 
 module CAS
-  VERSION = [0, 1, 4]
+  VERSION = [0, 1, 5]
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ragni-cas
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Matteo Ragni
@@ -29,7 +29,7 @@ cert_chain:
   XorZtzkkLImvKFj35xKLFfVkv0Vd8tGQoiL8vdmQNJjAjtE+C+Y7OI4dpiZPKO4G
   R/8JOvUuk9jPbyLxjQH/sFaFqqYGX2xo1zk2CRy/A0WhJrSaXVw1r5lEi7b0W5gg
   -----END CERTIFICATE-----
-date: 2016-07-20 00:00:00.000000000 Z
+date: 2016-07-21 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: info@ragni.me