sfplanner 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7aea85679985ccc529011c6d8145f45bae74702a
-  data.tar.gz: e24e321da99e4eadb5b5e37ea6fdf435df71ce3c
+  metadata.gz: 6a2eab4c19fa0c0efedbebf24516f1c91b188424
+  data.tar.gz: fe703c00974a0509c02ce115520d090cbc1cbe35
 SHA512:
-  metadata.gz: 400496a44f31dcde8d7bd4fc47b1df632e6b916f9e09470cc1d02b6bbd5e032e0992bc5d1a1cf09dc5f71db8110d9c23e504cdf8644c75cd0fa3265413344ec1
-  data.tar.gz: 4faedc38ca1f6cbe29aab72a0ad1eaf52cc13dc70f11d0dd7a567e383267306ebe288190de4951cba367943a03d0450a1663c14d8b1ce5884efb62e07bbd409d
+  metadata.gz: 52d152d8d60cf313e83b2803479ad3eedbb55a7d5399f1c6249d77751a8492bc243dd64604d8936e62da9f5f4b8e36565f57f023dd6910d3d90c9ad17cb75e7b
+  data.tar.gz: 32293097e185f5b77ea5ccfaedda5a05952ec9dcc723cb1dd1ae6c444e8dec0311aec86f889fbb45fb8d9ec0390b1d667cea168aa256573fd16766b27a6ba33b

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.3

data/lib/sfplanner/planner.rb

@@ -194,23 +194,35 @@ module Sfp
 		end
 
 		def solve_classical_task(params={})
-			@plan, @sas_task = self.solve_sas(@parser, params)
+			benchmarks = {}
+			benchmarks[:solve_sas] = Benchmark.measure {
+				@plan, @sas_task = self.solve_sas(@parser, params)
+			}
 
 			return @plan if params[:sas_plan]
 
 			return to_bsig(params) if params[:bsig]
 
-			plan = (params[:parallel] ? self.get_parallel_plan : self.get_sequential_plan)
+			plan = nil
+			benchmarks[:get_parallel_plan] = Benchmark.measure {
+				plan = (params[:parallel] ? self.get_parallel_plan : self.get_sequential_plan)
+			}
 
-			if params[:dot]
-				to_dot(plan)
-			elsif params[:json]
-				JSON.generate(plan)
-			elsif params[:pretty_json]
-				JSON.pretty_generate(plan)
-			else
-				plan
-			end
+			output = nil
+
+			benchmarks[:to_json] = Benchmark.measure {
+				if params[:dot]
+					output = to_dot(plan)
+				elsif params[:json]
+					output = JSON.generate(plan)
+				elsif params[:pretty_json]
+					output = JSON.pretty_generate(plan)
+				else
+					output = plan
+				end
+			}
+
+			output
 		end
 
 		def bsig_template
@@ -347,27 +359,34 @@ module Sfp
 		def solve_sas(parser, p={})
 			return nil if parser.nil?
 			
-			tmp_dir = '/tmp/nuri_' + (Time.now.to_f * 1000000).to_i.to_s
+			tmp_dir = "/tmp/nuri_#{(Time.now.to_f * 1000000).to_i}"
 			begin
-				compile_time = Benchmark.measure do
+				benchmarks = {}
+
+				benchmarks['compile step 1'] = Benchmark.measure do
 					parser.compile_step_1
+				end
+
+				benchmarks['sas_post_processor'] = Benchmark.measure do
 					p[:sas_post_processor].sas_post_processor(parser) if p[:sas_post_processor]
+				end
+
+				benchmarks['compile step 2'] = Benchmark.measure do
 					parser.compile_step_2
 				end
 
 				while File.exist?(tmp_dir)
-					tmp_dir = '/tmp/nuri_' + (rand * 100000).to_i.abs.to_s
+					tmp_dir = "/tmp/nuri_#{(rand * 100000).to_i.abs}"
 				end
 				Dir.mkdir(tmp_dir)
 
-				benchmarks = parser.benchmarks
-				benchmarks['compile time'] = compile_time
+				benchmarks.merge!(parser.benchmarks)
 
