Merge pull request #1760 from rodsol/tmp-call

Tmp call
opencog · Sep 8, 2015 · 1dcecd6 · 1dcecd6
2 parents d2726b3 + 35fc41c
commit 1dcecd6
Showing 1 changed file with 76 additions and 1 deletion.
diff --git a/opencog/nlp/relex2logic/rule-helpers.scm b/opencog/nlp/relex2logic/rule-helpers.scm
@@ -670,6 +670,8 @@
 (define (possessive-rule noun noun_instance word word_instance)
 	(list (InheritanceLink (ConceptNode noun_instance) (ConceptNode noun))
 	(InheritanceLink (ConceptNode word_instance) (ConceptNode word))
+	(r2l-wordinst-concept noun_instance)
+	(r2l-wordinst-concept word_instance)
 	(EvaluationLink
 		(PredicateNode "possession")
 		(ListLink
@@ -689,6 +691,10 @@
 	(InheritanceLink (ConceptNode o_instance) (ConceptNode o))
 	(ImplicationLink (PredicateNode v1_instance) (PredicateNode v1))
 	(ImplicationLink (PredicateNode v2_instance) (PredicateNode v2))
+	(r2l-wordinst-concept s_instance)
+	(r2l-wordinst-concept o_instance)
+	(r2l-wordinst-Predicate v1_instance)
+	(r2l-wordinst-Predicate v2_instance)
 	(EvaluationLink
 		(PredicateNode v1_instance)
 		(ListLink
@@ -712,6 +718,11 @@
 	(InheritanceLink (ConceptNode o_instance) (ConceptNode o))
 	(ImplicationLink (PredicateNode v1_instance) (PredicateNode v1))
 	(ImplicationLink (PredicateNode v2_instance) (PredicateNode v2))
+	(r2l-wordinst-concept s1_instance)
+	(r2l-wordinst-concept s2_instance)
+	(r2l-wordinst-concept o_instance)
+	(r2l-wordinst-Predicate v1_instance)
+	(r2l-wordinst-Predicate v2_instance)
 	(EvaluationLink
 		(PredicateNode v1_instance)
 		(ListLink
@@ -733,6 +744,9 @@
     (list (InheritanceLink (ConceptNode v1_instance) (ConceptNode v1))
     (ImplicationLink (PredicateNode v2_instance) (PredicateNode v2))
     (InheritanceLink (ConceptNode v3_instance) (ConceptNode v3))
+	(r2l-wordinst-concept v1_instance)
+	(r2l-wordinst-concept v3_instance)
+	(r2l-wordinst-Predicate v2_instance)
     (EvaluationLink
         (PredicateNode v2_instance)
         (ListLink ; does this ListLink make sense here? (by sebastianruder)
@@ -748,6 +762,8 @@
 (define (to-do-rule-4 v1 v1_instance v2 v2_instance) 
     (list (InheritanceLink (ConceptNode v2_instance) (ConceptNode v2))
     (ImplicationLink (PredicateNode v1_instance) (PredicateNode v1))
+	(r2l-wordinst-concept v2_instance)
+	(r2l-wordinst-Predicate v1_instance)
     (EvaluationLink
         (PredicateNode "able_to")
         (ListLink
@@ -763,6 +779,9 @@
     (list (InheritanceLink (ConceptNode subj_instance) (ConceptNode subj))
     (ImplicationLink (PredicateNode verb1_instance) (PredicateNode verb1))
     (ImplicationLink (PredicateNode verb2_instance) (PredicateNode verb2))
+	(r2l-wordinst-concept subj_instance)
+	(r2l-wordinst-Predicate verb1_instance)
+	(r2l-wordinst-Predicate verb2_instance)
     (EvaluationLink
         (PredicateNode verb1_instance)
         (ListLink
@@ -786,6 +805,7 @@
 	(let ((var_name (choose-var-name)))
 		(list
 			(ImplicationLink (PredicateNode verb_instance) (PredicateNode verb))
+			(r2l-wordinst-Predicate verb_instance)
 			(EvaluationLink 
 				(PredicateNode "AtPlace")
 				(ListLink	
@@ -803,6 +823,7 @@
 	(let ((var_name (choose-var-name)))
 		(list
 			(InheritanceLink (ConceptNode subj_instance) (ConceptNode subj_concept))
+			(r2l-wordinst-concept subj_instance)
 			(EvaluationLink 
 				(PredicateNode "AtPlace")
 				(ListLink	
@@ -824,6 +845,7 @@
 	(let ((var_name (choose-var-name)))
 		(list
 			(ImplicationLink (PredicateNode verb_instance) (PredicateNode verb))
+			(r2l-wordinst-Predicate verb_instance)
 			(AtTimeLink
 				(VariableNode var_name)
 				(PredicateNode verb_instance)
@@ -838,6 +860,7 @@
 	(let ((var_name (choose-var-name)))
 		(list 	
 			(InheritanceLink (ConceptNode subj_instance) (ConceptNode subj_concept))
+			(r2l-wordinst-concept subj_instance)
 			(AtTimeLink
 				(VariableNode var_name)
 				(ConceptNode subj_instance)
@@ -856,6 +879,7 @@
 	(let ((var_name (choose-var-name)))
 		(list
 			(ImplicationLink (PredicateNode verb_instance) (PredicateNode verb))
+			(r2l-wordinst-Predicate verb_instance)
 			(EvaluationLink 
 				(PredicateNode "Because")
 				(ListLink	
@@ -873,6 +897,7 @@
 	(let ((var_name (choose-var-name)))
 		(list
 			(InheritanceLink (ConceptNode subj_instance) (ConceptNode subj_concept))
+			(r2l-wordinst-concept subj_instance)
 			(EvaluationLink 
 				(PredicateNode "Because")
 				(ListLink	
@@ -893,6 +918,7 @@
 	(let ((var_name (choose-var-name)))
 		(list
 			(ImplicationLink (PredicateNode verb_instance) (PredicateNode verb))
+			(r2l-wordinst-Predicate verb_instance)
 			(EvaluationLink 
 				(PredicateNode "InManner")
 				(ListLink	
@@ -913,6 +939,7 @@
 	(let ((var_name (choose-var-name)))
 		(list 	
 			(InheritanceLink (ConceptNode subj_instance) (ConceptNode subj_concept))
+			(r2l-wordinst-concept subj_instance)
 			(InheritanceLink (ConceptNode subj_instance) (VariableNode var_name))
 		)
 	)
@@ -930,6 +957,7 @@
 	(let ((var_name (choose-var-name)))
 		(list
 			(InheritanceLink (ConceptNode instance) (ConceptNode concept))
+			(r2l-wordinst-concept instance)
 			(QuantityLink	
 				(ConceptNode instance)
 				(VariableNode var_name)
@@ -944,6 +972,7 @@
 	(let ((var_name (choose-var-name)))
 		(list
 			(InheritanceLink (ConceptNode instance) (ConceptNode concept))
+			(r2l-wordinst-concept instance)
 			(EvaluationLink
 				(PredicateNode "DegreeLink")
 				(ListLink
@@ -975,6 +1004,9 @@
 			(InheritanceLink (ConceptNode subj_instance) (ConceptNode subj_concept))
 			(InheritanceLink (ConceptNode obj_instance) (ConceptNode obj_concept))
 			(InheritanceLink (VariableNode var_name) (ConceptNode obj_instance))
+			(r2l-wordinst-concept subj_instance)
+			(r2l-wordinst-concept obj_instance)
+			(r2l-wordinst-Predicate verb_instance)
 			(SatisfyingSetLink
 				(VariableNode var_name) 	
 				(EvaluationLink (PredicateNode verb_instance)
@@ -997,6 +1029,9 @@
 			(InheritanceLink (ConceptNode subj_instance) (ConceptNode subj_concept))
 			(ImplicationLink (PredicateNode obj_instance) (PredicateNode obj_concept))
 			(InheritanceLink (VariableNode var_name) (ConceptNode subj_instance))
+			(r2l-wordinst-concept subj_instance)
+			(r2l-wordinst-concept obj_instance)
+			(r2l-wordinst-Predicate verb_instance)
 			(SatisfyingSetLink
 				(VariableNode var_name)
 				(EvaluationLink (PredicateNode verb_instance)
@@ -1020,6 +1055,10 @@
 			(InheritanceLink (ConceptNode obj_instance) (ConceptNode obj_concept))
 			(InheritanceLink (ConceptNode iobj_instance) (ConceptNode iobj_concept))
 			(InheritanceLink (VariableNode var_name) (ConceptNode iobj_instance))
+			(r2l-wordinst-concept subj_instance)
+			(r2l-wordinst-concept obj_instance)
+			(r2l-wordinst-concept iobj_instance)
+			(r2l-wordinst-Predicate verb_instance)
 			(SatisfyingSetLink
 				(VariableNode var_name)
 				(EvaluationLink (PredicateNode verb_instance)
@@ -1042,6 +1081,8 @@
 			(InheritanceLink (ConceptNode subj_instance) (ConceptNode subj_concept))
 			(ImplicationLink (PredicateNode pred_instance) (PredicateNode pred_concept))	
 			(InheritanceLink (VariableNode var_name) (ConceptNode subj_instance) )
+			(r2l-wordinst-concept subj_instance)
+			(r2l-wordinst-Predicate pred_instance)
 			(SatisfyingSetLink
 				; (ScopeLink ;; not yet supported !? Huhh ??
 					(VariableNode var_name)
@@ -1067,6 +1108,7 @@
 ; "All right-handed Canadians write."    -> (all-rule "Canadians@333")
 (define (all-rule noun_instance)
 	(list
+		(r2l-wordinst-concept noun_instance)
 		(EvaluationLink
 			(PredicateNode "allmarker")
 			(ListLink
@@ -1085,6 +1127,9 @@
     (list (ImplicationLink (PredicateNode verb_instance) (PredicateNode verb))
     (InheritanceLink (ConceptNode obj_instance) (ConceptNode obj))
     (InheritanceLink (ConceptNode passive_obj_instance) (ConceptNode passive_obj))
+	(r2l-wordinst-concept obj_instance)
+	(r2l-wordinst-concept passive_obj_instance)
+	(r2l-wordinst-Predicate verb_instance)
     (EvaluationLink
             (PredicateNode verb_instance)
             (ListLink
@@ -1100,6 +1145,8 @@
 		(list
 			(ImplicationLink (PredicateNode verb_instance) (PredicateNode verb))
 			(InheritanceLink (ConceptNode obj_instance) (ConceptNode obj))
+			(r2l-wordinst-concept obj_instance)
+			(r2l-wordinst-Predicate verb_instance)
 			(EvaluationLink
 				(PredicateNode verb_instance)
 					(ListLink
@@ -1123,6 +1170,8 @@
     (cond [(equal? pos "verb") 
 	(list (ImplicationLink (PredicateNode var1_instance) (PredicateNode var1))
 	(ImplicationLink (PredicateNode var2_instance) (PredicateNode var2))
+	(r2l-wordinst-Predicate var1_instance)
+	(r2l-wordinst-Predicate var2_instance)
         (EvaluationLink
         (PredicateNode "and")
 		(ListLink
@@ -1133,6 +1182,8 @@
 	[else 
     (list (InheritanceLink (ConceptNode var1_instance) (ConceptNode var1))
 	(InheritanceLink (ConceptNode var2_instance) (ConceptNode var2))
+	(r2l-wordinst-concept var1_instance)
+	(r2l-wordinst-concept var2_instance)
         (EvaluationLink
         (PredicateNode "and")
 		(ListLink
@@ -1146,6 +1197,8 @@
     (cond [(equal? pos "verb") 
 	(list (ImplicationLink (PredicateNode var1_instance) (PredicateNode var1))
 	(ImplicationLink (PredicateNode var2_instance) (PredicateNode var2))
+	(r2l-wordinst-Predicate var1_instance)
+	(r2l-wordinst-Predicate var2_instance)
         (EvaluationLink
         (PredicateNode "but")
 		(ListLink
@@ -1155,7 +1208,8 @@
 	))]
 	[else 
     (list (InheritanceLink (ConceptNode var1_instance) (ConceptNode var1))
-	(InheritanceLink (ConceptNode var2_instance) (ConceptNode var2))
+	(r2l-wordinst-concept var1_instance)
+	(r2l-wordinst-concept var2_instance)
         (EvaluationLink
         (PredicateNode "but")
 		(ListLink
@@ -1169,6 +1223,8 @@
     (cond [(equal? pos "verb") 
 	(list (ImplicationLink (PredicateNode var1_instance) (PredicateNode var1))
 	(ImplicationLink (PredicateNode var2_instance) (PredicateNode var2))
+	(r2l-wordinst-Predicate var1_instance)
+	(r2l-wordinst-Predicate var2_instance)
         (EvaluationLink
         (PredicateNode "or")
 		(ListLink
@@ -1179,6 +1235,8 @@
 	[else 
     (list (InheritanceLink (ConceptNode var1_instance) (ConceptNode var1))
 	(InheritanceLink (ConceptNode var2_instance) (ConceptNode var2))
+	(r2l-wordinst-concept var1_instance)
+	(r2l-wordinst-concept var2_instance)
         (EvaluationLink
         (PredicateNode "or")
 		(ListLink
@@ -1195,6 +1253,8 @@
 	(list 
 		(ImplicationLink (PredicateNode comp_instance) (PredicateNode comp_concept))
 		(ImplicationLink (PredicateNode pred_instance) (PredicateNode pred_concept))
+		(r2l-wordinst-Predicate comp_instance)
+		(r2l-wordinst-Predicate pred_instance)
 		(EvaluationLink
 			(PredicateNode comp_instance)
 			(ListLink
@@ -1208,6 +1268,8 @@
 	(list 
 		(ImplicationLink (PredicateNode comp_instance) (PredicateNode comp_concept))
 		(ImplicationLink (PredicateNode pred_instance) (PredicateNode pred_concept))
+		(r2l-wordinst-Predicate comp_instance)
+		(r2l-wordinst-Predicate pred_instance)
 		(EvaluationLink
 			(PredicateNode "InManner")
 			(ListLink
@@ -1222,6 +1284,8 @@
 	(list 
 		(ImplicationLink (PredicateNode comp_instance) (PredicateNode comp_concept))
 		(ImplicationLink (PredicateNode pred_instance) (PredicateNode pred_concept))
+		(r2l-wordinst-Predicate comp_instance)
+		(r2l-wordinst-Predicate pred_instance)
 		(EvaluationLink
 			(PredicateNode "Because")
 			(ListLink
@@ -1236,6 +1300,8 @@
 	(list 
 		(ImplicationLink (PredicateNode comp_instance) (PredicateNode comp_concept))
 		(ImplicationLink (PredicateNode pred_instance) (PredicateNode pred_concept))
+		(r2l-wordinst-Predicate comp_instance)
+		(r2l-wordinst-Predicate pred_instance)
 		(AtTimeLink)
 			(PredicateNode pred_instance)
 			(ConceptNode comp_instance)
@@ -1246,6 +1312,8 @@
 	(list 
 		(ImplicationLink (PredicateNode comp_instance) (PredicateNode comp_concept))
 		(ImplicationLink (PredicateNode pred_instance) (PredicateNode pred_concept))
+		(r2l-wordinst-Predicate comp_instance)
+		(r2l-wordinst-Predicate pred_instance)
 		(EvaluationLink
 			(PredicateNode pred_instance)
 			(ListLink
@@ -1264,6 +1332,8 @@
 	(list
 		(ImplicationLink (PredicateNode main_instance) (PredicateNode main))
 		(ImplicationLink (PredicateNode sub_instance) (PredicateNode sub))
+		(r2l-wordinst-Predicate main_instance)
+		(r2l-wordinst-Predicate sub_instance)
 		(EvaluationLink
 			(PredicateNode "that")
 			(ListLink
@@ -1317,6 +1387,9 @@
 	(list (InheritanceLink (ConceptNode adj_instance) (ConceptNode adj))
 	(InheritanceLink (ConceptNode w1_instance) (ConceptNode w1))
 	(InheritanceLink (ConceptNode w2_instance) (ConceptNode w2))
+	(r2l-wordinst-concept adj_instance)
+	(r2l-wordinst-concept w1_instance)
+	(r2l-wordinst-concept w2_instance)
 	(TruthValueGreaterThanLink
 		(InheritanceLink (ConceptNode w1_instance) (ConceptNode adj_instance))
 		(InheritanceLink (ConceptNode w2_instance) (ConceptNode adj_instance))
@@ -1326,6 +1399,8 @@
 (define (on-rule w1 w1_instance w2 w2_instance)
 	(list (InheritanceLink (ConceptNode w1_instance) (ConceptNode w1))
 	(InheritanceLink (ConceptNode w2_instance) (ConceptNode w2))
+	(r2l-wordinst-concept w1_instance)
+	(r2l-wordinst-concept w2_instance)
 	(EvaluationLink
 		(PredicateNode "on")
 		(ListLink