ruby-cbc 0.3.2 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 123d2f19ca6c970f616b7fc8809132bb40a25e90
-  data.tar.gz: a757a87c2e76369d441fe123ec73d399b62e8177
+  metadata.gz: 03dc702beca044d1c5b6e9b2319ad40e0b0933dd
+  data.tar.gz: a50b241db4d74b0068005e5709461f6272b791aa
 SHA512:
-  metadata.gz: a77e3149e6f303cecf36e20a8cd75aa5c09a34aacaa56a2dc47af448c8b11df48069ce2c30e65d0e6970819c254a757a94dae906254d89fee283ff0030ed62a8
-  data.tar.gz: 5ee5d181c9554e2c6e66719cda6e9c6bec32ea4c3f8884d222d798e93ecb2920c8ac246c7226b1ddb1ad00d880424d0e52a0e10056bf5fa10cae26cb0ccb0cec
+  metadata.gz: 4a774982b0538e3f9d80f1c2743279174fea6ba83f3ec30526eda0e5b7b66da38737b82299c861f69a88037153c52511903a394760d9a772a8ef6ae2ccebdb27
+  data.tar.gz: 420fb9e01cd239819c0b224ec607959f2e59c59886175171424e8d46445866850a5ee1b003c6be0e3f8417a5796ec6641ab7b762b57c4fd9f16ac50bc89f39a0

data/lib/ruby-cbc/ilp/objective.rb

@@ -8,7 +8,7 @@ module Ilp
     def initialize(terms, objective_function = MAXIMIZE)
       @terms = terms
       @terms = Ilp::Term.new(@terms) if @terms.is_a? Ilp::Var
-      @terms = Ilp::TermArray.new(@terms) if @terms.is_a? Ilp::Term
+      @terms = Ilp::TermArray.new([@terms]) if @terms.is_a? Ilp::Term
       @terms.normalize!
       cste = @terms.send(:pop_constant)
       puts "Removing constant [#{cste}] in objective" if cste != 0

data/lib/ruby-cbc/ilp/term.rb

@@ -9,23 +9,23 @@ module Ilp
     end
 
     def +(vars)
-      Ilp::TermArray.new(self) + vars
+      Ilp::TermArray.new([self]) + vars
     end
 
     def -(vars)
-      Ilp::TermArray.new(self) - vars
+      Ilp::TermArray.new([self]) - vars
     end
 
     def ==(vars)
-      Ilp::TermArray.new(self) == vars
+      Ilp::TermArray.new([self]) == vars
     end
 
     def <=(vars)
-      Ilp::TermArray.new(self) <= vars
+      Ilp::TermArray.new([self]) <= vars
     end
 
     def >=(vars)
-      Ilp::TermArray.new(self) >= vars
+      Ilp::TermArray.new([self]) >= vars
     end
 
 
@@ -35,7 +35,7 @@ module Ilp
     end
 
     def coerce(num)
-      [Ilp::TermArray.new(self), num]
+      [Ilp::TermArray.new([self]), num]
     end
 
     def to_s

data/lib/ruby-cbc/ilp/term_array.rb

@@ -4,7 +4,7 @@ module Ilp
 
     attr_accessor :terms
 
-    def initialize(*terms)
+    def initialize(terms)
       @terms = terms
     end
 
@@ -21,7 +21,7 @@ module Ilp
       else
         raise ArgumentError, "Argument is not allowed: #{vars} of type #{vars.class}"
       end
-      TermArray.new(*new_terms)
+      TermArray.new(new_terms)
     end
 
     def -(vars)
@@ -31,20 +31,24 @@ module Ilp
     def *(mult)
       raise ArgumentError, 'Argument is not numeric' unless mult.is_a? Numeric
       new_terms = terms.map { |term| term * mult }
-      TermArray.new(*new_terms)
+      TermArray.new(new_terms)
     end
 
     # cste + nb * var + nb * var...
     def normalize!
-      constant = @terms.select{ |t| t.is_a? Numeric }.inject(:+)
+      constant = @terms.select{ |t| t.is_a? Numeric }.reduce(:+)
       hterms = @terms.select{ |t| t.is_a? Ilp::Term }.group_by(&:var)
       @terms = []
       constant ||= 0
       @terms << constant
-      hterms.each do |v, ts|
-        t = ts.inject(Ilp::Term.new(v, 0)) { |v1, v2| v1.mult += v2.mult; v1 }
-        terms << t if t.mult != 0
-      end
+      reduced = hterms.map do |v, ts|
+        if ts.count == 1
+          ts.first
+        else
+          ts.reduce(Ilp::Term.new(v, 0)) { |v1, v2| v1.mult += v2.mult; v1 }
+        end
+      end.reject { |term| term.mult == 0 }
+      @terms.concat reduced
       self
     end
 

data/lib/ruby-cbc/model.rb

@@ -4,6 +4,20 @@ module Cbc
 
   INF = 1.0 / 0.0 # Useful for ranges
 
+  def self.add_all(variables)
+    to_add = variables.map do |variable|
+      case variable
+      when Numeric, Ilp::Term
+        variable
+      when Ilp::Var
+        Ilp::Term.new(variable)
+      else
+        raise 'Not a variable, a term or a numeric'
+      end
+    end
+    Ilp::TermArray.new(to_add)
+  end
+
   class Model
 
 

data/lib/ruby-cbc/version.rb

@@ -1,3 +1,3 @@
 module Cbc
-  VERSION = "0.3.2"
+  VERSION = "0.3.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-cbc
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.6
 platform: ruby
 authors:
 - Guillaume Verger
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-27 00:00:00.000000000 Z
+date: 2016-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -161,3 +161,4 @@ signing_key:
 specification_version: 4
 summary: Wrapper around Cbc Linear Programming Solver
 test_files: []
+has_rdoc: