adding ability to toggle structural and immediate on and off

opennars · Apr 27, 2024 · 0334569 · 0334569
1 parent 8e68b95
commit 0334569
Show file tree

Hide file tree

Showing 8 changed files with 217 additions and 212 deletions.
diff --git a/Tests/test_NAL/test_NAL1.py b/Tests/test_NAL/test_NAL1.py
@@ -66,7 +66,7 @@ def test_deduction(self):
         tasks_derived = process_two_premises(
             '<bird --> animal>. %1.00;0.90%', 
             '<robin --> bird>. %1.00;0.90%', 
-            20
+            10
         )
         self.assertTrue(
             output_contains(tasks_derived, '<robin --> animal>. %1.00;0.81%')

diff --git a/Tests/test_NAL/test_NAL2.py b/Tests/test_NAL/test_NAL2.py
@@ -141,6 +141,7 @@ def test_analogy_0(self):
             '<gull <-> swan>. %1.00;0.90%', 
             20
         )
+        for t in tasks_derived: print(t)
         self.assertTrue(
             output_contains(tasks_derived, '<gull --> swimmer>. %1.00;0.81%')
         )

diff --git a/Tests/test_NAL/test_NAL6.py b/Tests/test_NAL/test_NAL6.py
@@ -966,7 +966,7 @@ def test_abduction_with_variable_elimination_abduction(self):
         tasks_derived = process_two_premises(
             '<(&&,<#1 --> lock>,<#1 --> (/,open,$2,_)>) ==> <$2 --> key>>. %1.00;0.90%',
             '<<lock1 --> (/,open,$1,_)> ==> <$1 --> key>>. %1.00;0.90%',
-            4
+            20
         )
 
         self.assertTrue(
@@ -983,7 +983,7 @@ def test_abduction_with_variable_elimination_abduction_0(self):
         tasks_derived = process_two_premises(
             '<(&&,<#1 --> A>,<#1 --> B>) ==> C>. %1.00;0.90%',
             '<<M --> A> ==> C>. %1.00;0.90%',
-            4
+            20
         )
         self.assertTrue(
             output_contains(tasks_derived, '<M --> B>. %1.00;0.45%')
@@ -1112,7 +1112,7 @@ def test_0(self):
         <(&&, <#x-->A>, <#x-->B>, <<$y-->C>==><$y-->D>>, <$z-->E>) ==> <$x-->H>>.
         '''
 
-        tasks_derived = rule_map_two_premises(
+        tasks_derived = process_two_premises(
             "<(&&, <#x-->A>, <#x-->B>, <<$y-->C>==><$y-->D>>, <$z-->E>) ==> (&&, <$z-->F>, <#p-->G>, <#p-->H>)>. %1.00;0.90%", 
             "<(&&, <$x-->F>, <#p-->G>, <#p-->H>)==><$x-->H>>. %1.00;0.90%", 
             10)

diff --git a/Tests/test_NAL/test_NAL7.py b/Tests/test_NAL/test_NAL7.py
@@ -11,7 +11,6 @@
 
 class TEST_NAL7(unittest.TestCase):
     def setUp(self):
-        Global.time = 0
         nars.reset()
 
     ''''''
@@ -34,8 +33,9 @@ def test_deduction(self):
         tasks_derived = process_two_premises(
             '<<(*, $x, room_101) --> enter> =\> <(*, $x, door_101) --> open>>. %0.90;0.90%',
             '<<(*, $y, door_101) --> open> =\> <(*, $y, key_101) --> hold>>. %0.80;0.90%',
-            10
+            100
         )
+
         self.assertTrue(
             output_contains(tasks_derived, '<<(*,$0,room_101) --> enter> =\> <(*,$0,key_101) --> hold>>. %0.72;0.58%')
         )
@@ -59,7 +59,7 @@ def test_expemplification(self):
         tasks_derived = process_two_premises(
             '<<(*, $x, room_101) --> enter> =\> <(*, $x, door_101) --> open>>. %0.90;0.90%',
             '<<(*, $y, door_101) --> open> =\> <(*, $y, key_101) --> hold>>. %0.80;0.90%',
-            10
+            100
         )
         self.assertTrue(
             output_contains(tasks_derived, '<<(*,$0,key_101) --> hold> =/> <(*,$0,room_101) --> enter>>. %1.00;0.37%')
@@ -76,7 +76,7 @@ def test_induction_0(self):
         'Someone open door_101 after he hold key_101
         <<(*, $y, door_101) --> open> =\> <(*, $y, key_101) --> hold>>. %0.80;0.90%
 
-        10
+        100
 
         'If someone hold key_101, he will enter room_101
         ''outputMustContain('<<(*,$1,key_101) --> hold> =/> <(*,$1,room_101) --> enter>>. %0.90;0.39%')
@@ -86,7 +86,7 @@ def test_induction_0(self):
         tasks_derived = process_two_premises(
             '<<(*, $x, door_101) --> open> =/> <(*, $x, room_101) --> enter>>. %0.90;0.90%',
             '<<(*, $y, door_101) --> open> =\> <(*, $y, key_101) --> hold>>. %0.80;0.90%',
-            10
+            100
         )
 
         self.assertTrue(
@@ -117,7 +117,7 @@ def test_induction_1(self):
         tasks_derived = process_two_premises(
             '<<(*, $y, door_101) --> open> =\> <(*, $y, key_101) --> hold>>. %0.80;0.90%',
             '<<(*, $x, door_101) --> open> =/> <(*, $x, room_101) --> enter>>. %0.90;0.90%',
-            10
+            100
         )
 
         self.assertTrue(
@@ -147,7 +147,7 @@ def test_comparison_0(self):
         tasks_derived = process_two_premises(
             '<<(*, $x, door_101) --> open> =/> <(*, $x, room_101) --> enter>>. %0.90;0.90%',
             '<<(*, $y, door_101) --> open> =\> <(*, $y, key_101) --> hold>>. %0.80;0.90%',
-            10
+            100
         )
 
         self.assertTrue(
@@ -173,7 +173,7 @@ def test_comparison_1(self):
         tasks_derived = process_two_premises(
             '<<(*, $y, door_101) --> open> =\> <(*, $y, key_101) --> hold>>. %0.80;0.90%',
             '<<(*, $x, door_101) --> open> =/> <(*, $x, room_101) --> enter>>. %0.90;0.90%',
-            10
+            100
         )
 
         self.assertTrue(
@@ -199,7 +199,7 @@ def test_comparison_2(self):
         tasks_derived = process_two_premises(
             '<<(*, $x, room_101) --> enter> =/> <(*, $x, door_101) --> open>>. %0.90;0.90%',
             '<<(*, $y, key_101) --> hold> =\> <(*, $y, door_101) --> open>>. %0.80;0.90%',
-            10
+            100
         )
 
         self.assertTrue(
@@ -225,7 +225,7 @@ def test_comparison_3(self):
         tasks_derived = process_two_premises(
             '<<(*, $y, key_101) --> hold> =\> <(*, $y, door_101) --> open>>. %0.80;0.90%',
             '<<(*, $x, room_101) --> enter> =/> <(*, $x, door_101) --> open>>. %0.90;0.90%',
-            10
+            100
         )
 
         self.assertTrue(
@@ -277,11 +277,11 @@ def test_inference_on_tense_0(self):
         ''outputMustContain('<(*,John,room_101) --> enter>. :!5: %1.00;0.81%')
         '''
         tasks_derived = process_two_premises(
-            '<<(*,John,key_101) --> hold> =/> <(*,John,room_101) --> enter>>. %1.00;0.90%',
             '<(*,John,key_101) --> hold>. :|: %1.00;0.90%',
-            100
+            '<<(*,John,key_101) --> hold> =/> <(*,John,room_101) --> enter>>. %1.00;0.90%',
+            20
         )
-        Global.time = 0
+
         self.assertTrue(
             output_contains(tasks_derived, '<(*,John,room_101) --> enter>. :!5: %1.00;0.81%')
         )
@@ -303,11 +303,11 @@ def test_inference_on_tense_1(self):
         ''outputMustContain('<(*,John,key_101) --> hold>. :!-10: %1.00;0.45%')
         '''
         tasks_derived = process_two_premises(
-            '<<(*,John,key_101) --> hold> =/> <(*,John,room_101) --> enter>>. %1.00;0.90%',
             '<(*,John,room_101) --> enter>. :\: %1.00;0.90%',
-            100
+            '<<(*,John,key_101) --> hold> =/> <(*,John,room_101) --> enter>>. %1.00;0.90%',
+            10
         )
-        Global.time = 0
+
         self.assertTrue(
             output_contains(tasks_derived, '<(*,John,key_101) --> hold>. :!-10: %1.00;0.45%')
         )
@@ -331,7 +331,7 @@ def test_inference_on_tense_2(self):
         tasks_derived = process_two_premises(
             '<<(*,John,key_101) --> hold> =/> <(*,John,room_101) --> enter>>. %1.00;0.90%',
             '<(*,John,room_101) --> enter>. :\: %1.00;0.90%',
-            100
+            30
         )
 
         self.assertTrue(
@@ -375,9 +375,9 @@ def test_induction_on_tense_0_0(self):
         tasks_derived.extend(process_two_premises(
             '<John --> (/,enter,_,room_101)>. :|:',
             None,
-            100
+            20
         ))
-        Global.time = 0
+
         self.assertTrue(
             output_contains(tasks_derived, '<<John --> (/,enter,_,room_101)> =\> (&/,<John --> (/,open,_,door_101)>,+6)>. :!6: %1.00;0.45%')
         )
@@ -412,17 +412,12 @@ def test_induction_on_tense_0_1(self):
 
         10
         '''
-        tasks_derived = process_two_premises(
+        rules, task, belief, concept, task_link, term_link, result1, result2 = rule_map_two_premises(
             '<John --> (/,open,_,door_101)>. :|: ',
-            None,
-            6
-        )
-        tasks_derived.extend(process_two_premises(
             '<John --> (/,enter,_,room_101)>. :|: ',
-            None,
-            200
-        ))
-        Global.time = 0
+            'John.'
+        )
+        tasks_derived = [rule(task, belief, task_link, term_link) for rule in rules] 
         self.assertTrue(
             output_contains(tasks_derived, '<<$1 --> (/,enter,_,room_101)> =\> (&/,<$1 --> (/,open,_,door_101)>,+6)>. :!6: %1.00;0.45%')
         )
@@ -449,17 +444,12 @@ def test_induction_on_tense_1(self):
         'changed fomr +2 to +4 due to changes in interval calculations
         'this one is working, just throwing exception
         '''
-        tasks_derived = process_two_premises(
+        rules, task, belief, concept, task_link, term_link, result1, result2 = rule_map_two_premises(
             '<(*,John,key_101) --> hold>. :|:  %1.00;0.90% ',
-            None,
-            6
-        )
-        tasks_derived.extend(process_two_premises(
             '<<(*,John,door_101) --> open> =/> <(*,John,room_101) --> enter>>. :|:  %1.00;0.90%',
-            None,
-            200
-        ))
-        Global.time = 0
+            'John.'
+        )
+        tasks_derived = [rule(task, belief, task_link, term_link) for rule in rules] 
         self.assertTrue(
             output_contains(tasks_derived, '<(&/,<(*,John,key_101) --> hold>,+6,<(*,John,door_101) --> open>) =/> <(*,John,room_101) --> enter>>. :!6: %1.00;0.45%')
         )
@@ -483,8 +473,9 @@ def test_analogy(self):
         tasks_derived = process_two_premises(
             '<<(*, $x, door_101) --> open> =/> <(*, $x, room_101) --> enter>>. %0.95;0.90%',
             '<<(*, $x, room_101) --> enter> <|> <(*, $x, corridor_100) --> leave>>. %1.00;0.90%',
-            10
+            40
         )
+
         self.assertTrue(
             output_contains(tasks_derived, '<<(*,$0,door_101) --> open> =/> <(*,$0,corridor_100) --> leave>>. %0.95;0.81%')
         )
@@ -511,8 +502,9 @@ def test_deduction_sequence_eliminate_0(self):
         tasks_derived = process_two_premises(
             '<(*, John, key_101) --> hold>. :\: %1.00;0.90%',
             '<(&/,<(*, John, key_101) --> hold>,+100) =/> <(*, John, room_101) --> enter>>. %1.00;0.90%',
-            20
+            200
         )
+        tasks_derived = [rule(task, belief, task_link, term_link) for rule in rules] 
         self.assertTrue(
             output_contains(tasks_derived, '<(*,John,room_101) --> enter>. :!100: %1.00;0.81%')
         )

diff --git a/pynars/Console.py b/pynars/Console.py
@@ -3,7 +3,6 @@
 from pathlib import Path
 from pynars import Narsese, NAL, NARS
 from time import sleep
-from multiprocessing import Process
 import os
 from pynars.Narsese.Parser.parser import TreeToNarsese
 from pynars.Narsese import Sentence