-				sas_file = tmp_dir + '/problem.sas'
-				plan_file = tmp_dir + '/out.plan'
+				sas_file = "#{tmp_dir}/problem.sas"
+				plan_file = "#{tmp_dir}/out.plan"
 				benchmarks['generating sas'] = Benchmark.measure do
 					File.open(sas_file, 'w') do |f|
-						f.write(parser.sas)
+						f.write parser.sas
 						f.flush
 					end
 				end
@@ -377,12 +396,24 @@ module Sfp
 					planner.solve
 				end
 
+				File.open("#{tmp_dir}/#{TranslatorBenchmarkFile}", 'w') do |f|
+					data = {}
+					benchmarks.each do |label,bm|
+						data[label] = {
+							:user => (bm.utime + bm.cutime).round(3),
+							:sys => (bm.stime + bm.cstime).round(3),
+							:real => bm.real.round(3),
+						}
+					end
+					f.write(JSON.pretty_generate(data))
+				end
+
 				plan = (File.exist?(plan_file) ? File.read(plan_file) : nil)
-				plan = plan_preprocessing(plan)
+				#plan = plan_preprocessing(plan)
 
-				if plan != nil
+				if not plan.nil?
 					plan = extract_sas_plan(plan, parser)
-					sas_task = Nuri::Sas::Task.new(sas_file)
+					sas_task = Sfp::Sas::Task.new(sas_file)
 					sas_task.sas_plan = plan
 
 					tmp = []
@@ -395,11 +426,10 @@ module Sfp
 					end
 					sas_task.goal_operator_name = goal_op
 					plan = tmp
-				end
 
-				File.open(tmp_dir + '/' + TranslatorBenchmarkFile, 'w') { |f| f.write(JSON.pretty_generate(benchmarks)) }
+					return plan, sas_task
+				end
 
-				return plan, sas_task
 			rescue Exception => exp
 				raise exp
 			ensure
@@ -416,12 +446,11 @@ module Sfp
 			planner = nil
 
 			if os == 'linux' and machine[0,3] == 'x86'
-				planner = File.expand_path(File.dirname(__FILE__) + '/../../bin/solver/linux-x86')
+				planner = File.expand_path("#{File.dirname(__FILE__)}/../../bin/solver/linux-x86")
 			elsif os == 'linux' and machine[0,3] == 'arm'
-				planner = File.expand_path(File.dirname(__FILE__) + '/../../bin/solver/linux-arm')
-				#Sfp::Planner::Config.set_max_memory(512)
+				planner = File.expand_path("#{File.dirname(__FILE__)}/../../bin/solver/linux-arm")
 			elsif os == 'macos' or os == 'darwin'
-				planner = File.expand_path(File.dirname(__FILE__) + '/../../bin/solver/macos')
+				planner = File.expand_path("#{File.dirname(__FILE__)}/../../bin/solver/macos")
 			end
 
 			raise UnsupportedPlatformException, "#{os} is not supported" if planner.nil?
@@ -489,30 +518,23 @@ module Sfp
 			params = Sfp::Planner.parameters(heuristic)
 			timeout = Sfp::Planner::Config.timeout if timeout.nil?
 
-			os = `uname -s`.downcase.strip
-			command = case os
+			case `uname -s `.downcase.strip
 				when 'linux'
-					then "cd #{dir}; " +
-					     "ulimit -Sv #{Sfp::Planner::Config.max_memory}; " +
-					     "#{planner}/preprocess < #{sas_file} 2>/dev/null 1>/dev/null; " +
-					     "if [ -f 'output' ]; then " +
-					     "timeout #{timeout} nice #{planner}/downward #{params} " +
-					     "--plan-file #{plan_file} < output 1>>search.log 2>>search.log; fi"
+					then "cd #{dir} && \
+					      ulimit -Sv #{Sfp::Planner::Config.max_memory} && \
+					      #{planner}/preprocess < #{sas_file} 2>/dev/null 1>/dev/null && \
+					      if [ -f 'output' ]; then \
+					      timeout #{timeout} nice #{planner}/downward #{params} \
+					      --plan-file #{plan_file} < output 1>>search.log 2>>search.log; fi"
 				when 'macos', 'darwin'
