amor 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72757cf7317f8c6f13c187a67ad6d62697d9af49
-  data.tar.gz: 770eaad8ad91d9d2772e191c499ccbcc267af955
+  metadata.gz: 46282019baa1044124775c91d8e2aae1c46156a5
+  data.tar.gz: 4cbb2861f562e55943517188594c84cffb22f4f4
 SHA512:
-  metadata.gz: 48c8b6a7c69e8f45676492f04c96469d6ac6de992f97bba0d15fb05747c8702c905549e41bd1d234a632d3c19f48229723fc66e9aee86e7d174834d69ac699b3
-  data.tar.gz: f1c4c7140e3c676905860f7329ce0b43da472da7ea549142c90d0f3c4ab08d8a04374094ba89fbba9c89efbc3f20aa10a768baf22512057f6442eced110b3d5e
+  metadata.gz: f2b827c94fc45987b12ece82d7eee41528933ee3df684eef112704239f7799e101003b8e639ff54b01aee73ca17c6b8d74a83afaafa9037985c067d1ad51ee0c
+  data.tar.gz: 1d7864300b2030f1b1c2ad2dc276ab75d5282b031d1f6b2360a0b35ace42af032ac6d78184a1e94dd6c6ccd88fb6f789090eebace885164e9ec9265b7804de48

data/lib/amor/model.rb

@@ -8,28 +8,33 @@ module Amor
     def initialize
       @variables = Array.new
       @indices = Hash.new
+      @constraints = Array.new
     end
 
     # Return the variable for that index if already existing or a new one
     def x(index)
       @variables[@indices[index] ||= @indices.size] ||= Variable.new(self, index)
     end
+    alias :var :x
 
     # Add a minimization objective
     def min(expression)
       @objective = Objective.new(:minimize, expression)
     end
+    alias :minimize :min
 
     # Add a maximization objective
     def max(expression)
       @objective = Objective.new(:maximize, expression)
     end
+    alias :maximize :max
 
     # Add a constraint
     def st(constraint)
-      (@constraints ||= Array.new) << constraint
+      @constraints << constraint
       return constraint
     end
+    alias :subject_to :st
 
     # Create a model from a given string
     def self.from_string(string)
@@ -53,6 +58,21 @@ module Amor
       result << @constraints.each_with_index.map do |constraint, i|
         " c#{i+1}: #{constraint.lp_string}"
       end.join("\n")
+
+      # Bounds section
+      bounded_vars = @variables.each_with_index.select{|v| v[0].lb}
+      result << "\nBounds" if bounded_vars.size > 0
+      bounded_vars.each{|v| result << "\n 0 <= x#{v[1]+1}"}
+
+      # Variable type section
+      integer_vars = @variables.each_with_index.select{|v| v[0].type == :integer}
+      result << "\nGenerals\n " if integer_vars.size > 0
+      result << integer_vars.map{|v| "x#{v[1]+1}"}.join(" ")
+
+      binary_vars = @variables.each_with_index.select{|v| v[0].type == :binary}
+      result << "\nBinary\n " if binary_vars.size > 0
+      result << binary_vars.map{|v| "x#{v[1]+1}"}.join(" ")
+
       result << "\nEnd"
       return result
     end
@@ -61,5 +81,38 @@ module Amor
       File.open(filename, 'w') {|file| file.puts self.lp_string}
     end
 
+    def for_all(container)
+      container.each do |e|
+        result = yield(e)
+        if result.is_a?(Constraint)
+          self.st result
+        end
+      end
+      return nil
+    end
+    alias :forall :for_all
+
+    def sum(container)
+      container[1..-1].inject(yield(container[0])) do |m, e|
+        m + yield(e)
+      end
+    end
+
+    def integer(variable)
+      variable.type = :integer
+      return variable
+    end
+    alias :int :integer
+
+    def binary(variable)
+      variable.type = :binary
+      return variable
+    end
+    alias :bin :binary
+
+    def positive(variable)
+      variable.lb = 0
+      return variable
+    end
   end
 end

