sfplanner 0.1.0 → 0.1.1

data/README.md

@@ -1,7 +1,7 @@
 SFP Planner for Ruby
 ====================
 - Author: Herry (herry13@gmail.com)
-- Version: 0.1.0
+- Version: 0.1.1
 - License: [BSD License](https://github.com/herry13/sfp-ruby/blob/master/LICENSE)
 
 A Ruby gem that provides a Ruby API to SFP planner that solves a planning task written in [SFP language](https://github.com/herry13/nuri/wiki/SFP-language).

data/bin/sfplanner

@@ -4,7 +4,7 @@ libdir = File.expand_path(File.dirname(__FILE__))
 require "#{libdir}/../lib/sfplanner"
 
 opts = Trollop::options do
-	version "sfplanner 0.0.2 (c) 2013 Herry"
+	version "sfplanner 0.1.1 (c) 2013 Herry"
 	banner <<-EOS
 Solve a planning task specified in SFP language, and print the plan (if found) in JSON format.
 
@@ -30,10 +30,15 @@ filepath = ARGV[0].to_s
 
 if filepath != ''
 	planner = Sfp::Planner.new
+	options = {:file => ARGV[0],
+	           :json => !opts[:pretty],
+	           :pretty_json => opts[:pretty],
+	           :parallel => opts[:parallel]}
 	if opts[:json_input]
-		puts 'Option "--json-input" is not supported yet.'
+		options[:input_json] = true
+		puts planner.solve(options)
 	else
-		puts planner.solve({:file => ARGV[0], :pretty_json => opts[:pretty], :parallel => opts[:parallel]})
+		puts planner.solve(options)
 	end
 else
 	Trollop::help

data/lib/sfplanner/planner.rb

@@ -2,6 +2,7 @@ module Sfp
 	class Planner
 		Heuristic = 'mixed' # lmcut, cg, cea, ff, mixed ([cg|cea|ff]=>lmcut)
 		Debug = false
+		TranslatorBenchmarkFile = 'sas_translator.benchmarks'
 
 		class Config
 			# The timeout for the solver in seconds (default 60s/1mins)
@@ -44,8 +45,12 @@ module Sfp
 				@parser.root = params[:sfp]
 			elsif params[:file].is_a?(String)
 				raise Exception, "File not found: #{params[:file]}" if not File.exist?(params[:file])
-				@parser.home_dir = File.expand_path(File.dirname(params[:file]))
-				@parser.parse(File.read(params[:file]))
+				if params[:input_json]
+					@parser.root = json_to_sfp(JSON[File.read(params[:file])])
+				else
+					@parser.home_dir = File.expand_path(File.dirname(params[:file]))
+					@parser.parse(File.read(params[:file]))
+				end
 			end
 
 			@debug = true if params[:debug]
@@ -83,6 +88,16 @@ module Sfp
 		end
 
 		protected
+		def json_to_sfp(json)
+			json.accept(Sfp::Visitor::SfpGenerator.new(json))
+			json.each do |key,val|
+				next if key[0,1] == '_'
+				if val.is_a?(Hash) and val['_context'] == 'state'
+					#val.each { |k,v| v.delete('_parent') if k[0,1] != '_' and v.is_a?(Hash) and v.has_key?('_parent') }
+				end
+			end
+		end
+
 		def save_sfp_task
 			sfp_task = Sfp::Helper.deep_clone(@parser.root)
 			sfp_task.accept(Sfp::Visitor::ParentEliminator.new)
@@ -266,14 +281,21 @@ module Sfp
 			
 			tmp_dir = '/tmp/nuri_' + (rand * 100000).to_i.abs.to_s
 			begin
-				parser.compile_step_1
-				p[:sas_post_processor].sas_post_processor(parser) if p[:sas_post_processor]
-				parser.compile_step_2
+				compile_time = Benchmark.measure do
+					parser.compile_step_1
+					p[:sas_post_processor].sas_post_processor(parser) if p[:sas_post_processor]
+					parser.compile_step_2
+				end
 
 				while File.exist?(tmp_dir)
 					tmp_dir = '/tmp/nuri_' + (rand * 100000).to_i.abs.to_s
 				end
 				Dir.mkdir(tmp_dir)
+
+				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|
@@ -347,27 +369,18 @@ module Sfp
 				when 'cg' then '--search "lazy_greedy(cg(cost_type=2))"'
 				when 'cea' then '--search "lazy_greedy(cea(cost_type=2))"'
 				when 'mad' then '--search "lazy_greedy(mad())"'
-				when 'lama2011' then ' \
-                --heuristic "hlm1,hff1=lm_ff_syn(lm_rhw(
-                    reasonable_orders=true,lm_cost_type=1,cost_type=1))" \
-                --heuristic "hlm2,hff2=lm_ff_syn(lm_rhw(
-                    reasonable_orders=true,lm_cost_type=2,cost_type=2))" \
-                --search "iterated([
-                    lazy_greedy([hff1,hlm1],preferred=[hff1,hlm1],
-                                cost_type=1,reopen_closed=false),
-                    lazy_greedy([hff2,hlm2],preferred=[hff2,hlm2],
-                                reopen_closed=false),
-                    lazy_wastar([hff2,hlm2],preferred=[hff2,hlm2],w=5),
-                    lazy_wastar([hff2,hlm2],preferred=[hff2,hlm2],w=3),
-                    lazy_wastar([hff2,hlm2],preferred=[hff2,hlm2],w=2),
-                    lazy_wastar([hff2,hlm2],preferred=[hff2,hlm2],w=1)],
-                    repeat_last=true,continue_on_fail=true)"'
-				when 'autotune' then ' \
+				when 'cea2' then ' --heuristic "hCea=cea(cost_type=2)" \
+            --search "ehc(hCea, preferred=hCea,preferred_usage=0,cost_type=0)"'
+				when 'ff2' then ' --heuristic "hFF=ff(cost_type=1)" \
+--search "lazy(alt([single(sum([g(),weight(hFF, 10)])),
+                    single(sum([g(),weight(hFF, 10)]),pref_only=true)],
+                    boost=2000),
+               preferred=hFF,reopen_closed=false,cost_type=1)"'
+				when 'autotune22' then ' \
 --heuristic "hCea=cea(cost_type=2)" \
 --heuristic "hCg=cg(cost_type=1)" \
 --heuristic "hGoalCount=goalcount(cost_type=2)" \
 --heuristic "hFF=ff(cost_type=0)" \
---heuristic "hMad=mad()" \
 --search "lazy(alt([single(sum([weight(g(), 2),weight(hFF, 3)])),
                     single(sum([weight(g(), 2),weight(hFF, 3)]),pref_only=true),
                     single(sum([weight(g(), 2),weight(hCg, 3)])),
