sfp 0.3.18 → 0.3.19

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ca049ea19fd6ff1ee58312bdd03bdefa3358e342
+  data.tar.gz: d6808887e1039d2e75f5360491d9584b5e842cb0
+SHA512:
+  metadata.gz: be71d391cc8d77de2fec90208d31d232643eebe216e0677eb7641d0cc0ff5d4c8e8bb5fc435cf5f230d884ca8f5964337c760cb757ffa82381098fb736d2ba2f
+  data.tar.gz: b1394aabf249f510ebb843a4228299a4ed1028419e10f86054924a200c3b3507b82a8494e9d14b616664c89666e1745d4777e10d46a341d7a2fb83f3c8eb223c

data/VERSION

@@ -1 +1 @@
-0.3.18
+0.3.19

data/lib/sfp/Sfplib.rb

@@ -218,7 +218,8 @@ end
 Hash.send(:define_method, "ref") {
 	return '$' if not self.has_key?('_parent') or self['_parent'] == nil
 	me = (self.has_key?('_self') ? self['_self'] : '')
-	return self['_parent'].ref + "." + me
+	r = self['_parent'].ref
+	r << ".#{me}"
 }
 
 # accept method as implementation of Visitor pattern

data/lib/sfp/sas_translator.rb

@@ -144,7 +144,8 @@ module Sfp
 				@root['sometime'].accept(value_collector) if @root.has_key?('sometime')
 
 				# remove duplicates from type's set of value
-				@types.each_value { |type| type.uniq! }
+				#@types.each_value { |values| values.uniq! }
+				@types.keys.each { |type| @types[type] = to_set(@types[type]) }
 
 				# set domain values for each variable
 				self.set_variable_values
@@ -185,7 +186,7 @@ module Sfp
 					@types[var.type] << var.goal
 				end
 			end
-			@types.each_value { |type| type.uniq! }
+			@types.keys.each { |type| @types[type] = to_set(@types[type]) }
 
 			# add Sfp::Unknown and Sfp::Undefined value to all non-final variables
 			self.add_unknown_undefined_value_to_variables
@@ -221,6 +222,10 @@ module Sfp
 			end
 		end
 
+		def to_set(array)
+			array.inject([]) { |result,item| result << item unless result.include?(item); result }
+		end
+
 		def variable_name_and_value(var_id, value_index)
 			i = @vars.index { |v| v.id == var_id }
 			var = @vars[i]
@@ -629,67 +634,65 @@ module Sfp
 			# version
 			out = "begin_version\n3\nend_version\n"
 			# metric
-			out += "begin_metric\n1\nend_metric\n"
+			out << "begin_metric\n1\nend_metric\n"
+
+			benchmarks = {}
+
+			vars = {}
+			benchmarks[:conversion] = Benchmark.measure do
+				@variables.each { |k,v| vars[k.to_sym] = v }
+			end
+			names = vars.keys
+
 			# variables
-			variable_index = @variables.keys
-			variable_index.sort!
-			out += "#{variable_index.length}\n"
-			variable_index.each { |i|
-				@variables[i].id = variable_index.index(i) # set variable's index
-				out += @variables[i].to_sas(@root['initial']) + "\n"
-			}
+			out << "#{names.length}\n"
+			names.sort!
+			names.each_index do |i|
+				var = vars[ names[i] ]
+				var.id = i
+				out << var.to_sas(@root['initial']) + "\n"
+			end
+
 			# mutex
-			out += "0\n"
-			# initial state
-			out += "begin_state\n"
-			#pre = ( (pre.is_a?(Hash) and pre.isnull) ? 0 : (pre == nil ? -1 : @var.index(pre)) )
-			variable_index.each { |i|
-				if @variables[i].init.is_a?(Hash) and @variables[i].init.isnull
-					out += "0\n"
-				elsif @variables[i].init.is_a?(::Sfp::Unknown)
-					out += "#{@variables[i].length-1}\n"
+			out << "0\n"
+
+			# initial & goal state
+			out << "begin_state\n"
+			goal = ''
+			goal_count = 0
+			names.each do |name|
+				var = vars[name]
+				if var.init.is_a?(Hash) and var.init.isnull
+					out << "0\n"
+				elsif var.init.is_a?(::Sfp::Unknown)
+					out << "#{var.length - 1}\n"
 				else
-					val = @variables[i].index(@variables[i].init).to_s
-					out += "#{val}\n"
-					if val.length <= 0
-						raise TranslationException,
-							"Unknown init: #{@variables[i].name} = #{@variables[i].init.inspect}"
-					end
+					val = var.index(var.init).to_s
+					raise TranslationException, "Unknown init: #{var.name}=#{var.init.inspect}" if val.length <= 0
+					out << "#{val}\n"
 				end
-			}
-			out += "end_state\n"
-			# goal
-			out += "begin_goal\n"
-			count = 0
-			goal = ''
-			variable_index.each { |i|
-				if @variables[i].goal != nil
-					goal += variable_index.index(i).to_s + ' ' +
-						@variables[i].index(@variables[i].goal).to_s + "\n"
-					count += 1
+
+				if var.goal != nil
+					goal << "#{var.id} #{var.index(var.goal)}\n"
+					goal_count += 1
 				end
-			}
-			out += "#{count}\n#{goal}end_goal\n"
+			end
+			out << "end_state\nbegin_goal\n#{goal_count}\n#{goal}end_goal\n"
+
 			# operators
