amor 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31492f2a4a6321ec6ad50a028c7e0a072c32131b
-  data.tar.gz: 2d11c7147c51de95267d0ae69ddefcd858fab2c3
+  metadata.gz: 1ec00e3d5906aa7d712edca9dec76af8e9abb836
+  data.tar.gz: 0cbe07d9db38b005d5d99d970cd13825f73fc82f
 SHA512:
-  metadata.gz: 8b6a4b028958ab03e30430cd6c75b5df531944eaffe99628c2df3d8600f98c98f8fbb2eeda4280e17a58317c112a9fe540204004d2dfe6663e72fdf8d6b70ef4
-  data.tar.gz: 5efcbc2c466fac5623951a281753b1a3f995cc2cd85b20a6dfe6ec24dd54288ad2e17c64bdd336795f12c1b1e090cf1741d586187d87565b46be6d2b7fad5db0
+  metadata.gz: af840f1e2654c95b22fe84de7b15560b802f116f024cd4d709f4d7026307b2220ad2c50aed3a326ab09c3b7cbf6e234fe686eb97464091a524a77ae1de60e6cb
+  data.tar.gz: 5ed46fe705dbb87ff6a6201e043205709c7cafd9f420686edf7c85e356b6b87dca2b4ed406f40405f6b5dd2e600172f5b18dd733e25a5964d2ed3987d0755aaf

data/lib/amor/block.rb

@@ -0,0 +1,24 @@
+module Amor
+  class Block
+    attr_reader :constraints
+
+    def initialize
+      @constraints = Array.new
+    end
+
+    def add_constraint constraint
+      @constraints << constraint
+    end
+
+    # Returns a representation for .dec file format of this block
+    # It assumes the block has the specified index
+    def dec_string index
+      result = ["BLOCK #{index}"]
+      @constraints.each do | constraint |
+        result << constraint.lp_name
+      end
+
+      result.join("\n")
+    end
+  end
+end

data/lib/amor/constraint.rb

@@ -1,6 +1,7 @@
 module Amor
   class Constraint
     attr_reader :lhs, :rhs, :relation
+    attr_accessor :index
 
     def initialize(lhs, relation, rhs)
       @lhs = Expression.new(lhs)
@@ -19,7 +20,11 @@ module Amor
           "="
         end
 
-      "#{temp_lhs.remove_constants.lp_string} #{relation_string} #{-temp_lhs.constant_factor}"
+      "#{lp_name}: #{temp_lhs.remove_constants.lp_string} #{relation_string} #{-temp_lhs.constant_factor}"
+    end
+
+    def lp_name
+      "c#{index+1}"
     end
 
     def to_s

data/lib/amor/model.rb

@@ -3,7 +3,7 @@ require 'amor/objective'
 module Amor
   class Model
 
-    attr_reader :constraints, :solved, :bounded
+    attr_reader :constraints, :solved, :bounded, :blocks
 
     def initialize
       @variables = Array.new
@@ -46,7 +46,9 @@ module Amor
 
     # Add a constraint
     def st(constraint)
+      constraint.index = @constraints.size
       @constraints << constraint
+      @in_block.add_constraint(constraint) if @in_block
       return constraint
     end
     alias :subject_to :st
@@ -71,7 +73,7 @@ module Amor
       result = @objective.lp_string
       result << "\nSubject To\n"
       result << @constraints.each_with_index.map do |constraint, i|
-        " c#{i+1}: #{constraint.lp_string}"
+        " #{constraint.lp_string}"
       end.join("\n")
 
       # Bounds section
@@ -133,8 +135,17 @@ module Amor
     def scip
       self.save_lp('__temp.lp')
       scip_result = `scip -f __temp.lp`
+      File.open('scip.log', 'w') {|file| file.puts scip_result}
       File.delete('__temp.lp')
 
+      parse_scip_output scip_result
+
+    rescue Errno::ENOENT => e
+      puts "Could not find SCIP. Please make sure that SCIP is installed and you can execute 'scip'."
+      raise e
+    end
+
+    def parse_scip_output(scip_result)
       solution_section = false
       scip_result.each_line do |line|
         if line =~ /problem is solved \[([\w\s]*)\]/
@@ -158,9 +169,48 @@ module Amor
           end
         end
       end
+    end
+
+    # Creates a new block and makes sure that constraints added in yield are added to block
+    def block
+      (@blocks ||= Array.new) << Block.new
+      @in_block = @blocks.last
+      yield
+      @in_block = nil
+    end
+
+    def dec_string
+      result = ["PRESOLVED 0", "NBLOCKS #{@blocks.size}"]
+
+      @blocks.each_with_index do |block, i|
+        result << block.dec_string(i + 1)
+      end
+
+      result << "MASTERCONSS"
+      # Remaining constraints
+      @blocks.inject(@constraints) {|mem, block| mem - block.constraints}.each do |constraint|
+        result << constraint.lp_name
+      end
+
+      result.join("\n")
+    end
+
+    def save_dec(filename)
+      File.open(filename, 'w') {|file| file.puts self.dec_string}
+    end
+
+    def gcg
+      self.save_lp('__temp.lp')
+      self.save_dec('__temp.dec')
+      gcg_result = `gcg -f __temp.lp -d __temp.dec`
+      File.open('gcg.log', 'w') {|file| file.puts gcg_result}
+      File.delete('__temp.lp')
+      File.delete('__temp.dec')
+
+      parse_scip_output gcg_result
 
     rescue Errno::ENOENT => e
