rams 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be4a36c1220ddba30d7a7da9efdcac266659d34e
-  data.tar.gz: a23d432c3ae635ab871e731b636242dfe5ba07f5
+  metadata.gz: d1bb406b225c6e4d0a2ebb85d7fd718bbf7def0a
+  data.tar.gz: 4edcbad008f26a175221e69934af3c39a5a013cb
 SHA512:
-  metadata.gz: 1d25d5afca198d57ddb31daa26b8b2306851d28169d296ac8015cfdd38d8bfa557459ed6a7e25a9c99bd3ce8523ba379601c6f2f3b2a6527cf6bf035c23ddc60
-  data.tar.gz: aa0b5a56bc7b9649d4add0046f04ca67f367048e89f99bb3ff5ebbb52a409fa86b1d2f21d01ae77d9ea4b8888034c95e00fef85385d8f6e7d18ef5f98f0319ca
+  metadata.gz: bf69bc70073a7e185b4273237e87474a4f4179599b356488cc2c6b6106bdc18a092723198c6afa087c5e2cd9e3b15e012bc5e348d76db81852d343a7fd36f242
+  data.tar.gz: 81a28f541725580981f6a5e4121edc8d75a4fe290802e2d0a83745c673ba863a8404b2523769a8823172cd6f70cef4ab0b57bce49393c81cca2340874d8e0173

data/lib/rams/constraint.rb

@@ -23,12 +23,6 @@ module RAMS
       "c#{id}"
     end
 
-    def to_s
-      lhs_s = lhs.map { |v, c| "#{c >= 0 ? '+ ' : ''}#{c} #{v.name} " }.join
-      sense_s = sense == :== ? '=' : sense.to_s
-      "#{name}: #{lhs_s}#{sense_s} #{rhs}"
-    end
-
     @next_id = 0
 
     def self.next_id

data/lib/rams/expression.rb

@@ -67,13 +67,6 @@ module RAMS
       RAMS::Constraint.new(lhs(other), :>=, rhs(other))
     end
 
-    def to_s
-      vars_s = coefficients.map { |v, c| "#{c >= 0 ? '+ ' : ''}#{c} #{v.name} " }.join
-      sign_s = constant >= 0 ? '+ ' : ''
-      const_s = constant == 0 ? '' : "#{sign_s}#{constant}"
-      vars_s + const_s
-    end
-
     private
 
     def merge_variables(other)

data/lib/rams/formatters/lp.rb

@@ -0,0 +1,59 @@
+module RAMS
+  module Formatters
+    # LP formatter
+    class LP
+      # rubocop:disable AbcSize
+      def self.format(model)
+        <<-LP
+#{model.sense}
+  obj: #{expression model.objective}
+st
+  #{model.constraints.values.map { |c| constraint c }.join "\n  "}
+bounds
+  #{model.variables.values.map { |v| bounds v }.join "\n  "}
+general
+  #{model.variables.values.select { |v| v.type == :integer }.map(&:name).join "\n  "}
+binary
+  #{model.variables.values.select { |v| v.type == :binary }.map(&:name).join "\n  "}
+end
+        LP
+      end
+      # rubocop:enable AbcSize
+
+      def self.expression(expr)
+        expr_terms = terms(expr.coefficients)
+        expr_terms << constant(expr.constant) unless expr.constant.zero?
+        expr_terms.join(' ').sub(/^\+\s*/, '')
+      end
+
+      def self.constraint(cons)
+        sense_s = cons.sense == :== ? '=' : cons.sense.to_s
+        "#{cons.name}: #{terms(cons.lhs).join(' ').sub(/^\+\s*/, '')} #{sense_s} " +
+          constant(cons.rhs).sub(/^\+\s*/, '')
+      end
+
+      def self.terms(coef)
+        coef.map { |v, c| variable(v, c) }
+      end
+
+      def self.variable(var, coeff)
+        "#{constant(coeff)} #{var.name}"
+      end
+
+      def self.constant(const)
+        "#{const >= 0 ? '+' : '-'} #{const.abs}"
+      end
+
+      def self.bounds(var)
+        return bounds_binary(var) if var.type == :binary
+        "#{var.low.nil? ? '-inf' : var.low} <= #{var.name} <= #{var.high.nil? ? '+inf' : var.high}"
+      end
+
+      def self.bounds_binary(var)
+        low_s = var.low.nil? ? 0.0 : [0.0, var.low].max
+        high_s = var.high.nil? ? 1.0 : [1.0, var.high].min
+        "#{low_s} <= #{var.name} <= #{high_s}"
+      end
+    end
+  end
+end