-			#out += "#{@operators.length}\n"
 			ops = ''
 			total = 0
-			@operators.each_value { |op|
-				next if op.total_preposts <= 0
-				# HACK! - an exception may arise if a value in condition or effect is not in variable's domain
-				begin
-					ops += op.to_sas(@root['initial'], @variables) + "\n"
-					total += 1
-				rescue Exception => exp
-					#puts "#{exp}\n#{exp.backtrace.join("\n")}"
-				end
-			}
-			out += "#{total}\n"
-			out += ops
-			# axioms
-			out += "0"
+			@operators.each_value do |operator|
+				next if operator.total_preposts <= 0
+				ops << operator.to_sas2(@root['initial'], vars)
+				ops << "\n"
+				total += 1
+			end
+			out << "#{total}\n"
+			out << ops
 
-			return out
+			# axioms
+			out << "0"
 		end
 
 		def reset_operators_name
@@ -1810,24 +1813,29 @@ module Sfp
 
 		def to_s
 			s = @name.to_s + '|' + @type.to_s
-			s += '|' + (@init == nil ? '-' : (@init.is_a?(Hash) ? @init.tostring : @init.to_s))
-			s += '|' + (@goal == nil ? '-' : (@goal.is_a?(Hash) ? @goal.tostring : @goal.to_s))
-			s += '|' + (@is_final ? 'final' : 'notfinal') + "\n"
-			s += "\t["
-			self.each { |v| s += (v.is_a?(Hash) ? v.tostring : v.to_s) + ',' }
-			s = (self.length > 0 ? s.chop : s) + "]"
-			return s
+			s << '|'
+			s << (@init == nil ? '-' : (@init.is_a?(Hash) ? @init.tostring : @init.to_s))
+			s << '|'
+			s << (@goal == nil ? '-' : (@goal.is_a?(Hash) ? @goal.tostring : @goal.to_s))
+			s << '|'
+			s << (@is_final ? 'final' : 'notfinal') + "\n"
+			s << "\t["
+			self.each { |v| s << (v.is_a?(Hash) ? v.tostring : v.to_s) + ',' }
+			s = (self.length > 0 ? s.chop : s)
+			s << "]"
 		end
 
 		# return variable representation in SAS+ format
 		def to_sas(root)
 			sas = "begin_variable\nvar_#{@id}#{@name}\n#{@layer}\n#{self.length}\n"
 			self.each { |v|
-				v = root.at?(v) if v.is_a?(String) and v.isref
+				if v.is_a?(String) and v.isref
+					v = root.at?(v)
+				end
 				v = '"' + v + '"' if v.is_a?(String)
-				sas += (v.is_a?(Hash) ? (v.isnull ? "null\n" : "#{v.ref}\n") : "#{v}\n")
+				sas << (v.is_a?(Hash) ? (v.isnull ? "null\n" : "#{v.ref}\n") : "#{v}\n")
 			}
-			return sas += "end_variable"
+			sas << "end_variable"
 		end
 
 		def not(x)
@@ -1956,23 +1964,51 @@ module Sfp
 				end
 			}
 			sas = "begin_operator\n#{@name}"
-			@params.each { |k,v| sas += " #{k}=#{v}" if k != '$.this' } if @params != nil
-			sas += "\n#{prevail.length}\n"
+			@params.each { |k,v| sas << " #{k}=#{v}" if k != '$.this' } if @params != nil
+			sas << "\n#{prevail.length}\n"
 			prevail.each { |p|
 				line = p.to_sas(root, variables)
 				raise TranslationException if line[line.length-1] == ' '
-				sas += "#{line}\n"
+				sas << "#{line}\n"
 			}
-			sas += "#{prepost.length}\n"
+			sas << "#{prepost.length}\n"
 			prepost.each { |p|
 				line = p.to_sas(root, variables, false)
 				raise TranslationException if line[line.length-1] == ' '
-				sas += "#{line}\n"
+				sas << "#{line}\n"
 			}
-			sas += "#{@cost}\nend_operator"
+			sas << "#{@cost}\nend_operator"
 			return sas
 		end
 
+		def to_sas2(root, variables)
+			prevails = self.values.select { |p| p.post.nil? }
+			preposts = self.values.select { |p| not p.post.nil? }
+
+			sas = "begin_operator\n#{@name}"
+			@params.each do |key,val|
+				sas << " #{key}=#{val}" if key != '$.this'
+			end if @params.is_a?(Hash)
+
+			sas << "\n#{prevails.length}\n"
+			prevails.each do |p|
+				line = p.to_sas2(root, variables)
+				raise TranslationException if line[-1] == ' '
+				sas << line
+				sas << "\n"
+			end
+
+			sas << "#{preposts.length}\n"
+			preposts.each do |p|
+				line = p.to_sas2(root, variables, false)
+				raise TranslationException if line[-1] == ' '
+				sas << line
+				sas << "\n"
+			end
+
+			sas << "#{@cost}\nend_operator"
+		end
+
 		def to_sfw
 			if not (@name =~ /.*\$.*/)
 				id , name = @name.split('-', 2)
@@ -2025,10 +2061,10 @@ module Sfp
 			raise Exception, "Invalid axiom: total preposts <= 0" if preposts.length <= 0
 
 			sas = "begin_rule"
-			sas += "\n#{prevails.length}"
-			prevails.each { |var,param| sas += "\n" + param.to_sas(root, variables) }
-			preposts.each { |var,param| sas += "\n" + param.to_sas(root, variables) }
-			sas += "\nend_rule"
+			sas << "\n#{prevails.length}"
+			prevails.each { |var,param| sas << "\n#{param.to_sas(root, variables)}" }
+			preposts.each { |var,param| sas << "\n#{param.to_sas(root, variables)}" }
+			sas << "\nend_rule"
 			return sas
 		end
 	end
@@ -2073,6 +2109,29 @@ module Sfp
 			return "0 #{@var.id} #{pre} #{post}"
 		end
 
+		def to_sas2(root, variables, is_prevail=true)
+			### resolve reference
+			pre = ((@pre.is_a?(String) and @pre.isref) ? variables[@pre.to_sym].init : @pre)
+			### calculate index
+			if pre.is_a?(Hash) and pre.isnull
+				pre = 0
+			elsif pre.nil?
+				pre = -1
+			else
+				pre = @var.index(pre)
+			end
+			return "#{@var.id} #{pre}" if is_prevail
+
+			### resolve reference
+			post = ((@post.is_a?(String) and @post.isref) ? variables[@post.to_sym].init : @post)
+			### calculate index
+			if post.is_a?(Hash) and post.isnull
+				"0 #{@var.id} #{pre} 0"
+			else
+				"0 #{@var.id} #{pre} #{@var.index(post)}"
+			end
+		end
+
 		def to_s
 			return @var.name + ',' +
 				(@pre == nil ? '-' : (@pre.is_a?(Hash) ? @pre.tostring : @pre.to_s)) + ',' +

data/lib/sfp/visitors.rb

@@ -92,13 +92,17 @@ module Sfp
 					if	value.length >= 8 and value[0,8] == '$.parent'
 						_, _, rest = value.split('.', 3)
 						if parent.has_key?('_parent')
-							parent[name] = parent['_parent'].ref + (rest == nil ? '' : '.' + rest)
+							val = parent['_parent'].ref
+							val << ".#{rest}" if not rest.nil?
+							parent[name] = val
 						else
 							raise Exception
 						end
 					elsif value.length >= 6 and value[0,6] == '$.this'
 						_, _, rest = value.split('.', 3)
-						parent[name] = parent.ref + (rest == nil ? '' : '.' + rest)
+						val = parent.ref
+						val << ".#{rest}" if not rest.nil?
+						parent[name] = val
 					end
 				end
 				true

metadata

@@ -1,38 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: sfp
 version: !ruby/object:Gem::Version
-  version: 0.3.18
-  prerelease: 
+  version: 0.3.19
 platform: ruby
 authors:
 - Herry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-14 00:00:00.000000000 Z
+date: 2013-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: antlr3
-  requirement: &16030420 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *16030420
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.10.0
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &16029240 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16029240
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A Ruby API and script for SFP language parser
 email: herry13@gmail.com
 executables:
@@ -67,26 +72,25 @@ files:
 homepage: https://github.com/herry13/sfp-ruby
 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: sfp
-rubygems_version: 1.8.11
+rubygems_version: 2.1.10
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: SFP Parser
 test_files: []