sfp 0.3.19 → 0.3.21

data/VERSION

@@ -1 +1 @@
-0.3.19
+0.3.21

data/lib/sfp/Sfplib.rb

@@ -185,7 +185,7 @@ module Sfp
 		end
 
 		def to_s
-			(@path.nil? ? "<sfp::undefined[#{@type}]>" : "<sfp::undefined[#{@type}][#{@path}]>")
+			(@type.nil? ? "$.Undefined" : "$.Undefined.#{@type}")
 		end
 	end
 
@@ -205,7 +205,7 @@ module Sfp
 		end
 
 		def to_s
-			(@path.nil? ? "<sfp::unknown[#{@type}]>" : "<sfp::unknown[#{@type}][#{@path}]]>")
+			(@type.nil? ? "$.Unknown" : "$.Unknown.#{@type}")
 		end
 	end
 

data/lib/sfp/sas_translator.rb

@@ -630,6 +630,63 @@ module Sfp
 			self.to_s
 		end
 
+		def dump(stream)
+			init = @root['initial']
+
+			# version
+			stream.write "begin_version\n3\nend_version\n"
+			# metric
+			stream.write "begin_metric\n1\nend_metric\n"
+
+			### use symbolic as key in map of variables
+			vars = {}
+			@variables.each { |k,v| vars[k.to_sym] = v }
+			names = vars.keys
+
+			# variables
+			stream.write "#{names.length}\n"
+			names.sort!
+			names.each_index do |i|
+				var = vars[ names[i] ]
+				var.id = i
+				var.dump(stream, init)
+			end
+
+			# mutex
+			stream.write "0\n"
+
+			# initial & goal state
+			stream.write "begin_state\n"
+			goal = ''
+			goal_count = 0
+			names.each do |name|
+				var = vars[name]
+				if var.init.is_a?(Hash) and var.init.isnull
+					stream.write "0\n"
+				elsif var.init.is_a?(::Sfp::Unknown)
+					stream.write "#{var.length - 1}\n"
+				else
+					val = var.index(var.init).to_s
+					raise TranslationException, "Unknown init: #{var.name}=#{var.init.inspect}" if val.length <= 0
+					stream.write "#{val}\n"
+				end
+
+				if var.goal != nil
+					goal << "#{var.id} #{var.index(var.goal)}\n"
+					goal_count += 1
+				end
+			end
+			stream.write "end_state\nbegin_goal\n#{goal_count}\n#{goal}end_goal\n"
+
+			# operators
+			operators = @operators.values.select { |op| op.total_preposts > 0 }
+			stream.write "#{operators.length}\n"
+			operators.each { |operator| operator.dump(stream, init, vars) }
+
+			# axioms
+			stream.write "0"
+		end
+
 		def sas
 			# version
 			out = "begin_version\n3\nend_version\n"
@@ -638,10 +695,9 @@ module Sfp
 
 			benchmarks = {}
 
+			### use symbolic as key in map of variables
 			vars = {}
-			benchmarks[:conversion] = Benchmark.measure do
-				@variables.each { |k,v| vars[k.to_sym] = v }
-			end
+			@variables.each { |k,v| vars[k.to_sym] = v }
 			names = vars.keys
 
 			# variables
@@ -650,7 +706,7 @@ module Sfp
 			names.each_index do |i|
 				var = vars[ names[i] ]
 				var.id = i
-				out << var.to_sas(@root['initial']) + "\n"
+				out << var.to_sas(@root['initial'])
 			end
 
 			# mutex
@@ -684,9 +740,11 @@ module Sfp
 			total = 0
 			@operators.each_value do |operator|
 				next if operator.total_preposts <= 0
-				ops << operator.to_sas2(@root['initial'], vars)
-				ops << "\n"
-				total += 1
+				sas = operator.to_sas(@root['initial'], vars)
+				if not sas.nil?
+					ops << sas
+					total += 1
+				end
 			end
 			out << "#{total}\n"
 			out << ops
@@ -1835,7 +1893,17 @@ module Sfp
 				v = '"' + v + '"' if v.is_a?(String)
 				sas << (v.is_a?(Hash) ? (v.isnull ? "null\n" : "#{v.ref}\n") : "#{v}\n")
 			}
-			sas << "end_variable"
+			sas << "end_variable\n"
+		end
+
+		def dump(stream, root)
+			stream.write "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
+				v = '"' + v + '"' if v.is_a?(String)
+				stream.write (v.is_a?(Hash) ? (v.isnull ? "null\n" : "#{v.ref}\n") : "#{v}\n")
+			}
+			stream.write "end_variable\n"
 		end
 
 		def not(x)
@@ -1954,34 +2022,6 @@ module Sfp
 		end
 
 		def to_sas(root, variables)
-			prevail = Array.new
-			prepost = Array.new
-			self.each_value { |p|
-				if p.post == nil
-					prevail << p
-				else
-					prepost << p
-				end
-			}
-			sas = "begin_operator\n#{@name}"
-			@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 << "#{prepost.length}\n"
-			prepost.each { |p|
-				line = p.to_sas(root, variables, false)
-				raise TranslationException if line[line.length-1] == ' '
-				sas << "#{line}\n"
-			}
-			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? }
 
@@ -1992,21 +2032,59 @@ module Sfp
 
 			sas << "\n#{prevails.length}\n"
 			prevails.each do |p|
-				line = p.to_sas2(root, variables)
-				raise TranslationException if line[-1] == ' '
-				sas << line
-				sas << "\n"
+				line = p.to_sas(root, variables)
+				#raise TranslationException if line[-1] == ' '
+				return nil if line[-1] == ' '
+				sas << "#{line}\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"
+				line = p.to_sas(root, variables, false)
+				#raise TranslationException if line[-1] == ' '
+				return nil if line[-1] == ' '
+				sas << "#{line}\n"
 			end
 
-			sas << "#{@cost}\nend_operator"
+			sas << "#{@cost}\nend_operator\n"
+		end
+
+		def dump(stream, root, variables)
+			prevails = self.values.select { |p| p.post.nil? }
+			preposts = self.values.select { |p| not p.post.nil? }
+=begin
+			pre_lines = []
+			prevails.each do |p|
+				line = p.to_sas(root, variables)
+				return if line[-1] == ' '
+				pre_lines << line
+			end
+			prepost_lines = []
+			preposts.each do |p|
+				line = p.to_sas(root, variables, false)
+				return if line [-1] == ' '
+				prepost_lines << line
+			end
+=end
+
+			stream.write "begin_operator\n#{@name}"
+			@params.each do |key,val|
+				stream.write " #{key}=#{val}" if key != '$.this'
+			end if @params.is_a?(Hash)
+
+=begin
+			stream.write "\n#{pre_lines.length}"
+			stream.write "\n#{pre_lines.join("\n")}" if pre_lines.length > 0
+			stream.write "\n#{prepost_lines.length}\n"
+			stream.write "#{prepost_lines.join("\n")}\n" if prepost_lines.length > 0
+=end
+			stream.write "\n#{prevails.length}\n"
+			prevails.each { |p| p.dump(stream, root, variables) }
+
+			stream.write "#{preposts.length}\n"
+			preposts.each { |p| p.dump(stream, root, variables, false) }
+
+			stream.write "#{@cost}\nend_operator\n"
 		end
 
 		def to_sfw
@@ -2093,23 +2171,7 @@ module Sfp
 			return Parameter.new(@var, @pre, @post)
 		end
 
-		def to_sas(root, variables, prevail=true)
-			# resolve the reference
-			#pre = ( (@pre.is_a?(String) and @pre.isref) ? root.at?(@pre) : @pre )
-			#post = ( (@post.is_a?(String) and @post.isref) ? root.at?(@post) : @post )
-			pre = ((@pre.is_a?(String) and @pre.isref) ? variables[@pre].init : @pre)
-			post = ((@post.is_a?(String) and @post.isref) ? variables[@post].init : @post)
-			# calculate the index
-			pre = ( (pre.is_a?(Hash) and pre.isnull) ? 0 : (pre == nil ? -1 : @var.index(pre)) )
-			post = ( (post.is_a?(Hash) and post.isnull) ? 0 : @var.index(post) )
-
-			raise Exception, self.to_s if not prevail and post.nil?
-
-			return "#{@var.id} #{pre}" if post.nil?
-			return "0 #{@var.id} #{pre} #{post}"
-		end
-
-		def to_sas2(root, variables, is_prevail=true)
+		def to_sas(root, variables, is_prevail=true)
 			### resolve reference
 			pre = ((@pre.is_a?(String) and @pre.isref) ? variables[@pre.to_sym].init : @pre)
 			### calculate index
@@ -2132,6 +2194,36 @@ module Sfp
 			end
 		end
 
+		def dump(stream, 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
+
+			line = nil
+			if is_prevail
+				line = "#{@var.id} #{pre}\n"
+			else
+				### 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
+					line = "0 #{@var.id} #{pre} 0\n"
+				else
+					line = "0 #{@var.id} #{pre} #{@var.index(post)}\n"
+				end
+			end
+
+			raise TranslationException if line[-2] == ' '
+			stream.write line
+		end
+
 		def to_s
 			return @var.name + ',' +
 				(@pre == nil ? '-' : (@pre.is_a?(Hash) ? @pre.tostring : @pre.to_s)) + ',' +

metadata

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

checksums.yaml

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