amor 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46282019baa1044124775c91d8e2aae1c46156a5
-  data.tar.gz: 4cbb2861f562e55943517188594c84cffb22f4f4
+  metadata.gz: 31492f2a4a6321ec6ad50a028c7e0a072c32131b
+  data.tar.gz: 2d11c7147c51de95267d0ae69ddefcd858fab2c3
 SHA512:
-  metadata.gz: f2b827c94fc45987b12ece82d7eee41528933ee3df684eef112704239f7799e101003b8e639ff54b01aee73ca17c6b8d74a83afaafa9037985c067d1ad51ee0c
-  data.tar.gz: 1d7864300b2030f1b1c2ad2dc276ab75d5282b031d1f6b2360a0b35ace42af032ac6d78184a1e94dd6c6ccd88fb6f789090eebace885164e9ec9265b7804de48
+  metadata.gz: 8b6a4b028958ab03e30430cd6c75b5df531944eaffe99628c2df3d8600f98c98f8fbb2eeda4280e17a58317c112a9fe540204004d2dfe6663e72fdf8d6b70ef4
+  data.tar.gz: 5efcbc2c466fac5623951a281753b1a3f995cc2cd85b20a6dfe6ec24dd54288ad2e17c64bdd336795f12c1b1e090cf1741d586187d87565b46be6d2b7fad5db0

data/README.md

@@ -18,7 +18,7 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+Visit <a href='http://amor-gem.com'>amor-gem.com</a> for further information
 
 ## Contributing
 

data/amor.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["me@fdahms.com"]
   spec.summary       = "A versatile, yet simple modelling language for mathematical programming"
   spec.description   = "AMoR is a Ruby DSL for mathematical programming. It allows to simply define a mathematical program, but gives you all the features from Ruby for more complex projects"
-  spec.homepage      = ""
+  spec.homepage      = "http://amor-gem.com"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")

data/lib/amor/model.rb

@@ -3,7 +3,7 @@ require 'amor/objective'
 module Amor
   class Model
 
-    attr_reader :objective, :constraints
+    attr_reader :constraints, :solved, :bounded
 
     def initialize
       @variables = Array.new
@@ -13,10 +13,25 @@ module Amor
 
     # 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)
+      variable = @variables[@indices[index] ||= @indices.size] ||= Variable.new(self, index)
+      if @solved
+        variable.value || 0
+      else
+        variable
+      end
     end
     alias :var :x
 
+    def objective
+      if @solved
+        @objective_value
+      else
+        @objective
+      end
+    end
+    alias :obj :objective
+
+
     # Add a minimization objective
     def min(expression)
       @objective = Objective.new(:minimize, expression)
@@ -114,5 +129,39 @@ module Amor
       variable.lb = 0
       return variable
     end
+
+    def scip
+      self.save_lp('__temp.lp')
+      scip_result = `scip -f __temp.lp`
+      File.delete('__temp.lp')
+
+      solution_section = false
+      scip_result.each_line do |line|
+        if line =~ /problem is solved \[([\w\s]*)\]/
+          @solved = true
+          if $1 == 'optimal solution found'
+            @bounded = true
+          elsif $1 == 'unbounded'
+            @bounded = false
+          else
+            raise 'Unknown solve status'
+          end
+        end
+
+        solution_section = true if line =~ /primal solution:/
+        solution_section = false if line =~ /Statistics/n
+
+        if solution_section
+          @objective_value = $1 if line =~ /objective value:\s*([\.\d]+)/
+          if line =~ /x(\d+)\s*([\.\d]+)/
+            @variables[$1.to_i-1].value = $2.to_f
+          end
+        end
+      end
+
+    rescue Errno::ENOENT => e
+      puts "Could not find SCIP. Please make sure that SCIP is installed and you can execute 'scip'."
+      raise e
+    end
   end
 end

data/lib/amor/variable.rb

@@ -3,7 +3,7 @@ module Amor
 
     attr_reader :model, :index
 
-    attr_accessor :type, :lb, :ub
+    attr_accessor :type, :lb, :ub, :value
     alias :lower_bound :lb
     alias :upper_bound :ub
 

data/lib/amor/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amor
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Florian Dahms
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-23 00:00:00.000000000 Z
+date: 2014-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,7 +100,7 @@ files:
 - spec/amor/objective_spec.rb
 - spec/amor/variable_spec.rb
 - spec/spec_helper.rb
-homepage: ''
+homepage: http://amor-gem.com
 licenses:
 - MIT
 metadata: {}
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A versatile, yet simple modelling language for mathematical programming