-      puts "Could not find SCIP. Please make sure that SCIP is installed and you can execute 'scip'."
+      puts "Could not find GCG. Please make sure that GCG is installed and you can execute 'gcg'."
       raise e
     end
   end

data/lib/amor/version.rb

@@ -1,3 +1,3 @@
 module Amor
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/amor.rb

@@ -6,3 +6,4 @@ require 'amor/model'
 require 'amor/numeric_extensions'
 require 'amor/objective'
 require 'amor/variable'
+require 'amor/block'

data/spec/amor/block_spec.rb

@@ -0,0 +1,27 @@
+require 'amor/block'
+
+module Amor
+  describe Block do
+    describe '#add_contraint' do
+      it 'adds a constraint' do
+        block = Block.new
+        constraint = double('Constraint')
+        block.add_constraint(constraint)
+        expect(block.constraints[0]).to eq(constraint)
+      end
+    end
+
+    describe '#dec_string' do
+      it 'returns a representation of the block for the .dec file format' do
+        constraint1 = double('Constraint')
+        allow(constraint1).to receive(:lp_name).and_return('c1')
+        constraint2 = double('Constraint')
+        allow(constraint2).to receive(:lp_name).and_return('c2')
+        block = Block.new
+        block.add_constraint(constraint1)
+        block.add_constraint(constraint2)
+        expect(block.dec_string(1)).to eq("BLOCK 1\nc1\nc2")
+      end
+    end
+  end
+end

data/spec/amor/constraint_spec.rb

@@ -27,7 +27,19 @@ module Amor
         v1 = model.x(1)
         v2 = model.x(2)
         v3 = model.x(3)
-        expect(Constraint.new(Expression.new([[3, v1], [-2.0, v2], [2, :constant], [2.5, v3]]), :lesser_equal, Expression.new(5)).lp_string).to eq('3 x1 - 2.0 x2 + 2.5 x3 <= 3')
+        constraint = model.st(Constraint.new(Expression.new([[3, v1], [-2.0, v2], [2, :constant], [2.5, v3]]), :lesser_equal, Expression.new(5)))
+        expect(constraint.lp_string).to eq('c1: 3 x1 - 2.0 x2 + 2.5 x3 <= 3')
+      end
+    end
+
+    describe '#lp_name' do
+      it 'returns the indexed contraint name' do
+        model = Model.new
+        v1 = model.x(1)
+        v2 = model.x(2)
+        v3 = model.x(3)
+        constraint = model.st(Constraint.new(Expression.new([[3, v1], [-2.0, v2], [2, :constant], [2.5, v3]]), :lesser_equal, Expression.new(5)))
+        expect(constraint.lp_name).to eq("c1")
       end
     end
 

data/spec/amor/model_spec.rb

@@ -87,6 +87,18 @@ module Amor
         @model.st(@constraint)
         expect(@model.constraints).to include(@constraint)
       end
+
+      it 'stores the index, which the constraint has in the model' do
+        @model.st(@constraint)
+        expect(@model.constraints[0].index).to eq(0)
+      end
+
+      it 'adds constraint to block if a block is given' do
+        @model.block do
+          @model.st(@constraint)
+        end
+        expect(@model.blocks.last.constraints).to include(@constraint)
+      end
     end
 
 
@@ -180,5 +192,43 @@ module Amor
         expect(@model.x(1).lb).to eq(0)
       end
     end
+
+    describe '#block' do
+      it 'yields' do
+        expect { |b| @model.block(&b) }.to yield_control
+      end
+
+      it 'sets @in_block to current block within yield' do
+        @model.block do
+          expect(@model.instance_variable_get('@in_block').class).to eq(Block)
+        end
+      end
+
+      it 'sets @in_block to nil before leaving' do
+        @model.block do
+        end
+        expect(@model.instance_variable_get('@in_block')).to eq(nil)
+      end
+
+      it 'adds a new block to the model' do
+        @model.block { }
+        expect(@model.blocks.size).to eq(1)
+      end
+    end
+
+    describe '#dec_string' do
+      it 'returns a string representation of specified decomposition in .dec file format' do
+        @model.st(@model.x(1) + @model.x(2) >= 3)
+        @model.block do
+          @model.st(@model.x(1) + @model.x(3) <= 1)
+          @model.st(@model.x(2) - @model.x(4) <= 2)
+        end
+        @model.block do
+          @model.st(@model.x(1) - @model.x(5) >= 1)
+        end
+        @model.st(@model.x(3) + @model.x(4) == 2)
+        expect(@model.dec_string).to eq("PRESOLVED 0\nNBLOCKS 2\nBLOCK 1\nc2\nc3\nBLOCK 2\nc4\nMASTERCONSS\nc1\nc5")
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amor
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Florian Dahms
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-24 00:00:00.000000000 Z
+date: 2014-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,6 +86,7 @@ files:
 - amor.sublime-project
 - bin/amor
 - lib/amor.rb
+- lib/amor/block.rb
 - lib/amor/constraint.rb
 - lib/amor/expression.rb
 - lib/amor/model.rb
@@ -93,6 +94,7 @@ files:
 - lib/amor/objective.rb
 - lib/amor/variable.rb
 - lib/amor/version.rb
+- spec/amor/block_spec.rb
 - spec/amor/constraint_spec.rb
 - spec/amor/expression_spec.rb
 - spec/amor/model_spec.rb
@@ -120,11 +122,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: A versatile, yet simple modelling language for mathematical programming
 test_files:
+- spec/amor/block_spec.rb
 - spec/amor/constraint_spec.rb
 - spec/amor/expression_spec.rb
 - spec/amor/model_spec.rb