rulp 0.0.22 → 0.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 912368647d83dea0e265b19db45e2fd01ca13eae
-  data.tar.gz: 5021fac9d0b62dc4a4160ce43cdf1c085327d632
+  metadata.gz: 6efb7eb7ffab874e21b74ad4c7e7c8288bd9a1e7
+  data.tar.gz: 31f181cdbb431e6b9e22e86fd555a83f73d773e4
 SHA512:
-  metadata.gz: 72b4248581c87d1cace2d073667ba70de3b02f9381d16e483454d162422e69f887ea08d4596c0353f7e602c8915f0348af73bd413ec8ea22426153eb2078b25e
-  data.tar.gz: 15b32b970cf4d0404f5c160831f3b2dc08851633d39377be87ffeef3c4506b5a00577f130d52437b47bc224479c76404a9ca266925648467178f0fba637f46fd
+  metadata.gz: d626aeecb10b6223689f447ce7489a607fe1cc832dba72879442c3b7d84d3e5f9844587c708eefcec61f7fe775ba65180b93890a19ea19414596f56a1b7f0458
+  data.tar.gz: d47b81d18089719e3fefc9848cf8806a8d4e11dd79c3dc5f9cb9f15a3b233d153240f6dbc6851777c98cf9c694395aa7ce11001da1cd16462e9ed26e5c584a4e

data/lib/helpers/log.rb

@@ -1,83 +1,36 @@
-##
-# Basic logger module.
-# Allows logging in the format
-#
-# "This is a string".log(:debug)
-# "Oh no!".log(:error)
-#
-# Log level is set as follows.
-# Rulp::Logger::level = :debug
-#
-##
-module Rulp
-  module Logger
-    DEBUG = 5
-    INFO  = 4
-    WARN  = 3
-    ERROR = 2
-    OFF   = 1
-
-    LEVELS = {
-      debug: DEBUG,
-      info: INFO,
-      warn: WARN,
-      error: ERROR,
-      off: OFF
-    }
+require 'logger'
 
-    def self.level=(value)
-      raise StandardError.new("#{value} is not a valid log level") unless LEVELS[value]
-      @@level = value
-    end
+module Rulp
+  module Log
 
-    def self.level
-      @@level || :info
+    def print_solver_outputs=(print)
+      @@print_solver_outputs = print
     end
 
-    def self.print_solver_outputs
-      @@solver_level
+    def print_solver_outputs
+      @@print_solver_outputs
     end
 
-    def self.print_solver_outputs=(value)
-      @@solver_level = value
+    def log_level=(level)
+      @@log_level = level
     end
 
-    def self.log(level, message)
-      if(LEVELS[level].to_i <= LEVELS[self.level])
-        puts("[#{colorize(level)}] #{message}")
-      end
+    def log_level
+      @@log_level || Logger::DEBUG
     end
 
-    def self.colorize(level)
-      if defined?(Pry) && Pry.color
-        case level.to_sym
-        when :debug
-          Pry::Helpers::Text.cyan(level)
-        when :info
-          Pry::Helpers::Text.green(level)
-        when :warn
-          Pry::Helpers::Text.magenta(level)
-        when :error
-          Pry::Helpers::Text.red(level)
-        end
-      else
-        level
+    def log(level, message)
+      if level >= self.log_level
+        self.logger.add(level, message)
       end
     end
 
-    self.level = :info
-    self.print_solver_outputs = true
-
-    class ::String
-      def log(level)
-        Logger::log(level, self)
-      end
+    def logger=(logger)
+      @@logger = logger
     end
 
-    class ::Array
-      def log(level, sep="\n")
-        Logger::log(level, self.join("#{sep}[#{level}] "))
-      end
+    def logger
+      @@logger = Logger.new(STDOUT)
     end
   end
 end

data/lib/rulp/rulp.rb

@@ -10,6 +10,7 @@ require_relative "../helpers/log"
 
 require 'set'
 require 'open3'
+require 'logger'
 
 GLPK  = "glpsol"
 SCIP  = "scip"
@@ -18,6 +19,9 @@ GUROBI = "gurobi_cl"
 
 module Rulp
   attr_accessor :expressions
+  extend Rulp::Log
+  self.print_solver_outputs = true
+
   MIN = "Minimize"
   MAX = "Maximize"
 
