ruby-cbc 0.3.16 → 0.3.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20e463b7c62b654cdd7299eccb0a099f3b0e35e7
-  data.tar.gz: b60149c551f055bc1d1264363291cb62df927164
+  metadata.gz: e79f120d60b74959fcc12a548409403d7b310201
+  data.tar.gz: 1355dac2bec34a8440ef428d41b42f5b2364e47d
 SHA512:
-  metadata.gz: 192219d68fe92f168f9566b1fd4a7d703e36f4bfe048d6f5745eff825f9bab73ad726b597165f7113a26370841949a76624d8bd97f457546d1d505823d444c0d
-  data.tar.gz: bdd8e5306450aebdc381f66ea9392bc01106ef56a124377ffc6a2d11b4716529cd2f24be8d755c8c8285642b8d8ea80df7066b844a2e7d115dda757a888c9aa9
+  metadata.gz: 982e49a7b3126d1f2498cb6977c1cc0d7e3eff40432aa563a54f399c5f727356677f84efd86a07d58b6a3b605641cd7c8e44d79aec3066203d1220eeadcfae1e
+  data.tar.gz: 8cc51781cb52dc28a5b89e5ad55cf1ff28c5547d9390975f7107d0cdee927d35a1a0236f9b99a20e9b3e86df789464570582b9030aeff29b12aefd5cb72736c2

data/lib/ruby-cbc.rb

@@ -9,6 +9,7 @@ files = %w(
   model
   problem
   version
+  ilp/constant
   ilp/constraint
   ilp/objective
   ilp/term

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

@@ -0,0 +1,49 @@
+module Ilp
+  class Constant
+    attr_accessor :value
+    def initialize(value)
+      raise ArgumentError, "Argument is not numeric" unless value.is_a? Numeric
+      @value = value
+    end
+
+    def <=(other)
+      other >= value
+    end
+
+    def <(other)
+      other > value
+    end
+
+    def >=(other)
+      other <= value
+    end
+
+    def >(other)
+      other < value
+    end
+
+    def ==(other)
+      other == value
+    end
+
+    def *(other)
+      other * value
+    end
+
+    def +(other)
+      other + value
+    end
+
+    def -(other)
+      -1 * other + value
+    end
+
+    def to_s
+      value.to_s
+    end
+
+    def pretty_print
+      value.to_s
+    end
+  end
+end

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

@@ -4,8 +4,7 @@ module Ilp
     GREATER_OR_EQ = :greater_or_eq
     EQUALS = :equals
 
-    attr_reader :terms, :type, :bound
-    attr_accessor :function_name
+    attr_accessor :terms, :type, :bound, :function_name
 
     def initialize(terms, type, bound)
       @terms = terms - bound

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

@@ -3,7 +3,7 @@ module Ilp
     MINIMIZE = :min
     MAXIMIZE = :max
 
-    attr_reader :terms, :objective_function
+    attr_accessor :terms, :objective_function
     def initialize(terms, objective_function = MAXIMIZE)
       @terms = terms
       @terms = Ilp::Term.new(@terms) if @terms.is_a? Ilp::Var

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

@@ -1,7 +1,6 @@
 module Ilp
   class Term
-    attr_reader :var
-    attr_accessor :mult
+    attr_accessor :mult, :var
 
     def initialize(var, mult = 1)
       @mult = mult
@@ -28,20 +27,13 @@ module Ilp
       Ilp::TermArray.new([self]) >= other
     end
 
-    def combine_in(other_term)
-      return Term.new(var, mult) unless other_term
-      raise "Terms cannot be combined: #{self} and #{other_term}" unless var.equal? other_term.var
-      other_term.mult += mult
-      other_term
-    end
-
     def *(other)
       raise ArgumentError, "Argument is not numeric" unless other.is_a? Numeric
       Ilp::Term.new(@var, @mult * other)
     end
 
     def coerce(num)
-      [Ilp::TermArray.new([self]), num]
+      [Ilp::Constant.new(num), Ilp::TermArray.new([self])]
     end
 
     def to_s

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

@@ -2,7 +2,7 @@ module Ilp
   class TermArray
     extend Forwardable
 
-    attr_reader :terms
+    attr_accessor :terms
     def_delegators :@terms, :map, :each, :size
 
     def initialize(terms)
@@ -45,8 +45,9 @@ module Ilp
         when Numeric
           constant += term
         when Ilp::Term
-          variable = term.var
-          hterms[variable] = term.combine_in(hterms[variable])
+          v = term.var
+          hterms[v] ||= Ilp::Term.new(v, 0)
+          hterms[v].mult += term.mult
         end
       end
       reduced = hterms.map { |_, term| term unless term.mult.zero? }
@@ -68,7 +69,7 @@ module Ilp
     end
 
     def coerce(value)
-      [value, self]
+      [Ilp::Constant.new(value), self]
     end
 
     def to_s

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

@@ -52,7 +52,7 @@ module Ilp
     end
 
     def coerce(num)
-      [Ilp::Term.new(self), num]
+      [Ilp::Constant.new(num), self]
     end
 
     def to_s

data/lib/ruby-cbc/version.rb

@@ -1,3 +1,3 @@
 module Cbc
-  VERSION = "0.3.16"
+  VERSION = "0.3.17"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-cbc
 version: !ruby/object:Gem::Version
-  version: 0.3.16
+  version: 0.3.17
 platform: ruby
 authors:
 - Guillaume Verger
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-03 00:00:00.000000000 Z
+date: 2018-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -156,6 +156,7 @@ files:
 - bin/setup
 - lib/ruby-cbc.rb
 - lib/ruby-cbc/conflict_solver.rb
+- lib/ruby-cbc/ilp/constant.rb
 - lib/ruby-cbc/ilp/constraint.rb
 - lib/ruby-cbc/ilp/objective.rb
 - lib/ruby-cbc/ilp/term.rb
@@ -186,8 +187,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: Wrapper around Cbc Linear Programming Solver
 test_files: []
+has_rdoc: