ruby-cbc 0.3.13 → 0.3.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 272b8de4efdc665ae9bee9f0ee6f772d57c7c59a
-  data.tar.gz: 95bf23cd92a5d1c42b79c1a70fdab508e71ed1c3
+  metadata.gz: d514718856124b2c3fc5e3e09fdabfd2f2d59595
+  data.tar.gz: b092657bba86b6994f7064beb80ae43f95b11677
 SHA512:
-  metadata.gz: 244b5f78ce28e5551a91a585a0fa62059c4858229e65a168f70ad7a11a28a219c5d4421f821f68efc9db77e57ff2f608486135fb222643a60b3a3e5029e0d5f7
-  data.tar.gz: f1afc4bc47beeee8df16c89557f86d08af93d5a9fee67035f4e22c63b6e918c08c0259f74bf39ad54a74cf75f02911cb614a0942270f13a4de3175518f4f4628
+  metadata.gz: daebded03c047f67704f9e9f955b83bccc204637a1448712a0a5c349d7913fe5da4513cce2fe0944b8e5eebc8c38989310594d31098203375e1132c8437b00b7
+  data.tar.gz: b52e132ab1cfc3db2df67ca2129e02d44458db05f889c27b8d4e109808338419e65b4a9d83f27fb9cfaa1d99d2a492d7d9976d4203dc0ff0e00e3ef7500242de

data/bin/console

@@ -1,14 +1,11 @@
 #!/usr/bin/env ruby
 
 require "bundler/setup"
-require "cbc"
+require "ruby-cbc"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
 
 # (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start
+require "pry"
+Pry.start

data/lib/ruby-cbc.rb

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

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

@@ -4,7 +4,8 @@ module Ilp
     GREATER_OR_EQ = :greater_or_eq
     EQUALS = :equals
 
-    attr_accessor :terms, :type, :bound, :function_name
+    attr_reader :terms, :type, :bound
+    attr_accessor :function_name
 
     def initialize(terms, type, bound)
       @terms = terms - bound
@@ -24,7 +25,7 @@ module Ilp
     SIGN_TO_STRING = {
       LESS_OR_EQ => "<=",
       GREATER_OR_EQ => ">=",
-      EQUALS => "=="
+      EQUALS => "="
     }
 
     def to_s

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

@@ -3,7 +3,7 @@ module Ilp
     MINIMIZE = :min
     MAXIMIZE = :max
 
-    attr_accessor :terms, :objective_function
+    attr_reader :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,6 +1,7 @@
 module Ilp
   class Term
-    attr_accessor :mult, :var
+    attr_reader :var
+    attr_accessor :mult
 
     def initialize(var, mult = 1)
       @mult = mult
@@ -27,6 +28,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)

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

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

data/lib/ruby-cbc/version.rb

@@ -1,3 +1,3 @@
 module Cbc
-  VERSION = "0.3.13"
+  VERSION = "0.3.14"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-cbc
 version: !ruby/object:Gem::Version
-  version: 0.3.13
+  version: 0.3.14
 platform: ruby
 authors:
 - Guillaume Verger
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-23 00:00:00.000000000 Z
+date: 2017-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -156,7 +156,6 @@ 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

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

@@ -1,49 +0,0 @@
-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