@@ -375,11 +388,26 @@ module Sfp
                     single(sum([weight(g(), 2),weight(hCea, 3)])),
                     single(sum([weight(g(), 2),weight(hCea, 3)]),pref_only=true),
                     single(sum([weight(g(), 2),weight(hGoalCount, 3)])),
-                    single(sum([weight(g(), 2),weight(hGoalCount, 3)]),pref_only=true),
-                    single(sum([weight(g(), 2),weight(hMad, 3)])),
-                    single(sum([weight(g(), 2),weight(hMad, 3)]),pref_only=true)],
+                    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 ' \
+            --heuristic "hFF=ff(cost_type=1)" \
+            --heuristic "hCea=cea(cost_type=0)" \
+            --heuristic "hCg=cg(cost_type=2)" \
+            --heuristic "hGoalCount=goalcount(cost_type=0)" \
+            --heuristic "hAdd=add(cost_type=0)" \
+      --search "lazy(alt([single(sum([g(),weight(hAdd, 7)])),
+                          single(sum([g(),weight(hAdd, 7)]),pref_only=true),
+                          single(sum([g(),weight(hCg, 7)])),
+                          single(sum([g(),weight(hCg, 7)]),pref_only=true),
+                          single(sum([g(),weight(hCea, 7)])),
+                          single(sum([g(),weight(hCea, 7)]),pref_only=true),
+                          single(sum([g(),weight(hGoalCount, 7)])),
+                          single(sum([g(),weight(hGoalCount, 7)]),pref_only=true)],
+                          boost=1000),
+                     preferred=[hCea,hGoalCount],
+                     reopen_closed=false,cost_type=1)"'
 				else '--search "lazy_greedy(ff(cost_type=0))"'
 			end
 		end
@@ -431,24 +459,26 @@ module Sfp
 			end
 
 			def solve
-				use_admissible = false
-
-				# 1a) solve with autotune (see fd-autotune-2)
-				planner = Sfp::Planner.getcommand(@dir, @sas_file, @plan_file, 'autotune')
-				Kernel.system(planner)
+				optimize = true
 
-				# 1b) if not found, try mad
 				if not File.exist?(@plan_file)
-					planner = Sfp::Planner.getcommand(@dir, @sas_file, @plan_file, 'mad')
+ 					#autotune12 (see fd-autotune-1)
+					planner = Sfp::Planner.getcommand(@dir, @sas_file, @plan_file, 'autotune12')
+					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')
+					Kernel.system(planner)
+				end
+				if not File.exists?(@plan_file)
+					# solve with cea2 (EHC+CEA: see fd-autotune-2)
+					planner = Sfp::Planner.getcommand(@dir, @sas_file, @plan_file, 'cea2')
 					Kernel.system(planner)
 				end
-#				if not File.exist?(@plan_file)
-#					planner = Sfp::Planner.getcommand(@dir, @sas_file, @plan_file, 'ff')
-#					Kernel.system(planner)
-#				end
-				# 1c) if not found, try CEA
 				if not File.exists?(@plan_file)
-					planner = Sfp::Planner.getcommand(@dir, @sas_file, @plan_file, 'cea')
+					# solve with ff2 (FF with boost: see fd-autotune-1)
+					planner = Sfp::Planner.getcommand(@dir, @sas_file, @plan_file, 'ff2')
 					Kernel.system(planner)
 				end
 
@@ -460,12 +490,12 @@ module Sfp
 				#end
 
 				return false if not File.exist?(@plan_file)
-				optimise_plan if not use_admissible
+				optimize_plan if optimize
 
 				true
 			end
 
-			def optimise_plan
+			def optimize_plan
 				# 2) remove unselected operators
 				new_sas = @sas_file + '.2'
 				new_plan = @plan_file + '.2'
@@ -489,6 +519,7 @@ module Sfp
 					line.strip!
 					line = line[1, line.length-2]
 					selected << line.split(' ', 2)[0]
+					#'$.' + line[1, line.length-2].split(' ', 2)[0].split('$.')[1]
 				end
 
 				# remove unselected operators

data/lib/sfplanner.rb

@@ -1,11 +1,10 @@
 # external dependencies
 require 'rubygems'
 require 'json'
-#require 'sfp'
+require 'sfp'
 
 # internal dependencies
 libdir = File.expand_path(File.dirname(__FILE__))
 
-require libdir + '/../../sfp-ruby/lib/sfp.rb'
 require libdir + '/sfplanner/sas'
 require libdir + '/sfplanner/planner'

data/sfplanner.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 	s.name			= 'sfplanner'
-	s.version		= '0.1.0'
-	s.date			= '2013-08-05'
+	s.version		= '0.1.1'
+	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']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sfplanner
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-05 00:00:00.000000000 Z
+date: 2013-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sfp
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &21369160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,12 +21,7 @@ dependencies:
         version: 0.3.6
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.3.6
+  version_requirements: *21369160
 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.
@@ -70,7 +65,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: sfplanner
-rubygems_version: 1.8.23
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: SFPlanner