guruby 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90abe0f8288b62ebbd12eabbac3fbfbc5a24eb50
-  data.tar.gz: 39f00000b36f43bdc997ecb6a685d3f7c1878523
+  metadata.gz: ce1569b34b64f28b94bf6fee645dee1558048082
+  data.tar.gz: b60a693f6504a11594ea9c81309bc89893104f40
 SHA512:
-  metadata.gz: 25c749b6eafece828bf27940b7678477230b1f237316e5a331e253b053723db1c8462ce67ecbeafd06842ac4ed96e098e3bfd6dfedde1cf23fa74abf8c6059ac
-  data.tar.gz: e09329ac7900cfbb8dca7447b486e01ff6840d18863971bdaa54f0a05f8a296820ce9847388ca9d995a89a2199203db6b16fff167d1dc42c7bc6cfddd57369c9
+  metadata.gz: a9603e3ecf122e06f510bccb6adbcac0481eb056d668bc3e3b8d57c5fdea2dd96c1a1cf7c04244607edfa8c6244c24d3f9e52f115696d272d5d08a96c45e2b7b
+  data.tar.gz: 9b8650d311a06606f717bb33be0b569123f143c52603641e35f1b454966dc3bccd4fec1d74b1656a5f13eda037a6572da28849190ceb1c4722d937f7fce86c80

data/lib/guruby/expr.rb

@@ -17,10 +17,28 @@ module Guruby
         # Add the variable to the expression
         self + other * 1.0
       else
-        fail TypeError unless other.is_a? LinExpr
+        fail TypeError
       end
     end
 
+    # Add terms from the other expression to this one
+    def add(other)
+      case other
+      when LinExpr
+        @terms.merge!(other.terms) { |_, c1, c2| c1 + c2 }
+      when Variable
+        if @terms.key? other
+          @terms[other] += 1.0
+        else
+          @terms[other] = 1.0
+        end
+      else
+        fail TypeError
+      end
+
+      self
+    end
+
     # Produce a string representing the expression
     def inspect
       @terms.map do |var, coeff|

data/lib/guruby/var.rb

@@ -57,9 +57,9 @@ module Guruby
     def +(other)
       case other
       when LinExpr
-        other + self * 1
+        other + self * 1.0
       when Variable
-        self * 1 + other * 1
+        LinExpr.new({self => 1.0, other => 1.0})
       else
         fail TypeError
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guruby
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Michael Mior
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-27 00:00:00.000000000 Z
+date: 2015-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi