add built-in-based Naf and relevant test case

Author: tmitsi

Diff for: PSOA2X/src/main/java/org/ruleml/psoa/psoa2x/psoa2prolog/AbstractPrologConverter.java

@@ -72,6 +72,9 @@ public abstract class AbstractPrologConverter extends PrologTermLangConverter {
 		// Generic inequality
 		s_builtInMap.put("https://www.iso.org/standard/21413.html#generic_not_eq", "\'\\\\=\'");
 
+		// Built-in-based Naf (intended for one argument that is a relational atom)
+		s_builtInMap.put("not#Naf", "\\+ ");
+		
 		// Taken from XSB Prolog standard module
 		s_builtInMap.put("http://xsb.sourceforge.net/manual1/manual1.pdf#datime", "datime");              // XSB's datime and local_datime predicates
 		s_builtInMap.put("http://xsb.sourceforge.net/manual1/manual1.pdf#local_datime", "local_datime");  // just prefixed with iri of XSB's manual1

Diff for: PSOATransRun/src/main/java/org/ruleml/psoa/psoatransrun/PSOATransRun.java

@@ -107,7 +107,7 @@ else if (lang.equalsIgnoreCase("tptp"))
 		{
 			systemInstantiation = "[PSOA2TPTP,VampirePrime]";
 		}
-		return "PSOATransRun" + "1.4.1" + systemInstantiation;
+		return "PSOATransRun" + "1.4.2" + systemInstantiation;
 	}
 
 	/***

Diff for: PSOATransRun/test-built-ins/built-in-based_naf/built-in-based_naf-KB.psoa

@@ -0,0 +1,26 @@
+RuleML (
+  % Translation requires absence of option -s
+  
+  Prefix(not: <http://psoa.ruleml.org/lib/not#>)
+  Import(<http://psoa.ruleml.org/lib/not.psoa>)
+  Assert (
+    bird(penguin)
+	bird(eagle)
+	bird(ostrich)
+	bird(crow)
+	bird(sparrow)
+	bird(pigeon)
+	
+	flightless_bird(penguin)
+	flightless_bird(ostrich)
+	
+	Forall ?X (
+		can_fly(?X) :-
+			And(
+				bird(?X)
+				not:Naf(flightless_bird(?X))
+			)
+	)
+			
+  ) 
+)

Diff for: PSOATransRun/test-built-ins/built-in-based_naf/built-in-based_naf-answer1.psoa

@@ -0,0 +1,4 @@
+?X=_eagle
+?X=_crow
+?X=_sparrow
+?X=_pigeon

Diff for: PSOATransRun/test-built-ins/built-in-based_naf/built-in-based_naf-answer2.psoa

@@ -0,0 +1,2 @@
+?X=_penguin
+?X=_ostrich

Diff for: PSOATransRun/test-built-ins/built-in-based_naf/built-in-based_naf-query1.psoa

@@ -0,0 +1 @@
+can_fly(?X)

Diff for: PSOATransRun/test-built-ins/built-in-based_naf/built-in-based_naf-query2.psoa

@@ -0,0 +1 @@
+And( bird(?X) not:Naf(can_fly(?X)) )