ragni-cas 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4242043e0dc955dc78fbb741acc0ddea85e53e5
-  data.tar.gz: ddb216f2b7e4fdda8abe923b0b73aa572387d878
+  metadata.gz: a095b6caf92bc41279d088acbed381ee4191cda1
+  data.tar.gz: b11a8bccb4cbac26b6f74fafe529e39254a83bbd
 SHA512:
-  metadata.gz: fe985e5da5eacf6e38194b4973f076e93c219e29140172f4cc296058287c39452a65c47b5ab4cf38f67c361e240c38905ffb1920bf6fd6b61f1dc457b259c24b
-  data.tar.gz: 7f80d8eaf5983d19de5bdda2886bd05f521ed7d2543d61b99ea54717a29bbf5946f18c5b45f0c221ab18e55f850bd5064f42b57fa9ed366ac7557ee627743d0a
+  metadata.gz: a461de33b8309b1fcc8fa27cb6bccf035cfc01ca2920f026d0bcf8cfb4ba3cea7f6f4605e4bbe037c4b23e6ef4f21afe0cc3f086017e6682270b057f89fc241b
+  data.tar.gz: a874d3fcb8ce0dad237f1354b745b962491f93f90578b69177a776582dc036d78e667ff3d319ef9dafbba9a857fa8a0d6f5c9c9822a4e930d75db579e8f5b71c

data/lib/numbers.rb

@@ -47,7 +47,7 @@ module CAS
       "Const(#{@x})"
     end
   end
-  
+
   def self.const(f)
     CAS::Constant.new f
   end
@@ -95,7 +95,7 @@ module CAS
     end
 
     def to_code
-      "#{@name}.call(fd)"
+      "#{@name}"
     end
 
     def args
@@ -111,8 +111,13 @@ module CAS
     end
   end # Number
 
-  def self.variable(name)
-    CAS::Variable.new name
+  def self.vars(*name)
+    (return CAS::Variable.new(name[0])) if name.size == 1
+    ret = []
+    name.each do |n|
+      ret << CAS::Variable.new(n)
+    end
+    return ret
   end
 
   #  _______ ___  ___

data/lib/op.rb

@@ -41,7 +41,8 @@ module CAS
     end
 
     def subs(dt)
-      @x == dt[@x] if dt[@x].inspect == @x.inspect
+      @x == dt[@x] if dt.keys.include? @x
+      return self
     end
 
     def to_s
@@ -99,8 +100,10 @@ module CAS
     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")
+      args_ext = self.args.map { |e| "#{e} = fd[\"#{e}\"];" }
+      code = "Proc.new do |fd|; #{args_ext.join " "} #{self.to_code}; end"
+      puts code
+      bind.eval(code)
     end
 
     def args
@@ -152,8 +155,9 @@ module CAS
     end
 
     def subs(dt)
-      @x = dt[@x] if dt[@x].inspect @x.inspect
-      @y = dt[@y] if dt[@y].inspect @y.inspect
+      @x = dt[@x] if dt.keys.include? @x
+      @y = dt[@y] if dt.keys.include? @y
+      return self
     end
 
     def call

data/lib/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ragni-cas
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Matteo Ragni