sfplanner 0.1.5 → 0.2.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 7aea85679985ccc529011c6d8145f45bae74702a
+  data.tar.gz: e24e321da99e4eadb5b5e37ea6fdf435df71ce3c
+SHA512:
+  metadata.gz: 400496a44f31dcde8d7bd4fc47b1df632e6b916f9e09470cc1d02b6bbd5e032e0992bc5d1a1cf09dc5f71db8110d9c23e504cdf8644c75cd0fa3265413344ec1
+  data.tar.gz: 4faedc38ca1f6cbe29aab72a0ad1eaf52cc13dc70f11d0dd7a567e383267306ebe288190de4951cba367943a03d0450a1663c14d8b1ce5884efb62e07bbd409d

data/README.md

@@ -10,8 +10,6 @@ A Ruby script and library of SFP planner, which solves a planning task written i
 
 Click [here](https://github.com/herry13/nuri/wiki/SFP-language), for more details about SFP language.
 
-This is a spin-out project from [Nuri](https://github.com/herry13/nuri).
-
 
 Features
 --------
@@ -28,10 +26,10 @@ To install
 
 Requirements
 ------------
-- Ruby (>= 1.8.7)
+- Ruby (>= 1.9.2)
 - Graphviz
 - Rubygems
-	- sfp (>= 0.3.0)
+	- sfp
 
 Tested on:
 - Ubuntu 12.04
@@ -222,3 +220,9 @@ You could set particular environment variable to change the planner settings:
 	$ export SFPLANNER_MIXED_HEURISTICS=ff2,cea2
 
 
+Related Projects
+----------------
+- [Nuri](https://github.com/herry13/nuri)
+- [Sfp-ruby](https://github.com/herry13/sfp-ruby)
+- [Sfpagent](https://github.com/herry13/sfpagent)
+

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.2.1

data/lib/sfplanner/planner.rb

@@ -1,4 +1,5 @@
 require 'fileutils'
+require 'thread'
 
 module Sfp
 	class Planner
@@ -346,7 +347,7 @@ module Sfp
 		def solve_sas(parser, p={})
 			return nil if parser.nil?
 			
-			tmp_dir = '/tmp/nuri_' + (rand * 100000).to_i.abs.to_s
+			tmp_dir = '/tmp/nuri_' + (Time.now.to_f * 1000000).to_i.to_s
 			begin
 				compile_time = Benchmark.measure do
 					parser.compile_step_1
@@ -361,23 +362,21 @@ module Sfp
 
 				benchmarks = parser.benchmarks
 				benchmarks['compile time'] = compile_time
-				File.open(tmp_dir + '/' + TranslatorBenchmarkFile, 'w') { |f| f.write(JSON.pretty_generate(benchmarks)) }
 
 				sas_file = tmp_dir + '/problem.sas'
 				plan_file = tmp_dir + '/out.plan'
-				File.open(sas_file, 'w') do |f|
-					#f.write(parser.to_sas)
-					f.write(parser.sas)
-					f.flush
+				benchmarks['generating sas'] = Benchmark.measure do
+					File.open(sas_file, 'w') do |f|
+						f.write(parser.sas)
+						f.flush
+					end
 				end
 
-				if Heuristic == 'mixed'
-					mixed = MixedHeuristic.new(tmp_dir, sas_file, plan_file)
-					mixed.solve
-				else
-					command = Sfp::Planner.getcommand(tmp_dir, sas_file, plan_file, Heuristic)
-					Kernel.system(command)
+				benchmarks['search_time'] = Benchmark.measure do
+					planner = ParallelHeuristic.new(tmp_dir, sas_file, plan_file)
+					planner.solve
 				end
+
 				plan = (File.exist?(plan_file) ? File.read(plan_file) : nil)
 				plan = plan_preprocessing(plan)
 
@@ -398,6 +397,8 @@ module Sfp
 					plan = tmp
 				end
 
+				File.open(tmp_dir + '/' + TranslatorBenchmarkFile, 'w') { |f| f.write(JSON.pretty_generate(benchmarks)) }
+
 				return plan, sas_task
 			rescue Exception => exp
 				raise exp
@@ -443,7 +444,7 @@ module Sfp
                     single(sum([g(),weight(hFF, 10)]),pref_only=true)],
                     boost=2000),
                preferred=hFF,reopen_closed=false,cost_type=1)"'
-				when 'autotune22' then ' \
+				when 'fd-autotune-2' then ' \
 --heuristic "hCea=cea(cost_type=2)" \
 --heuristic "hCg=cg(cost_type=1)" \
 --heuristic "hGoalCount=goalcount(cost_type=2)" \
@@ -458,7 +459,7 @@ module Sfp
                     single(sum([weight(g(), 2),weight(hGoalCount, 3)]),pref_only=true)],
                    boost=200),
               preferred=[hCea,hGoalCount],reopen_closed=false,cost_type=1)"'