data/lib/amor/variable.rb

@@ -3,6 +3,10 @@ module Amor
 
     attr_reader :model, :index
 
+    attr_accessor :type, :lb, :ub
+    alias :lower_bound :lb
+    alias :upper_bound :ub
+
     def initialize(model, index)
       @model = model
       @index = index

data/lib/amor/version.rb

@@ -1,3 +1,3 @@
 module Amor
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

data/spec/amor/model_spec.rb

@@ -110,10 +110,74 @@ module Amor
       end
     end
 
-    describe '.lp_string' do
+    describe '#lp_string' do
       it 'returns a LP Format ready string of the model' do
-        model = Model.from_string("min x(3) + 3 * x(2) + 4.0\nst x(2) - 2.0 * x(3) <= 5.0")
-        expect(model.lp_string).to eq("Minimize\n obj: 1 x1 + 3 x2 + 4.0\nSubject To\n c1: 1 x2 - 2.0 x1 <= 5.0\nEnd")
+        model = Model.from_string("min x(3) + 3 * x(2) + 4.0\nst x(2) - 2.0 * x(3) <= 5.0\nbinary x(2)\npositive integer x(3)")
+        expect(model.lp_string).to eq("Minimize\n obj: 1 x1 + 3 x2 + 4.0\nSubject To\n c1: 1 x2 - 2.0 x1 <= 5.0\nBounds\n 0 <= x1\nGenerals\n x1\nBinary\n x2\nEnd")
+      end
+    end
+
+    describe '#for_all' do
+      it 'repeats the block for each element in the provided collection' do
+        expect { |b| @model.for_all([1,2,3], &b) }.to yield_control.exactly(3).times
+      end
+
+      it 'calls the block with the elements from the provided collection' do
+        expect { |b| @model.for_all([1,2,4], &b) }.to yield_successive_args(1,2,4)
+      end
+
+      it 'returns nil' do
+        expect(@model.for_all([1,2]) {}).to eq(nil)
+      end
+
+      it 'registers a Constraint with the model' do
+        c = []
+        @model.for_all([1,2]) {|i| c[i] = (@model.x(i) <= i)}
+        expect(@model.constraints).to include(c[1])
+        expect(@model.constraints).to include(c[2])
+      end
+    end
+
+    describe '#sum' do
+      it 'returns an Expression' do
+        expect(@model.sum([1,2]) {|i| @model.x(i)}).to be_a(Expression)
+      end
+
+      it 'sums up the results from the provided block for each element in the collection' do
+        expect(@model.sum([1,2,3]) {|i| i * @model.x(i)}).to eql(@model.x(1) + 2 * @model.x(2) + 3 * @model.x(3))
+      end
+    end
+
+    describe '#integer' do
+      it 'returns a Variable' do
+        expect(@model.integer(@model.x(1))).to be_a(Variable)
+      end
+
+      it 'sets the type of the Variable to :integer' do
+        @model.integer(@model.x(1))
+        expect(@model.x(1).type).to eq(:integer)
+      end
+    end
+
+    describe '#binary' do
+      it 'returns a Variable' do
+        expect(@model.binary(@model.x(1))).to be_a(Variable)
+      end
+
+      it 'sets the type of the Variable to :binary' do
+        @model.binary(@model.x(1))
+        expect(@model.x(1).type).to eq(:binary)
+      end
+    end
+
+    describe '#positive' do
+      it 'returns a Variable' do
+        expect(@model.positive(@model.x(1))).to be_a(Variable)
+      end
+
+      it 'sets the variables lower bound to 0' do
+        @model.positive(@model.x(1))
+        expect(@model.x(1).lb).to eq(0)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amor
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Florian Dahms
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-22 00:00:00.000000000 Z
+date: 2014-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler