sfp 0.3.6 → 0.3.7

data/lib/sfp/sas_translator.rb

@@ -29,6 +29,8 @@
 # - foreach subclasses, inherits attributes and procedures from superclass
 # - foreach objects, inherits attributes and procedures from class
 
+require 'benchmark'
+
 module Sfp
 
 	class TranslationException < Exception; end
@@ -49,9 +51,10 @@ module Sfp
 		GoalVariable = '-goal-'
 
 		GlobalConstraintMethod = 1 # 1: proposed method, 2: patrik's, 3: concurrent-actions
+		ActivateSimpleGlobalConstraint = false #true
 
 		attr_accessor :root
-		attr_reader :variables, :types, :operators, :axioms, :goals
+		attr_reader :variables, :types, :operators, :axioms, :goals, :benchmarks
 
 		def to_sas
 			self.compile_step_1
@@ -60,11 +63,14 @@ module Sfp
 		end
 
 		def compile_step_2
-			self.postprocess_simple_global_constraint
+			@benchmarks['postprocessing simple global constraint'] = Benchmark.measure do
+				self.postprocess_simple_global_constraint
+			end
 		end
 
 		def compile_step_1
 			begin
+				@benchmarks = {}
 				@unknown_value = ::Sfp::Unknown.new
 
 				@arrays = Hash.new
@@ -116,6 +122,7 @@ module Sfp
 					@root['sometime-after'].delete('_parent')
 				end
 
+			@benchmarks['generating variables'] = Benchmark.measure do
 				@root['initial'].accept(Sfp::Visitor::ReferenceModifier.new)
 				@root['goal'].accept(Sfp::Visitor::ReferenceModifier.new) if @root.has_key?('goal')
 				@root['global'].accept(Sfp::Visitor::ReferenceModifier.new) if @root.has_key?('global')
@@ -147,20 +154,31 @@ module Sfp
 
 				# re-evaluate set variables and types
 				self.evaluate_set_variables_and_types
+			end
 
+			@benchmarks['processing goal'] = Benchmark.measure do
 				### process goal constraint ###
 				process_goal(@root['goal']) if @root.has_key?('goal') and
 						@root['goal'].isconstraint
+			end
 
+			@benchmarks['processing global constraint'] = Benchmark.measure do
 				### process global constrait
 				self.process_global_constraint
+			end
 
+			@benchmarks['processing sometime constraint'] = Benchmark.measure do
 				### normalize sometime formulae ###
 				if @root.has_key?('sometime')
 					raise TranslationException, 'Invalid sometime constraint' if
 						not normalize_formula(@root['sometime'])
 				end
+			end
+
+				# add Sfp::Unknown and Sfp::Undefined value to all non-final variables
+				self.add_unknown_undefined_value_to_variables
 
+			@benchmarks['processing procedures'] = Benchmark.measure do
 				### process all procedures
 				@variables.each_value do |var|
 					if var.is_final
@@ -168,6 +186,7 @@ module Sfp
 					end
 				end
 				self.reset_operators_name
+			end
 
 				### process sometime modalities ###
 				self.process_sometime if @root.has_key?('sometime')
@@ -177,7 +196,7 @@ module Sfp
 				# detect and merge mutually inclusive operators
 				self.search_and_merge_mutually_inclusive_operators
 
-				self.add_unknown_value_to_nonstatic_variables
+				#self.add_unknown_value_to_nonstatic_variables
 
 				#self.dump_types
 				#self.dump_vars
@@ -294,6 +313,11 @@ module Sfp
 		#####
 		def postprocess_simple_global_constraint
 			@operators.keys.each do |name|
+				# skip global, sometime, and goal verifier operators
+				next if name =~ /\-globalop\-/
+				next if name =~ /\-sometime\-/
+				next if name =~ /\-goal\-/
+
 				operator = @operators[name]
 				@operators.delete(name)
 
@@ -327,23 +351,36 @@ module Sfp
 				end
 			end
 
-			# TODO - test with premise and conclusion clauses have > 1 statements
-			#
-			# pre |= premise
+			# return true if precondition supports premise
 			def pre_support_premise(operator, premise)
 				premise.each { |var,c|
 					next if var[0,1] == '_'
-					return false if !operator.has_key?(var) or (!operator[var].pre.nil? and c['_value'] != operator[var].pre)
+					return false if !operator.has_key?(var) or (!operator[var].pre.nil? and operator[var].pre != c['_value'])
 				}
 				true
 			end
 
+			# return true if postcondition supports premise
+			def post_support_premise(operator, premise)
+				premise.each { |var,c|
+					return true if var[0,1] != '_' and operator.has_key?(var) and
+						!operator[var].post.nil? and operator[var].post == c['_value']
+				}
+				false
+			end
+
 			def post_threat_conclusion(operator, conclusion)