-				when 'autotune12' then ' \
+				when 'fd-autotune-1' then ' \
             --heuristic "hFF=ff(cost_type=1)" \
             --heuristic "hCea=cea(cost_type=0)" \
             --heuristic "hCg=cg(cost_type=2)" \
@@ -514,6 +515,34 @@ module Sfp
 			command
 		end
 
+		def self.get_search_command(dir, plan_file, heuristic, timeout=nil)
+			planner = Sfp::Planner.path
+			params = Sfp::Planner.parameters(heuristic)
+			timeout = Sfp::Planner::Config.timeout if timeout.nil?
+			max_memory = Sfp::Planner::Config.max_memory
+			logfile = "search.log." + heuristic
+
+			case `uname -s`.downcase.strip
+			when 'linux'
+				"ulimit -Sv #{max_memory} && timeout #{timeout} nice #{planner}/downward #{params} \
+				 --plan-file #{plan_file} < output 1>>#{logfile} 2>>#{logfile}"
+			when 'macos', 'darwin'
+				"ulimit -Sv #{max_memory} && nice #{planner}/downward #{params} \
+				 --plan-file #{plan_file} < output 1>>#{logfile} 2>>#{logfile}"
+			else
+				'exit 1'
+			end
+		end
+
+		def self.get_preprocess_command(dir, sas_file)
+			case `uname -s`.downcase.strip
+			when 'linux', 'macos', 'darwin'
+				"cd #{dir} && #{Sfp::Planner.path}/preprocess < #{sas_file} 2>/dev/null 1>/dev/null"
+			else
+				"exit 1"
+			end
+		end
+
 		# Combination between two heuristic to obtain a suboptimal plan.
 		# 1) solve the problem with CG/CEA/FF, that will produce (usually) a non-optimal plan
 		# 2) remove actions which are not selected by previous step
@@ -525,7 +554,7 @@ module Sfp
 				@dir = dir
 				@sas_file = sas_file
 				@plan_file = plan_file
-				@heuristics_order = ['ff2', 'cea2', 'autotune12', 'autotune22']
+				@heuristics_order = ['ff2', 'cea2', 'fd-autotune1', 'fd-autotune2']
 				@heuristics_order = ENV['SFPLANNER_MIXED_HEURISTICS'].split(',') if ENV['SFPLANNER_MIXED_HEURISTICS']
 				@continue = continue
 				@continue = true if ENV['SFPLANNER_MIXED_CONTINUE']
@@ -534,13 +563,13 @@ module Sfp
 
 			def solve2
 				if not File.exist?(@plan_file)
- 					#autotune12 (see fd-autotune-1)
-					planner = Sfp::Planner.getcommand(@dir, @sas_file, @plan_file, 'autotune12')
+ 					#fd-autotune-1
+					planner = Sfp::Planner.getcommand(@dir, @sas_file, @plan_file, 'fd-autotune-1')
 					Kernel.system(planner)
 				end
 				if not File.exist?(@plan_file)
- 					#autotune22 (see fd-autotune-2)
-					planner = Sfp::Planner.getcommand(@dir, @sas_file, @plan_file, 'autotune22')
+ 					#fd-autotune-2
+					planner = Sfp::Planner.getcommand(@dir, @sas_file, @plan_file, 'fd-autotune-2')
 					Kernel.system(planner)
 				end
 				if not File.exists?(@plan_file)
@@ -664,6 +693,96 @@ module Sfp
 			end
 		end
 
