porolog 0.0.7 → 0.0.8

data/test/test_helper.rb

@@ -31,6 +31,7 @@ def reset
   Arguments.reset
   Rule.reset
   Goal.reset
+  Instantiation.reset
 end
 
 def assert_Scope(scope, name, predicates)
@@ -59,9 +60,9 @@ def assert_Rule(rule, predicate, arguments, definition)
 end
 
 def assert_Goal(goal, predicate, arguments)#, definition)
-  assert_instance_of  Goal,             goal
-  assert_equal        predicate,        goal.arguments.predicate.name
-  assert_equal        arguments,        goal.arguments.arguments
+  assert_instance_of  Goal,                       goal
+  assert_equal        predicate,                  goal.arguments.predicate.name
+  assert_equal        goal.variablise(arguments), goal.arguments.arguments
   # TODO: add definition
   #assert_equal        definition,       goal.definition
 end
@@ -69,8 +70,80 @@ end
 def assert_Goal_variables(goal, hash, str)
   assert_instance_of  Goal,             goal
   assert_equal        hash,             goal.variables
-  # TODO: add inspect_variables
-  #assert_equal        str,              goal.inspect_variables
+  assert_equal        str,              goal.inspect_variables
+end
+
+def assert_Value(value, value_value, goal)
+  assert_instance_of  Value,            value
+  assert_equal        value_value,      value.value
+  assert_equal        goal,             value.goal
+end
+
+def assert_Variable(variable, name, goal, instantiations, values)
+  assert_instance_of  Variable,         variable
+  assert_equal        name,             variable.name
+  assert_equal        goal,             variable.goal
+  assert_equal        instantiations,   variable.instantiations
+  assert_equal        values,           variable.values
+end
+
+def assert_Instantiation(instantiation, variable1, variable2, index1, index2)
+  assert_instance_of  Instantiation,    instantiation
+  assert_includes     [Variable,Value], variable1.class
+  assert_includes     [Variable,Value], variable2.class
+  assert_equal        variable1,        instantiation.variable1
+  assert_equal        variable2,        instantiation.variable2
+  if index1
+    assert_equal      index1,           instantiation.index1
+  else
+    assert_nil                          instantiation.index1
+  end
+  if index2
+    assert_equal      index2,           instantiation.index2
+  else
+    assert_nil                          instantiation.index2
+  end
+end
+
+def assert_Tail(tail, inspect)
+  assert_instance_of  Tail,             tail
+  assert_equal        inspect,          tail.inspect
+end
+
+def assert_Array_with_Tail(array, head, inspect)
+  assert_instance_of  Array,            array
+  assert_equal        head.size + 1,    array.size
+  assert_equal        head,             array[0...head.size]
+  assert_Tail         array.last,       inspect
+end
+
+def expect_unify_arrays_with_calls(no_tails, some_tails, all_tails)
+  expects(:unify_arrays_with_no_tails  ).times(no_tails)
+  expects(:unify_arrays_with_some_tails).times(some_tails)
+  expects(:unify_arrays_with_all_tails ).times(all_tails)
+end
+
+def assert_Unify_arrays(arrays, goals, merged, unifications = [])
+  result_merged, result_unifications = unify_arrays(*arrays, *goals)
+  
+  unifications = unifications.map{|v1,v2,g1,g2|
+    assert_instance_of  Goal, g1
+    assert_instance_of  Goal, g2
+    [g1.variablise(v1), g2.variablise(v2), g1, g2]
+  }
+  
+  assert_equal    merged,          result_merged
+  assert_equal    unifications,    result_unifications
+end
+
+def refute_Unify_arrays(arrays, goals, log = [])
+  result = unify_arrays(*arrays, *goals)
+  
+  assert_nil      result
+  
+  goals.each do |goal|
+    assert_equal    log,            goal.log
+  end
 end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: porolog
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Luis Esteban
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-18 00:00:00.000000000 Z
+date: 2020-07-06 00:00:00.000000000 Z
 dependencies: []
 description: Implements a Prolog inference engine using Plain Old Ruby Objects (work
   in progress)
@@ -40,18 +40,24 @@ files:
 - lib/porolog/core_ext.rb
 - lib/porolog/error.rb
 - lib/porolog/goal.rb
+- lib/porolog/instantiation.rb
 - lib/porolog/predicate.rb
 - lib/porolog/rule.rb
 - lib/porolog/scope.rb
+- lib/porolog/tail.rb
 - lib/porolog/value.rb
+- lib/porolog/variable.rb
 - test/porolog/arguments_test.rb
 - test/porolog/core_ext_test.rb
 - test/porolog/goal_test.rb
+- test/porolog/instantiation_test.rb
 - test/porolog/porolog_test.rb
 - test/porolog/predicate_test.rb
 - test/porolog/rule_test.rb
 - test/porolog/scope_test.rb
+- test/porolog/tail_test.rb
 - test/porolog/value_test.rb
+- test/porolog/variable_test.rb
 - test/test_helper.rb
 homepage: https://github.com/wizardofosmium/porolog
 licenses:
@@ -72,13 +78,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Prolog using Plain Old Ruby Objects (work in progress)
 test_files:
 - test/test_helper.rb
+- test/porolog/instantiation_test.rb
+- test/porolog/variable_test.rb
+- test/porolog/tail_test.rb
 - test/porolog/porolog_test.rb
 - test/porolog/goal_test.rb
 - test/porolog/core_ext_test.rb