data/lib/rams/model.rb

@@ -1,10 +1,12 @@
 require 'tempfile'
-require_relative 'variable'
+require_relative 'expression'
+require_relative 'formatters/lp'
 require_relative 'solvers/cbc'
 require_relative 'solvers/clp'
 require_relative 'solvers/cplex'
 require_relative 'solvers/glpk'
 require_relative 'solvers/scip'
+require_relative 'variable'
 
 module RAMS
   # A Model is a collection of:
@@ -29,8 +31,9 @@ module RAMS
   #   m.solve
   #
   class Model
-    attr_accessor :objective, :args, :verbose
+    attr_accessor :args, :verbose
     attr_reader :solver, :sense, :variables, :constraints
+    attr_writer :objective
 
     SOLVERS = {
       cbc: RAMS::Solvers::CBC.new,
@@ -69,34 +72,18 @@ module RAMS
       constraints[constraint.name] = constraint
     end
 
+    def objective
+      @objective || Expression.new(variables.values.first => 0)
+    end
+
     def solve
       raise(ArgumentError, 'model has no variables') if variables.empty?
       raise(ArgumentError, 'model has no constraints') if constraints.empty?
       SOLVERS[solver].solve self
     end
 
-    # rubocop:disable AbcSize
-    def to_s
-      <<-LP
-#{sense}
-  obj: #{feasible_objective.is_a?(Variable) ? feasible_objective.name : feasible_objective}
-st
-  #{constraints.values.map(&:to_s).join("\n  ")}
-bounds
-  #{variables.values.map(&:to_s).join("\n  ")}
-general
-  #{variables.values.select { |v| v.type == :integer }.map(&:name).join("\n  ")}
-binary
-  #{variables.values.select { |v| v.type == :binary }.map(&:name).join("\n  ")}
-end
-      LP
-    end
-    # rubocop:enable AbcSize
-
-    private
-
-    def feasible_objective
-      objective || variables.values.first
+    def to_lp
+      RAMS::Formatters::LP.format self
     end
   end
 end

data/lib/rams/solvers/solver.rb

@@ -18,7 +18,7 @@ module RAMS
 
       def write_model_file(model)
         model_file = Tempfile.new ['', '.lp']
-        model_file.write model.to_s
+        model_file.write model.to_lp
         model_file.close
         model_file
       end

data/lib/rams/variable.rb

@@ -26,23 +26,10 @@ module RAMS
       "v#{id}"
     end
 
-    def to_s
-      return to_s_binary if type == :binary
-      "#{low.nil? ? '-inf' : low} <= #{name} <= #{high.nil? ? '+inf' : high}"
-    end
-
     @next_id = 0
 
     def self.next_id
       @next_id += 1
     end
-
-    private
-
-    def to_s_binary
-      low_s = low.nil? ? 0.0 : [0.0, low].max
-      high_s = high.nil? ? 1.0 : [1.0, high].min
-      "#{low_s} <= #{name} <= #{high_s}"
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rams
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Ryan J. O'Neil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-17 00:00:00.000000000 Z
+date: 2017-01-26 00:00:00.000000000 Z
 dependencies: []
 description: A library for solving MILPs in Ruby.
 email:
@@ -20,6 +20,7 @@ files:
 - lib/rams.rb
 - lib/rams/constraint.rb
 - lib/rams/expression.rb
+- lib/rams/formatters/lp.rb
 - lib/rams/model.rb
 - lib/rams/numeric.rb
 - lib/rams/solution.rb