+				conclusion.each { |var,c|
+					return true if var[0,1] == '_' and operator.has_key?(var) and
+						!operator[var].post.nil? and operator[var].post != c['_value']
+				}
+				false
+			end
+
+			def pre_threat_conclusion(operator, conclusion)
 				conclusion.each { |var,c|
 					next if var[0,1] == '_'
-					if operator.has_key?(var) and !operator[var].post.nil? and operator[var].post != c['_value']
-						return true
-					end
+					return true if !operator.has_key?(var) or (!operator[var].pre.nil? and operator[var].pre != c['_value'])
 				}
 				false
 			end
@@ -351,10 +388,12 @@ module Sfp
 			return [operator] if not @global_simple_implications.is_a?(Hash)
 
 			@global_simple_implications.each do |id,imply|
-				# If the operator's precondition support the premise, then
+				# If the operator's precondition support the premise or
+				# if the operator's postcondition support the premise, then
 				# it should support the conclusion as well.
-				if pre_support_premise(operator, imply['_premise'])
-					imply['_conclusion'].each { |var,c|
+				if pre_support_premise(operator, imply['_premise']) or
+				   post_support_premise(operator, imply['_premise'])
+					imply['_conclusion'].each do |var,c|
 						next if var[0,1] == '_'
 						if operator.has_key?(var)
 							if operator[var].pre.nil? # enforce the operator to support the conclusion
@@ -366,27 +405,30 @@ module Sfp
 							# enforce the operator to support the conclusion
 							operator[var] = Parameter.new(@variables[var], c['_value'])
 						end
-					}
+					end
 				end
 			end
 			
 			results = []
 			@global_simple_implications.each do |id,imply|
-				imply['_premise'].each do |var,c|
-					next if var[0,1] == '_'
-					@variables[var].not(c['_value']).each { |x|
-						op = operator.clone
-						if op.has_key?(var)
-							if op[var].pre != x
-								op[var].pre == x
+				if pre_threat_conclusion(operator, imply['_conclusion']) or
+				   post_threat_conclusion(operator, imply['_conclusion'])
+					imply['_premise'].each do |var,c|
+						next if var[0,1] == '_'
+						@variables[var].not(c['_value']).each do |x|
+							op = operator.clone
+							if op.has_key?(var)
+								if op[var].pre != x
+									op[var].pre == x
+									results << op
+								end
+							else
+								op[var] = Parameter.new(@variables[var], x)
 								results << op
 							end
-						else
-							op[var] = Parameter.new(@variables[var], x)
-							results << op
 						end
-					}
-				end if post_threat_conclusion(operator, imply['_conclusion'])
+					end
+				end
 			end
 			return [operator] if results.length <= 0
 			results
@@ -415,7 +457,10 @@ module Sfp
 			end
 
 			global = @root['global']
-			simples = global.select { |k,v| k[0,1] != '_' and simple_formulae(k, v) }
+			simples = global.select { |k,v| k[0,1] != '_' and
+				(!k.isref or @variables.has_key?(k)) and
+				simple_formulae(k, v)
+			}
 
 			@global_simple_conjunctions = {}
 			@global_simple_implications = {}
@@ -447,7 +492,7 @@ module Sfp
 
 			### normalize global constraint formula ###
 			if @root.has_key?('global') and @root['global'].isconstraint
-				preprocess_simple_global_constraint
+				preprocess_simple_global_constraint if ActivateSimpleGlobalConstraint
 
 				keys = @root['global'].keys.select { |k| k[0,1] != '_' }
 				@total_complex_global_constraints = keys.length
@@ -896,6 +941,15 @@ module Sfp
 			}
 		end
 
+		def add_unknown_undefined_value_to_variables
+			@variables.each_value { |variable|
+				#next if variable.is_final
+				variable << @unknown_value
+				variable << Sfp::Undefined.create(variable.type)
+				variable.uniq!
+			}
+		end
+
 		def apply_global_constraint_method_1(operator)
 			return true if not @root.has_key?('global') or not @root['global'].isconstraint
 			operator[@global_var.name] = Parameter.new(@global_var, true, false)
@@ -1056,7 +1110,7 @@ module Sfp
 				# TODO
 				#puts 'nested right: ' + left + ' = ' + right['_value']
 
-				raise TranslationException, 'not implemented: normalized_nested_right'
+				raise TranslationException, "not implemented: normalized_nested_right => #{right}"
 			end
 
 			def normalize_nested_right_only(left, right, formula)

data/sfp.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 	s.name			= 'sfp'
-	s.version		= '0.3.6'
-	s.date			= '2013-08-05'
+	s.version		= '0.3.7'
+	s.date			= '2013-08-13'
 	s.summary		= 'SFP Parser'
 	s.description	= 'A Ruby API and script for SFP language parser'
 	s.authors		= ['Herry']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sfp
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
   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: json
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &14689520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,15 +21,10 @@ dependencies:
         version: 1.7.5
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.7.5
+  version_requirements: *14689520
 - !ruby/object:Gem::Dependency
   name: antlr3
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &14689040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -37,12 +32,7 @@ dependencies:
         version: 1.9.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.9.0
+  version_requirements: *14689040
 description: A Ruby API and script for SFP language parser
 email: herry13@gmail.com
 executables:
@@ -89,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: sfp
-rubygems_version: 1.8.23
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: SFP Parser