ragni-cas 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1727dd0447e3614d413bf740c0e2012a032d8f3
-  data.tar.gz: b3470c930416120a63e903934b39c738797ec0e2
+  metadata.gz: c547aa2096182c55e8674b72843393f874aa2bd7
+  data.tar.gz: 61985208f2af48b036567375eef62357e814d052
 SHA512:
-  metadata.gz: 1ff61d15cb0576883729cf5faaca1a04ceee6f05d5206fb0ac379300be89c7e584c38ee0c95c8b70665879cc426d3a3e28bd5b2b23a9ac85c5f43bee9d059802
-  data.tar.gz: 6a97d066096a1a0d3d991474bf076b3b215f8fa14262bbd41931c86fff1b168c84914171d376d01070dc0cf06bde9c7784f1720c2cf39942c6bf09b6f143ca99
+  metadata.gz: 6fd2a091cc81766464510764b0d3bc9b61d2c9fa8d4664cb4234865e8a93aa209ce82bae39e73025579b596dda950889e49d866e88c8c7488b86d9bf2dd6ba65
+  data.tar.gz: 118fb72362a2c40eb1330a8f8dbe24f85d90d2915e9ebff0700becb0f521fd3b7479d54e7eaf1efc4c9882c71be7e12917075e7066ff61e6bdbaebdb19e3bbc8

data/lib/fnc-base.rb

@@ -48,6 +48,9 @@ module CAS
       if @x == -@y or -@x == @y
         return CAS::Zero
       end
+      if @y.is_a? CAS::Invert
+        return (@x - @y.x)
+      end
       if @x.is_a? CAS::Constant and @y.is_a? CAS::Constant
         return CAS.const(self.call({}))
       end
@@ -113,6 +116,12 @@ module CAS
       if @x.is_a? CAS::Constant and @y.is_a? CAS::Constant
         return CAS.const(self.call({}))
       end
+      if @y.is_a? CAS::Invert
+        return @x + @y.x
+      end
+      if @x.is_a? CAS::Invert
+        return -(@x.x + @y)
+      end
       return self
     end
 

data/lib/numbers.rb

@@ -30,6 +30,20 @@ module CAS
       "#{@x}"
     end
 
+    # Subs for a constant is a dummy method
+    def subs(dt)
+      # CAS::Help.assert(dt, Hash)
+      # if dt.keys.include? self
+      #   if dt[self].is_a? CAS::Op
+      #     return dt[self]
+      #   elsif dt[self].is_a? Numeric
+      #     return CAS::const(dt[self])
+      #   else
+      #     raise CASError, "Impossible subs. Received a #{dt[self].class} = #{dt[self]}"
+      #   end
+      # end
+    end
+
     # Same as `CAS::Op`
     def simplify
       case @x
@@ -55,7 +69,7 @@ module CAS
 
     # Same as `CAS::Op`
     def ==(op)
-      CAS::Help.assert(op, CAS::Op)
+      # CAS::Help.assert(op, CAS::Op)
 
       if op.is_a? CAS::Constant
         return @x == op.x
@@ -156,7 +170,7 @@ module CAS
 
     # Same as `CAS::Op`
     def ==(op)
-      CAS::Help.assert(op, CAS::Op)
+      # CAS::Help.assert(op, CAS::Op)
       if op.is_a? CAS::Variable
         return self.inspect == op.inspect
       else
@@ -187,6 +201,20 @@ module CAS
       [self]
     end
 
+    # Terminal substitutions for variables
+    def subs(dt)
+      CAS::Help.assert(dt, Hash)
+      if dt.keys.include? self
+        if dt[self].is_a? CAS::Op
+          return dt[self]
+        elsif dt[self].is_a? Numeric
+          return CAS::const(dt[self])
+        else
+          raise CASError, "Impossible subs. Received a #{dt[self].class} = #{dt[self]}"
+        end
+      end
+    end
+
     # Same as `CAS::Op`
     def inspect
       "Var(#{@name})"

data/lib/op.rb

@@ -104,8 +104,17 @@ module CAS
     # -> `CAS::Op` (`self`) with substitution performed
     def subs(dt)
       CAS::Help.assert(dt, Hash)
-
-      @x == dt[@x].dup if dt.keys.include? @x
+      if dt.keys.include? @x
+        if dt[@x].is_a? CAS::Op
+          @x = dt[@x]
+        elsif dt[@x].is_a? Numeric
+          @x = CAS::const dt[@x]
+        else
+          raise CASError, "Impossible subs. Received a #{dt[@x].class} = #{dt[@x]}"
+        end
+      else
+        @x.subs(dt)
+      end
       return self
     end
 
@@ -196,9 +205,12 @@ module CAS
     # <- `CAS::Op` to be tested against
     # -> `TrueClass` if equal, `FalseClass` if differs
     def ==(op)
-      CAS::Help.assert(op, CAS::Op)
-
-      self.class == op.class and @x == op.x
+      # CAS::Help.assert(op, CAS::Op)
+      if op.is_a? CAS::Op
+        return false if op.is_a? CAS::BinaryOp
+        return (self.class == op.class and @x == op.x)
+      end
+      false
     end
 
     # Disequality operator, the standard operator is overloaded
@@ -324,9 +336,28 @@ module CAS
     # -> `CAS::BinaryOp`, in practice `self`
     def subs(dt)
       CAS::Help.assert(dt, Hash)
-
-      @x = dt[@x].dup if dt.keys.include? @x
-      @y = dt[@y].dup if dt.keys.include? @y
+      if dt.keys.include? @x
+        if dt[@x].is_a? CAS::Op
+          @x = dt[@x]
+        elsif dt[@x].is_a? Numeric
+          @x = CAS::const dt[@x]
+        else
+          raise CASError, "Impossible subs. Received a #{dt[@x].class} = #{dt[@x]}"
+        end
+      else
+        @x.subs(dt)
+      end
+      if dt.keys.include? @y
+        if dt[@y].is_a? CAS::Op
+          @y = dt[@y]
+        elsif dt[@y].is_a? Numeric
+          @y = CAS::const dt[@y]
+        else
+          raise CASError, "Impossible subs. Received a #{dt[@y].class} = #{dt[@y]}"
+        end
+      else
+        @y.subs(dt)
+      end
       return self
     end
 

data/lib/version.rb

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

metadata

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