@@ -33,6 +37,7 @@ module Rulp
     GUROBI   => Gurobi,
   }
 
+
   def self.Glpk(lp, opts={})
     lp.solve_with(GLPK, opts)
   end
@@ -50,12 +55,12 @@ module Rulp
   end
 
   def self.Max(objective_expression)
-    "Creating maximization problem".log :info
+    Rulp.log(Logger::INFO, "Creating maximization problem")
     Problem.new(Rulp::MAX, objective_expression)
   end
 
   def self.Min(objective_expression)
-    "Creating minimization problem".log :info
+    Rulp.log(Logger::INFO, "Creating minimization problem")
     Problem.new(Rulp::MIN, objective_expression)
   end
 
@@ -68,9 +73,9 @@ module Rulp
 
   def self.exec(command)
     result = ""
-    Open3.popen2e("#{command} #{Rulp::Logger.print_solver_outputs ? "" : "> /dev/null 2>&1"}") do | inp, out, thr|
+    Open3.popen2e("#{command} #{Rulp.print_solver_outputs ? "" : "> /dev/null 2>&1"}") do | inp, out, thr|
       out.each do |line|
-        puts line
+        Rulp.log(Logger::DEBUG, line)
         result << line
       end
     end
@@ -90,13 +95,13 @@ module Rulp
     end
 
     def [](*constraints)
-      "Got constraints".log(:info)
+      Rulp.log(Logger::INFO, "Got constraints")
       constraints.flatten!
-      "Flattened constraints".log(:info)
+      Rulp.log(Logger::INFO, "Flattened constraints")
       @constraints.concat(constraints)
-      "Joint constraints".log(:info)
+      Rulp.log(Logger::INFO, "Joint constraints")
       @variables.merge(constraints.flat_map(&:variables).uniq)
-      "Extracted variables".log(:info)
+      Rulp.log(Logger::INFO, "Extracted variables")
       self
     end
 
@@ -152,22 +157,23 @@ module Rulp
     end
 
     def solve_with(type, options={})
+
       filename = get_output_filename
       solver = SOLVERS[type].new(filename, options)
 
-      "Writing problem".log(:info)
+      Rulp.log(Logger::INFO, "Writing problem")
       IO.write(filename, self)
 
       Rulp.exec("open #{filename}") if options[:open_definition]
 
-      "Solving problem".log(:info)
+      Rulp.log(Logger::INFO, "Solving problem")
       self.trace, time = _profile{ solver.solve }
 
       Rulp.exec("open #{solver.outfile}") if options[:open_solution]
 
-      "Solver took #{time}".log(:debug)
+      Rulp.log(Logger::DEBUG, "Solver took #{time}")
 
-      "Parsing result".log(:info)
+      Rulp.log(Logger::INFO, "Parsing result")
       solver.store_results(@variables)
 
       solver.remove_lp_file  if options[:remove_lp_file]
@@ -175,7 +181,7 @@ module Rulp
 
       self.result = @objective_expression.evaluate
 
-      "Objective: #{result}\n#{@variables.map{|v|[v.name, "=", v.value].join(' ') if v.value}.compact.join("\n")}".log(:debug)
+      Rulp.log(Logger::DEBUG, "Objective: #{result}\n#{@variables.map{|v|[v.name, "=", v.value].join(' ') if v.value}.compact.join("\n")}")
       return self.result
     end
 

data/test/test_helper.rb

@@ -1,10 +1,11 @@
 require_relative "../lib/rulp"
+require 'logger'
 
 gem "minitest"
 require "minitest/autorun"
 
-Rulp::Logger::level = :off
-Rulp::Logger::print_solver_outputs = false
+Rulp::log_level = Logger::UNKNOWN
+Rulp::print_solver_outputs = false
 
 def each_solver
   [:scip, :cbc, :glpk, :gurobi].each do |solver|
@@ -12,7 +13,7 @@ def each_solver
     if Rulp::solver_exists?(solver)
       yield(solver)
     else
-      "Couldn't find solver #{solver}".log(:info)
+      Rulp::log(Logger::INFO, "Couldn't find solver #{solver}")
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rulp
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.23
 platform: ruby
 authors:
 - Wouter Coppieters
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-21 00:00:00.000000000 Z
+date: 2016-02-03 00:00:00.000000000 Z
 dependencies: []
 description: A simple Ruby LP description DSL
 email: wc@pico.net.nz