sfplanner 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a2eab4c19fa0c0efedbebf24516f1c91b188424
-  data.tar.gz: fe703c00974a0509c02ce115520d090cbc1cbe35
+  metadata.gz: dd3297fd1608cfa28a5a203c226b6f6e89689bcf
+  data.tar.gz: 41af390eb361070992e2f0865dd856b96ebebc02
 SHA512:
-  metadata.gz: 52d152d8d60cf313e83b2803479ad3eedbb55a7d5399f1c6249d77751a8492bc243dd64604d8936e62da9f5f4b8e36565f57f023dd6910d3d90c9ad17cb75e7b
-  data.tar.gz: 32293097e185f5b77ea5ccfaedda5a05952ec9dcc723cb1dd1ae6c444e8dec0311aec86f889fbb45fb8d9ec0390b1d667cea168aa256573fd16766b27a6ba33b
+  metadata.gz: 91d6ca887ad2d8cc45bdb54c7fde0a842ead6803aad20848dcc430ba8853d94ada8f7785542ad8ebf0f366a22bc723e9d4639cd2e17c503a97462cb6054e8640
+  data.tar.gz: 5dbb088c1a8a6eee7b2a74de955a611cf49cc18449a83fb52a28e4285c0c0c5be9d345668d5647cf00cad56ced04a8c5f3bf7dc3875ad2d68fcf6d3e79cf31ee

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/lib/sfplanner/planner.rb

@@ -195,7 +195,7 @@ module Sfp
 
 		def solve_classical_task(params={})
 			benchmarks = {}
-			benchmarks[:solve_sas] = Benchmark.measure {
+			benchmarks[:solve_sas] = Benchmark.realtime {
 				@plan, @sas_task = self.solve_sas(@parser, params)
 			}
 
@@ -204,13 +204,13 @@ module Sfp
 			return to_bsig(params) if params[:bsig]
 
 			plan = nil
-			benchmarks[:get_parallel_plan] = Benchmark.measure {
+			benchmarks[:get_parallel_plan] = Benchmark.realtime {
 				plan = (params[:parallel] ? self.get_parallel_plan : self.get_sequential_plan)
 			}
 
 			output = nil
 
-			benchmarks[:to_json] = Benchmark.measure {
+			benchmarks[:to_json] = Benchmark.realtime {
 				if params[:dot]
 					output = to_dot(plan)
 				elsif params[:json]
@@ -363,15 +363,15 @@ module Sfp
 			begin
 				benchmarks = {}
 
-				benchmarks['compile step 1'] = Benchmark.measure do
+				benchmarks['compile step 1'] = Benchmark.realtime do
 					parser.compile_step_1
 				end
 
-				benchmarks['sas_post_processor'] = Benchmark.measure do
+				benchmarks['sas_post_processor'] = Benchmark.realtime do
 					p[:sas_post_processor].sas_post_processor(parser) if p[:sas_post_processor]
 				end
 
-				benchmarks['compile step 2'] = Benchmark.measure do
+				benchmarks['compile step 2'] = Benchmark.realtime do
 					parser.compile_step_2
 				end
 
@@ -384,29 +384,19 @@ module Sfp
 
 				sas_file = "#{tmp_dir}/problem.sas"
 				plan_file = "#{tmp_dir}/out.plan"
-				benchmarks['generating sas'] = Benchmark.measure do
+				benchmarks['generating sas'] = Benchmark.realtime do
 					File.open(sas_file, 'w') do |f|
 						f.write parser.sas
 						f.flush
 					end
 				end
 
-				benchmarks['search_time'] = Benchmark.measure do
+				benchmarks['search_time'] = Benchmark.realtime do
 					planner = ParallelHeuristic.new(tmp_dir, sas_file, plan_file)
 					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
+				File.open("#{tmp_dir}/#{TranslatorBenchmarkFile}", 'w') { |f| f.write(JSON.pretty_generate(benchmarks)) }
 
 				plan = (File.exist?(plan_file) ? File.read(plan_file) : nil)
 				#plan = plan_preprocessing(plan)

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.20'
+	s.add_dependency             'sfp', '>= 0.3.20'
 
 	s.add_development_dependency 'rake'
 end	

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: sfplanner
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Herry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-27 00:00:00.000000000 Z
+date: 2014-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sfp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.3.20
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.3.20
 - !ruby/object:Gem::Dependency