porolog 1.0.0 → 1.0.1

data/lib/porolog/arguments.rb

@@ -68,7 +68,7 @@ module Porolog
     
     # Creates a fact rule that states that these arguments do not satisfy the Predicate.
     # @return [Porolog::Arguments] the Arguments
-    def falicy!
+    def fallacy!
       @predicate << Rule.new(self, false)
       self
     end
@@ -82,7 +82,7 @@ module Porolog
     
     # Creates a fact rule that states that these arguments do not satisfy the Predicate and terminates solving the predicate.
     # @return [Porolog::Arguments] the Arguments
-    def cut_falicy!
+    def cut_fallacy!
       @predicate << Rule.new(self, [:CUT, false])
       self
     end

data/lib/porolog/rule.rb

@@ -116,7 +116,7 @@ module Porolog
           subgoal.log << "CUTTING #{goal.inspect}..."
           result = true
           if conjunction.empty?
-            block.call(subgoal)
+            !goal.terminated? && block.call(subgoal)
           else
             result = satisfy_conjunction(goal, subgoal, conjunction, &block)
           end
@@ -132,7 +132,7 @@ module Porolog
           return false
         
         when nil
-          block.call(subgoal)
+          !goal.terminated? && block.call(subgoal)
           return true
       end
       
@@ -145,16 +145,16 @@ module Porolog
       unified && subsubgoal.satisfy() do
         result = true
         if conjunction.empty?
-          block.call(goal)
+          !goal.terminated? && block.call(goal)
         else
-          result = satisfy_conjunction(goal, subsubgoal, conjunction, &block)
+          result = !goal.terminated? && satisfy_conjunction(goal, subsubgoal, conjunction, &block)
         end
       end
       
       # -- Uninstantiate --
       subsubgoal.delete!
       
-      result
+      result && !goal.terminated?
     end
     
   end

data/test/porolog/arguments_test.rb

@@ -166,12 +166,12 @@ describe 'Porolog' do
       
     end
     
-    describe '#falicy!' do
+    describe '#fallacy!' do
       
-      it 'should create a falicy for its predicate' do
+      it 'should create a fallacy for its predicate' do
         arguments1 = pred.(1,'a',0.1)
         
-        arguments1.falicy!
+        arguments1.fallacy!
         
         assert_equal '[  pred(1,"a",0.1):- false]', pred.rules.inspect
       end
@@ -190,12 +190,12 @@ describe 'Porolog' do
       
     end
     
-    describe '#cut_falicy!' do
+    describe '#cut_fallacy!' do
       
-      it 'should create a falicy for its predicate and terminate solving the goal' do
+      it 'should create a fallacy for its predicate and terminate solving the goal' do
         arguments1 = pred.(1,'a',0.1)
         
-        arguments1.cut_falicy!
+        arguments1.cut_fallacy!
         
         assert_equal '[  pred(1,"a",0.1):- [:CUT, false]]', pred.rules.inspect
       end
@@ -772,10 +772,10 @@ describe 'Porolog' do
         refute    f(3).valid?, name
       end
       
-      it 'should return false when a falicy is found' do
+      it 'should return false when a fallacy is found' do
         predicate :f
         
-        f(3).falicy!
+        f(3).fallacy!
         
         refute    f(3).valid?, name
       end

data/test/porolog/goal_test.rb

@@ -644,10 +644,10 @@ describe 'Porolog' do
         assert_equal  [{}],  solutions
       end
       
-      it 'should not solve a falicy' do
+      it 'should not solve a fallacy' do
         predicate :fact
         
-        fact(42).falicy!
+        fact(42).fallacy!
         
         solutions = fact(42).solve
         

data/test/porolog/predicate/builtin_test.rb

@@ -393,31 +393,31 @@ describe 'Porolog' do
       
       describe '#noteq' do
         
-        it 'should return no solutions when given unequal values' do
+        it 'should return a solution when given unequal values' do
           builtin :noteq
           
           assert_solutions  noteq([3,2,1,4], [1,2,3,4]), [{}]
         end
         
-        it 'should return a solution when given equal values' do
+        it 'should return no solutions when given equal values' do
           builtin :noteq
           
           assert_solutions  noteq([1,2,3,4], [1,2,3,4]), []
         end
         
-        it 'should return a solution with an unbound variable when given the same unbound variable' do
+        it 'should return no solutions with an unbound variable when given the same unbound variable' do
           builtin :noteq
           
           assert_solutions  noteq(:X, :X), []
         end
         
-        it 'should return no solutions when given two unbound variables' do
+        it 'should return a solution when given two unbound variables' do
           builtin :noteq
           
           assert_solutions  noteq(:X, :Y), [{ X: nil, Y: nil }]
         end
         
-        it 'should return one solution with unbound variables when given given two uninstantiated variables that are bound to each other' do
+        it 'should return no solutions with unbound variables when given given two uninstantiated variables that are bound to each other' do
           builtin :noteq, :is
           predicate :bind_and_noteq
           
@@ -429,7 +429,7 @@ describe 'Porolog' do
           assert_solutions  bind_and_noteq(:X, :Y), []
         end
         
-        it 'should return no solutions when given two uninstantiated variables that are not bound to each other' do
+        it 'should return a solution when given two uninstantiated variables that are not bound to each other' do
           builtin :noteq, :is
           predicate :bind_and_noteq
           

data/test/porolog/predicate_test.rb

@@ -254,10 +254,10 @@ describe 'Porolog' do
         assert_Predicate  alpha, :alpha, [alpha.rules.first]
       end
       
-      it 'should add new falicies to a predicate' do
+      it 'should add new fallacies to a predicate' do
         alpha = Predicate.new 'alpha'
         
-        alpha.('p','q').falicy!
+        alpha.('p','q').fallacy!
         
         assert_equal    1,                                  alpha.rules.size
         assert_equal    false,                              alpha.rules.first.definition

data/test/samples_test.rb

@@ -120,7 +120,7 @@ describe 'Porolog' do
 
     same(:X,:X).fact!
 
-    not_same(:X,:X).cut_falicy!
+    not_same(:X,:X).cut_fallacy!
     not_same(:X,:Y).fact!
 
     (1..5).to_a.each_cons(2) do |left, right|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: porolog
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Luis Esteban
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-02 00:00:00.000000000 Z
+date: 2020-08-06 00:00:00.000000000 Z
 dependencies: []
 description: Implements a Prolog inference engine using Plain Old Ruby Objects
 email: