sfplanner 0.1.1 → 0.1.2

data/README.md

@@ -1,8 +1,8 @@
 SFP Planner for Ruby
 ====================
 - Author: Herry (herry13@gmail.com)
-- Version: 0.1.1
-- License: [BSD License](https://github.com/herry13/sfp-ruby/blob/master/LICENSE)
+- [Version](https://github.com/herry13/sfplanner/blob/master/VERSION)
+- License: [BSD](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).
 
@@ -184,3 +184,21 @@ Example of Planning Task
   This workflow is sequential that has 3 procedures. If you executes
   the workflow in given order, it will achieves the goal state as well
   as perserves the global constraints during the execution.
+
+
+Planner Options
+---------------
+You could set particular environment variable to change the planner settings:
+- to activate debug-mode
+
+	SFPLANNER_DEBUG=1
+
+- to use multiple heuristic on finding the solution, and then pick the best result
+
+	SFPLANNER_MIXED_CONTINUE=1
+
+- to set heuristics which are used in searching
+
+	SFPLANNER_MIXED_HEURISTICS=ff2,cea2
+
+

data/VERSION

@@ -0,0 +1 @@
+0.1.2

data/bin/sfplanner

@@ -1,10 +1,11 @@
 #!/usr/bin/env ruby
 
-libdir = File.expand_path(File.dirname(__FILE__))
-require "#{libdir}/../lib/sfplanner"
+dir = File.expand_path(File.dirname(__FILE__))
+current_version = File.read(File.join(File.dirname(__FILE__), '../VERSION')).sub(/\n/, '')
+require "#{dir}/../lib/sfplanner"
 
 opts = Trollop::options do
-	version "sfplanner 0.1.1 (c) 2013 Herry"
+	version "sfplanner " + current_version + " (c) 2013 Herry"
 	banner <<-EOS
 Solve a planning task specified in SFP language, and print the plan (if found) in JSON format.
 

data/lib/sfplanner/planner.rb

@@ -1,7 +1,9 @@
+require 'fileutils'
+
 module Sfp
 	class Planner
 		Heuristic = 'mixed' # lmcut, cg, cea, ff, mixed ([cg|cea|ff]=>lmcut)
-		Debug = false
+		Debug = (ENV['SFPLANNER_DEBUG'] ? true : false)
 		TranslatorBenchmarkFile = 'sas_translator.benchmarks'
 
 		class Config
@@ -452,15 +454,20 @@ module Sfp
 		# 2) remove actions which are not selected by previous step
 		# 3) solve the problem with LMCUT using A*-search to obtain a sub-optimal plan
 		class MixedHeuristic
-			def initialize(dir, sas_file, plan_file)
+			attr_reader :heuristics_order
+
+			def initialize(dir, sas_file, plan_file, continue=false, optimize=true)
 				@dir = dir
 				@sas_file = sas_file
 				@plan_file = plan_file
+				@heuristics_order = ['autotune12', 'autotune22', 'ff2', 'cea2']
+				@heuristics_order = ENV['SFPLANNER_MIXED_HEURISTICS'].split(',') if ENV['SFPLANNER_MIXED_HEURISTICS']
+				@continue = continue
+				@continue = true if ENV['SFPLANNER_MIXED_CONTINUE']
+				@optimize = optimize
 			end
 
-			def solve
-				optimize = true
-
+			def solve2
 				if not File.exist?(@plan_file)
  					#autotune12 (see fd-autotune-1)
 					planner = Sfp::Planner.getcommand(@dir, @sas_file, @plan_file, 'autotune12')
@@ -490,7 +497,36 @@ module Sfp
 				#end
 
 				return false if not File.exist?(@plan_file)
-				optimize_plan if optimize
+				optimize_plan if @optimize
+
+				true
+			end
+
+			def solve
+				total = 0
+				@heuristics_order.each do |heuristic|
+					command = Sfp::Planner.getcommand(@dir, @sas_file, @plan_file, heuristic)
+					Kernel.system(command)
+					if File.exist?(@plan_file)
+						total += 1
+						File.rename(@plan_file, "#{@plan_file}.sol.#{total}")
+						break if not @continue
+					end
+				end
+
+				return false if total <= 0
+
+				best_length = 1000000
+				1.upto(total) do |i|
+					filepath = "#{@plan_file}.sol.#{i}"
+					plan_length = File.read(filepath).split("\n").length
+					if plan_length < best_length
+						File.delete(@plan_file) if File.exist?(@plan_file)
+						FileUtils.copy(filepath, @plan_file)
+					end
+				end
+
+				optimize_plan if @optimize
 
 				true
 			end

data/sfplanner.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
 	s.name			= 'sfplanner'
-	s.version		= '0.1.1'
+	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.'
@@ -16,5 +16,5 @@ Gem::Specification.new do |s|
 	s.homepage		= 'https://github.com/herry13/sfplanner'
 	s.rubyforge_project = 'sfplanner'
 
-	s.add_dependency 'sfp', '~> 0.3.6'
+	s.add_dependency 'sfp', '~> 0.3.11'
 end	

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sfplanner
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,15 +13,15 @@ date: 2013-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sfp
-  requirement: &21369160 !ruby/object:Gem::Requirement
+  requirement: &8735620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.6
+        version: 0.3.11
   type: :runtime
   prerelease: false
-  version_requirements: *21369160
+  version_requirements: *8735620
 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.
@@ -34,6 +34,7 @@ files:
 - .gitignore
 - LICENSE
 - README.md
+- VERSION
 - bin/sfplanner
 - bin/sfw2graph
 - bin/solver/linux-x86/downward