-					then "cd #{dir}; " +
-					     "ulimit -Sv #{Sfp::Planner::Config.max_memory}; " +
-					     "#{planner}/preprocess < #{sas_file} 1>/dev/null 2>/dev/null ; " +
-					     "if [ -f 'output' ]; then " +
-						 "nice #{planner}/downward #{params} " +
-					     "--plan-file #{plan_file} < output 1>>search.log 2>>search.log; fi"
+					then "cd #{dir} && \
+					      ulimit -Sv #{Sfp::Planner::Config.max_memory} && \
+					      #{planner}/preprocess < #{sas_file} 1>/dev/null 2>/dev/null && \
+					      if [ -f 'output' ]; then \
+						   nice #{planner}/downward #{params} \
+					      --plan-file #{plan_file} < output 1>>search.log 2>>search.log; fi"
 				else nil
 			end
-
-			#if not command.nil? and (os == 'linux' or os == 'macos' or os == 'darwin')
-			#	command = "#{command}" #1> /dev/null 2>/dev/null"
-			#end
-
-			command
 		end
 
 		def self.get_search_command(dir, plan_file, heuristic, timeout=nil)
@@ -717,10 +739,23 @@ module Sfp
 				@timeout = (ENV['SFPLANNER_TIMEOUT'] ? ENV['SFPLANNER_TIMEOUT'].to_i : Sfp::Planner::Config.timeout)
 			end
 
+			def pids(dir='')
+				`ps ax | grep -v grep | grep downward | grep sfplanner | grep '#{dir}' | awk '{print $1" "}'`.to_s.strip.split("\n")
+			end
+
 			def solve
+				def kill(dir='')
+					system "kill -9 #{pids(dir).join(' ')} 1>/dev/null 2>/dev/null"
+				end
+
 				### run preprocessing
 				return false if not do_preprocess
 
+				['HUP', 'KILL', 'INT'].each { |name,id|
+					dir = @dir
+					Signal.trap(name) { kill(dir) }
+				}
+
 				### save current working dir
 				home = Dir.pwd
 
@@ -737,19 +772,15 @@ module Sfp
 					files << plan_file
 				end
 
-				def processes(dir)
-					`ps ax | grep -v grep | grep downward | grep sfplanner | grep '#{dir}' | awk '{print $1" "}'`.to_s.strip.split("\n")
-				end
-
 				loop do
-					list = processes(@dir)
+					list = pids(@dir)
 					break if list.length <= 0
 					finished = files.select { |f| File.exist?(f) }
 					break if finished.length > 0
 					sleep 0.2
 				end
 
-				system "kill -9 " + processes(@dir).join(" ") + " 1>/dev/null 2>/dev/null"
+				kill(@dir)
 
 				### select best plan
 				selected = nil
@@ -774,6 +805,9 @@ module Sfp
 					Dir.chdir home
 					false
 				end
+
+			ensure
+				kill(@dir)
 			end
 
 			def do_preprocess

data/lib/sfplanner/sas.rb

@@ -1,4 +1,4 @@
-module Nuri
+module Sfp
 	module Sas
 		class Task
 			attr_reader :variables, :mutexes, :operators, :axioms, :init, :goal

data/lib/sfplanner.rb

@@ -5,6 +5,6 @@ require 'sfp'
 
 # internal dependencies
 libdir = File.dirname(__FILE__) + '/sfplanner'
-Dir.entries(libdir).each do |item|
+['planner.rb', 'sas.rb', 'graph.rb'].each do |item|
 	require "#{libdir}/#{item}" if File.extname(item) == '.rb'
 end

data/sfplanner.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
 	s.homepage                   = 'https://github.com/herry13/sfplanner'
 	s.rubyforge_project          = 'sfplanner'
 
-	s.add_dependency             'sfp', '~> 0.3.19'
+	s.add_dependency             'sfp', '~> 0.3.20'
 
 	s.add_development_dependency 'rake'
 end	

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sfplanner
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Herry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-20 00:00:00.000000000 Z
+date: 2013-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sfp
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.19
+        version: 0.3.20
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.19
+        version: 0.3.20
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -95,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: sfplanner
-rubygems_version: 2.1.10
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: SFPlanner