rulp 0.0.14 → 0.0.15

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YzYxYzBjMTNmYmFhN2MxY2MwOGVmZTgzZmEzNTBlZTczMzAzODg4YQ==
-  data.tar.gz: !binary |-
-    OGYxNzNjODE3YmJmMWVjYzU5MjFhOWM2NTg2OWQ2ZTY2MTI3ZTEyYg==
+SHA1:
+  metadata.gz: e2294411951f1ca37ef2ffe418a7b28ee3af92a9
+  data.tar.gz: 800d2fb52a1f6dba2f671bf026b0696eeada97e2
 SHA512:
-  metadata.gz: !binary |-
-    YTZhMmIyYjdkMGZhNzFjM2VkNDBjNjZkOTBjYWU1YjNjMmQzOGRiMDUxNWZm
-    MmQwNmJkZWIzZjczMjU3YTAzNTc4NjFlYTgzNWIyMjIxYTI3ODM4ZDkwNTcy
-    Y2Y1N2RjM2I4N2U4YzFmNjVhYzI0N2FkMzAwZGIyMzBmNzY0Nzk=
-  data.tar.gz: !binary |-
-    YzllNGI2NTQxZDcyNGU0OWQxYjg0MjM4NjY5YTRlNDFkMWYzZTU0NDMzODFj
-    NjRiYzc3Njc5NjAwZWEwZDBjYzg3NGU3ZjNkNGM1MDdlM2EwY2NjOWQzOGI1
-    ZmU5YWFlNjM5MDI5N2ZlZDFkZWE5ZDIyNjk0MGNmZTdhOTQyODM=
+  metadata.gz: c34eb327344222dbde5e0184aeda3dd35c0f809666c80641e787859821085c8a7d0d5f6d33065c700d86ff989713d651c3f2b4273e089e8878aa2f06b20009c0
+  data.tar.gz: a947a74465255076740c4c8ea459a12546c5bacc7f5234410f6bf516bfcc42d640f9fbbfd2b6d6e5c6c3e9450009fa0dd0950212c9736108f5bdd3b2ede44ad5

data/lib/rulp.rb

@@ -1,2 +1,3 @@
 STDOUT.sync = true
+require 'pry'
 require_relative 'rulp/rulp'

data/lib/rulp/lv.rb

@@ -77,9 +77,19 @@ class LV
     end
   end
 
+  def value?
+    value ? value : false
+  end
+
+  def selected?
+    value?
+  end
+
   def inspect
     "#{name}#{args.join("-")}(#{suffix})[#{value || 'undefined'}]"
   end
+
+  alias_method :selected?, :value?
 end
 
 class BV < LV;

data/lib/rulp/rulp.rb

@@ -4,7 +4,7 @@ require_relative "lv"
 require_relative "constraint"
 require_relative "expression"
 
-require_relative "../solvers/solvers"
+require_relative "../solvers/solver"
 require_relative "../extensions/extensions"
 require_relative "../helpers/log"
 
@@ -74,6 +74,7 @@ module Rulp
     end
 
     def [](*constraints)
+      constraints.flatten!
       @constraints.concat(constraints)
       @variables.merge(constraints.map(&:variables).flatten)
       self
@@ -136,10 +137,10 @@ module Rulp
       filename = get_output_filename
       solver = SOLVERS[type].new(filename, options)
 
-      "Writing problem".log(:info)
-      IO.write(filename, self)
+        "Writing problem".log(:info)
+        IO.write(filename, self)
 
-      `open #{filename}` if options[:open_definition]
+        `open #{filename}` if options[:open_definition]
 
       "Solving problem".log(:info)
       _, time = _profile{ solver.solve }
@@ -161,6 +162,16 @@ module Rulp
       to_s
     end
 
+    def write(output)
+      output.puts "#{@objective}"
+      output.puts " obj: #{@objective_expression}"
+      output.puts "Subject to"
+      output.puts "#{constraints}"
+      output.puts "Bounds"
+      output.puts "#{bounds}#{integers}#{bits}"
+      output.puts "End"
+    end
+
     def to_s
       %Q(
 #{'  '*0}#{@objective}

data/lib/solvers/cbc.rb

@@ -1,7 +1,4 @@
 class Cbc < Solver
-
-  #maxN
-
   def solve
     if options[:parallel]
       command =  "#{executable} #{@filename} %s %s threads 8 branch solution #{@outfile}"

data/lib/solvers/{solvers.rb → solver.rb}

@@ -28,6 +28,25 @@ class Solver
   def self.exists?
     return `which #{self.executable}`.length != 0
   end
+
+  def next_pipe
+    filename = "./tmp/_rulp_pipe"
+    file_index = 1
+    file_index += 1 while File.exists?("#{filename}_#{file_index}")
+    pipe = "#{filename}_#{file_index}"
+    `mkfifo #{pipe}`
+    pipe
+  end
+
+  def with_pipe(pipe)
+    output = open(pipe, 'w+')
+    thread = Thread.new{
+      yield output
+      output.flush
+    }
+    return thread, output
+  end
+
 end
 
 require_relative 'cbc'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rulp
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Wouter Coppieters
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-09 00:00:00.000000000 Z
+date: 2015-07-31 00:00:00.000000000 Z
 dependencies: []
 description: A simple Ruby LP description DSL
 email: wc@pico.net.nz
@@ -36,7 +36,7 @@ files:
 - lib/solvers/glpk.rb
 - lib/solvers/gurobi.rb
 - lib/solvers/scip.rb
-- lib/solvers/solvers.rb
+- lib/solvers/solver.rb
 - test/test_basic_suite.rb
 - test/test_boolean.rb
 - test/test_helper.rb
@@ -51,17 +51,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ruby Linear Programming