+
+		class ParallelHeuristic < MixedHeuristic
+			def initialize(dir, sas_file, plan_file, optimize=false)
+				@dir = dir
+				@sas_file = sas_file
+				@plan_file = plan_file
+				if ENV['SFPLANNER_HEURISTICS']
+					@heuristics = ENV['SFPLANNER_HEURISTICS'].split(',')
+				else
+					@heuristics = ['ff2', 'cea2', 'fd-autotune-1', 'fd-autotune-2']
+				end
+				if ENV['SFPLANNER_OPTIMIZE']
+					@optimize = case ENV['SFPLANNER_OPTIMIZE']
+					when '1', 'true'
+						true
+					else
+						false
+					end
+				else
+					@optimize = optimize
+				end
+				@timeout = (ENV['SFPLANNER_TIMEOUT'] ? ENV['SFPLANNER_TIMEOUT'].to_i : Sfp::Planner::Config.timeout)
+			end
+
+			def solve
+				### run preprocessing
+				return false if not do_preprocess
+
+				### save current working dir
+				home = Dir.pwd
+
+				### change to temporary working dir
+				Dir.chdir @dir
+
+				### run a thread for each heuristic
+				files = []
+				@heuristics.each do |heuristic|
+					plan_file = @plan_file + '.' + heuristic
+					cmd = Sfp::Planner.get_search_command(@dir, plan_file, heuristic, @timeout)
+					pid = Process.spawn cmd
+					Process.detach pid
+					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)
+					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"
+
+				### select best plan
+				selected = nil
+				length = -1
+				files.each do |file|
+					if File.exist?(file)
+						len = File.read(file).split("\n").length
+						if length < 0 or len < length
+							length = len
+							selected = file
+						end
+					end
+				end
+
+				if not selected.nil?
+					FileUtils.copy(selected, @plan_file)
+					optimize_plan if @optimize
+
+					Dir.chdir home
+					true
+				else
+					Dir.chdir home
+					false
+				end
+			end
+
+			def do_preprocess
+				(!!system(Sfp::Planner.get_preprocess_command(@dir, @sas_file)) &&
+				 File.exist?(@dir + '/output'))
+			end
+		end
+
+
 		class Action
 			attr_accessor :operator, :predecessor
 

data/lib/sfplanner.rb

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

data/sfplanner.gemspec

@@ -1,23 +1,22 @@
 Gem::Specification.new do |s|
-	s.name			= 'sfplanner'
-	s.version		= File.read(File.join(File.dirname(__FILE__), 'VERSION')).sub(/\n/, '')
-	s.date			= '2013-08-13'
-	s.summary		= 'SFPlanner'
-	s.description	= 'A Ruby gem that provides a Ruby API and a script to the SFP planner. This planner can automatically generate a plan that solves a planning problem written in SFP language.'
-	s.authors		= ['Herry']
-	s.email			= 'herry13@gmail.com'
+	s.name          = 'sfplanner'
+	s.version       = File.read(File.dirname(__FILE__) + '/VERSION').strip
+	s.date          = File.atime(File.dirname(__FILE__) + '/VERSION').strftime("%Y-%m-%d").to_s
+	s.summary       = 'SFPlanner'
+	s.description   = 'A Ruby gem that provides a Ruby API and a script to the SFP planner. This planner can automatically generate a plan that solves a planning problem written in SFP language.'
+	s.authors       = ['Herry']
+	s.email	        = 'herry13@gmail.com'
 
-	s.executables << 'sfplanner'
-	s.executables << 'sfw2graph'
-	s.files			= `git ls-files`.split("\n")
+	s.executables   << 'sfplanner'
+	s.files         = `git ls-files`.split("\n")
 
 	s.require_paths = ['lib']
 	s.license       = 'BSD'
 
-	s.homepage		= 'https://github.com/herry13/sfplanner'
-	s.rubyforge_project = 'sfplanner'
+	s.homepage                   = 'https://github.com/herry13/sfplanner'
+	s.rubyforge_project          = 'sfplanner'
 
-	s.add_dependency 'sfp', '~> 0.3.17'
+	s.add_dependency             'sfp', '~> 0.3.19'
 
 	s.add_development_dependency 'rake'
 end	

metadata

@@ -1,45 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: sfplanner
 version: !ruby/object:Gem::Version
-  version: 0.1.5
-  prerelease: 
+  version: 0.2.1
 platform: ruby
 authors:
 - Herry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-13 00:00:00.000000000 Z
+date: 2013-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sfp
-  requirement: &18815260 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.17
+        version: 0.3.19
   type: :runtime
   prerelease: false
-  version_requirements: *18815260
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.19
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &18814780 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18814780
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A Ruby gem that provides a Ruby API and a script to the SFP planner.
   This planner can automatically generate a plan that solves a planning problem written
   in SFP language.
 email: herry13@gmail.com
 executables:
 - sfplanner
-- sfw2graph
 extensions: []
 extra_rdoc_files: []
 files:
@@ -74,26 +78,25 @@ files:
 homepage: https://github.com/herry13/sfplanner
 licenses:
 - BSD
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: sfplanner
-rubygems_version: 1.8.11
+rubygems_version: 2.1.10
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: SFPlanner
 test_files: []