Added class-reproducing slotribution/tupribution

e05wz · e05wz · commit e81af529844c · 2015-10-22T10:05:49.000-03:00
diff --git a/PSOA2X/.classpath b/PSOA2X/.classpath
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
+	<classpathentry kind="src" path="src/main/antlr3"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
diff --git a/PSOA2X/src/main/antlr3/org/ruleml/psoa/psoa2x/psoa2prolog/PSOA2PrologWalker.g b/PSOA2X/src/main/antlr3/org/ruleml/psoa/psoa2x/psoa2prolog/PSOA2PrologWalker.g
@@ -15,22 +15,32 @@ options
 	import static org.ruleml.psoa.psoa2x.common.PSOATranslatorUtil.*;
 	import org.ruleml.psoa.psoa2x.common.*;
 	import org.ruleml.psoa.psoa2x.common.ANTLRBasedTranslator.TranslatorWalker;
-  import java.io.*;
-  import java.util.Set;
-  import java.util.HashSet;
-  import java.util.Map;
-  import java.util.LinkedHashMap;
+    import java.io.*;
+    import java.util.Set;
+    import java.util.HashSet;
+    import java.util.Map;
+    import java.util.LinkedHashMap;
 }
 
 @members
 {
+   private PSOA2PrologConfig m_config;
    private StringBuilder _output = new StringBuilder(256);
     
    private enum TermType { CONST, VAR, FUNC_INTERNAL, FUNC_EXTERNAL };
+   
+   public PSOA2PrologWalker(TreeNodeStream input, PSOA2PrologConfig config) {
+        this(input);
+        m_config = config;
+   }
 }
 
 document
     :   ^(DOCUMENT base? prefix* importDecl* group?)
+    {
+        if (m_config.crossOverAxiom)
+          println("sloterm(X,C1,P,V) :- (sloterm(X,C2,P,V),memterm(X,C1)).");
+    }
     ;
 
 base
@@ -198,17 +208,22 @@ scope
 {
   String oid;
   String func;
+  String type;
 }
 @init
 {
   boolean hasTupleOrSlot = false;
 }
     :   ^(PSOA (o=term { $psoa::oid = $o.output; })?
-           ^(INSTANCE type=term
+           ^(INSTANCE t=term
             {
               if ($psoa::oid == null)
               {
-                $psoa::func = $type.output;
+                $psoa::func = $t.output;
+              }
+              else
+              {
+                $psoa::type = $t.output;
               }
             })
            ({ hasTupleOrSlot = true; } tuple)*
@@ -218,11 +233,11 @@ scope
         if (!hasTupleOrSlot)
         {
           // Class membership
-	        if (!$type.output.equals("TOP"))
-	          append(_output, "memterm(", $psoa::oid, ",", $type.output, ")");
+	        if (!$t.output.equals("TOP"))
+	          append(_output, "memterm(", $psoa::oid, ",", $t.output, ")");
 	        else
 	          append(_output, "true");
-	      }
+	    }
     }
     ;
 
@@ -244,7 +259,10 @@ tuple
   else
   {
     b = _output;
-    append(b, "tupterm(", oid, ",");
+    if (m_config.reproduceClass)
+      append(b, "tupterm(", oid, ",", $psoa::type, ",");
+    else
+      append(b, "tupterm(", oid, ",");
   }
 }
     :   ^(TUPLE (term { append(b, $term.output, ","); })+)
@@ -259,7 +277,12 @@ slot
     {
         String oid;
         if ((oid = $psoa::oid) != null)
-          append(_output, "sloterm(", oid, ",", $s.output, ",", $v.output, ")");
+        {
+          if (m_config.reproduceClass)
+            append(_output, "sloterm(", oid, ",", $psoa::type, ",", $s.output, ",", $v.output, ")");
+          else
+            append(_output, "sloterm(", oid, ",", $s.output, ",", $v.output, ")");
+        }
     }
     ;
 
diff --git a/PSOA2X/src/main/antlr3/org/ruleml/psoa/psoa2x/psoa2tptp/TPTPASOTranslatorWalker.g b/PSOA2X/src/main/antlr3/org/ruleml/psoa/psoa2x/psoa2tptp/TPTPASOTranslatorWalker.g
@@ -26,7 +26,13 @@ options
 @members
 {
     private TPTPASOGenerator m_generator = new TPTPASOGenerator();
+    private PSOA2TPTPConfig m_config;
 
+    public TPTPASOTranslatorWalker(TreeNodeStream input, PSOA2TPTPConfig config) {
+        this(input);
+        m_config = config;
+    }
+    
     public void parseDocument() throws RecognitionException {
         document();
     }
diff --git a/PSOA2X/src/main/java/org/ruleml/psoa/psoa2x/common/RelationalTranslatorConfig.java b/PSOA2X/src/main/java/org/ruleml/psoa/psoa2x/common/RelationalTranslatorConfig.java
@@ -0,0 +1,8 @@
+package org.ruleml.psoa.psoa2x.common;
+
+public abstract class RelationalTranslatorConfig extends TranslatorConfig
+{
+	public boolean reproduceClass,
+				   omitMemtermInBody,
+	               crossOverAxiom;
+}
diff --git a/PSOA2X/src/main/java/org/ruleml/psoa/psoa2x/common/RunTranslator.java b/PSOA2X/src/main/java/org/ruleml/psoa/psoa2x/common/RunTranslator.java
@@ -7,6 +7,7 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
 
+import org.ruleml.psoa.psoa2x.psoa2prolog.PSOA2PrologConfig;
 import org.ruleml.psoa.psoa2x.psoa2prolog.PrologTranslator;
 import org.ruleml.psoa.psoa2x.psoa2tptp.*;
 
@@ -62,7 +63,7 @@ public static void main(String[] args) throws FileNotFoundException, IOException
 		try {
 //			ANTLRBasedTranslator translator = new TPTPASOTranslator();
 //			ANTLRBasedTranslator translator = new DirectTranslator();
-			ANTLRBasedTranslator translator = new PrologTranslator();
+			ANTLRBasedTranslator translator = new PrologTranslator(new PSOA2PrologConfig());
 			for (int i = 0; i < ruleBaseFileNames.length; ++i) {
 				translator.translateKB(new FileInputStream(ruleBaseFileNames[i]), System.out);
 //				createBasicTreeParser(ruleBaseFileNames[i], false).document();
diff --git a/PSOA2X/src/main/java/org/ruleml/psoa/psoa2x/common/TranslatorConfig.java b/PSOA2X/src/main/java/org/ruleml/psoa/psoa2x/common/TranslatorConfig.java
@@ -0,0 +1,6 @@
+package org.ruleml.psoa.psoa2x.common;
+
+public abstract class TranslatorConfig
+{
+
+}
diff --git a/PSOA2X/src/main/java/org/ruleml/psoa/psoa2x/common/TranslatorFactory.java b/PSOA2X/src/main/java/org/ruleml/psoa/psoa2x/common/TranslatorFactory.java
@@ -1,16 +1,18 @@
 package org.ruleml.psoa.psoa2x.common;
 
+import org.ruleml.psoa.psoa2x.psoa2prolog.PSOA2PrologConfig;
 import org.ruleml.psoa.psoa2x.psoa2prolog.PrologTranslator;
+import org.ruleml.psoa.psoa2x.psoa2tptp.PSOA2TPTPConfig;
 import org.ruleml.psoa.psoa2x.psoa2tptp.TPTPASOTranslator;
 
 public class TranslatorFactory {
 	
 	public Translator createTranslator(String targetLanguage)
 	{
 		if (targetLanguage.equalsIgnoreCase("prolog"))
-			return new PrologTranslator();
+			return new PrologTranslator(new PSOA2PrologConfig());
 		else if (targetLanguage.equalsIgnoreCase("tptp"))
-			return new TPTPASOTranslator();
+			return new TPTPASOTranslator(new PSOA2TPTPConfig());
 		
 		throw new TranslatorException("Unknown target language: " + targetLanguage);
 	}
diff --git a/PSOA2X/src/main/java/org/ruleml/psoa/psoa2x/psoa2prolog/PSOA2PrologConfig.java b/PSOA2X/src/main/java/org/ruleml/psoa/psoa2x/psoa2prolog/PSOA2PrologConfig.java
@@ -0,0 +1,12 @@
+package org.ruleml.psoa.psoa2x.psoa2prolog;
+
+import org.ruleml.psoa.psoa2x.common.RelationalTranslatorConfig;
+
+public class PSOA2PrologConfig extends RelationalTranslatorConfig
+{
+	public PSOA2PrologConfig()
+	{
+		reproduceClass = false;
+		crossOverAxiom = false;
+	}
+}
diff --git a/PSOA2X/src/main/java/org/ruleml/psoa/psoa2x/psoa2prolog/PrologTranslator.java b/PSOA2X/src/main/java/org/ruleml/psoa/psoa2x/psoa2prolog/PrologTranslator.java
@@ -9,10 +9,17 @@
 import org.ruleml.psoa.psoa2x.common.TranslatorException;
 
 public class PrologTranslator extends ANTLRBasedTranslator {
+	PSOA2PrologConfig m_config;
+	
+	public PrologTranslator(PSOA2PrologConfig config)
+	{
+		m_config = config;
+	}
+	 
 	@Override
 	protected TranslatorWalker createTranslatorWalker(
 			CommonTreeNodeStream astNodes) {
-		return new PSOA2PrologWalker(astNodes);
+		return new PSOA2PrologWalker(astNodes, m_config);
 	}
 	
 	@Override
@@ -34,6 +41,7 @@ protected CommonTreeNodeStream preprocess(CommonTreeNodeStream treeNodeStream, b
 			
 //			System.out.println("Slotribute and Tupribute Query");
 			slotTupributor = new SlotTupributor(treeNodeStream);
+			slotTupributor.setReproduceClass(m_config.reproduceClass);
 			treeNodeStream = new CommonTreeNodeStream(slotTupributor.query().getTree());
 			treeNodeStream.setTokenStream(tokens);
 			
@@ -58,6 +66,7 @@ protected CommonTreeNodeStream preprocess(CommonTreeNodeStream treeNodeStream, b
 			
 //			System.out.println("Slotribute and Tupribute KB");
 			slotTupributor = new SlotTupributor(treeNodeStream);
+			slotTupributor.setReproduceClass(m_config.reproduceClass);
 			treeNodeStream = new CommonTreeNodeStream(slotTupributor.document().getTree());
 			treeNodeStream.setTokenStream(tokens);
 			printTree(treeNodeStream);
diff --git a/PSOA2X/src/main/java/org/ruleml/psoa/psoa2x/psoa2tptp/TPTPASOTranslator.java b/PSOA2X/src/main/java/org/ruleml/psoa/psoa2x/psoa2tptp/TPTPASOTranslator.java
@@ -4,11 +4,17 @@
 import org.ruleml.psoa.psoa2x.common.*;
 
 public class TPTPASOTranslator extends ANTLRBasedTranslator {
-
+	private PSOA2TPTPConfig m_config;
+	
+	public TPTPASOTranslator(PSOA2TPTPConfig config)
+	{
+		m_config = config;
+	}
+	
 	@Override
 	protected TranslatorWalker createTranslatorWalker(
 			CommonTreeNodeStream astNodes) {
-		return new TPTPASOTranslatorWalker(astNodes);
+		return new TPTPASOTranslatorWalker(astNodes, m_config);
 	}
 
 	@Override
diff --git a/PSOATransRun/lib/interprolog.jar b/PSOATransRun/lib/interprolog.jar
diff --git a/PSOATransRun/src/main/java/org/ruleml/psoa/psoatransrun/PSOATransRun.java b/PSOATransRun/src/main/java/org/ruleml/psoa/psoatransrun/PSOATransRun.java
@@ -3,16 +3,13 @@
 import java.io.InputStream;
 import java.util.List;
 
-import org.ruleml.psoa.psoa2x.common.Translator;
-import org.ruleml.psoa.psoa2x.psoa2prolog.PrologTranslator;
-import org.ruleml.psoa.psoa2x.psoa2tptp.TPTPASOTranslator;
-import org.ruleml.psoa.psoatransrun.engine.ExecutionEngine;
-import org.ruleml.psoa.psoatransrun.engine.ReusableKBEngine;
-import org.ruleml.psoa.psoatransrun.prolog.XSBEngine;
-import org.ruleml.psoa.psoatransrun.prolog.XSBEngineConfig;
+import org.ruleml.psoa.psoa2x.common.*;
+import org.ruleml.psoa.psoa2x.psoa2prolog.*;
+import org.ruleml.psoa.psoa2x.psoa2tptp.*;
+import org.ruleml.psoa.psoatransrun.engine.*;
+import org.ruleml.psoa.psoatransrun.prolog.*;
+import org.ruleml.psoa.psoatransrun.tptp.*;
 import org.ruleml.psoa.psoatransrun.test.Watch;
-import org.ruleml.psoa.psoatransrun.tptp.VampirePrimeEngine;
-import org.ruleml.psoa.psoatransrun.tptp.VampirePrimeEngineConfig;
 import org.ruleml.psoa.psoatransrun.utils.PSOATransRunException;
 
 public class PSOATransRun {
@@ -36,14 +33,28 @@ public static PSOATransRun getInstantiation(String targetLang)
 	{
 		if (targetLang.equalsIgnoreCase("prolog"))
 		{
-			return new PSOATransRun(new PrologTranslator(), new XSBEngine(new XSBEngineConfig()));
+			return new PSOATransRun(new PrologTranslator(new PSOA2PrologConfig()), new XSBEngine(new XSBEngineConfig()));
 		}
 		else if (targetLang.equalsIgnoreCase("tptp"))
 		{
-			return new PSOATransRun(new TPTPASOTranslator(), new VampirePrimeEngine(new VampirePrimeEngineConfig()));
+			return new PSOATransRun(new TPTPASOTranslator(new PSOA2TPTPConfig()), new VampirePrimeEngine(new VampirePrimeEngineConfig()));
 		}
 		
-		throw new PSOATransRunException("Unknown target language: " + targetLang);		
+		throw new PSOATransRunException("Unknown target language: " + targetLang);
+	}
+	
+	public static PSOATransRun getInstantiation(String targetLang, TranslatorConfig config)
+	{
+		if (targetLang.equalsIgnoreCase("prolog"))
+		{
+			return new PSOATransRun(new PrologTranslator((PSOA2PrologConfig)config), new XSBEngine(new XSBEngineConfig()));
+		}
+		else if (targetLang.equalsIgnoreCase("tptp"))
+		{
+			return new PSOATransRun(new TPTPASOTranslator((PSOA2TPTPConfig)config), new VampirePrimeEngine(new VampirePrimeEngineConfig()));
+		}
+		
+		throw new PSOATransRunException("Unknown target language: " + targetLang);
 	}
 	
 	public void loadKB(InputStream in)
diff --git a/PSOATransRun/src/main/java/org/ruleml/psoa/psoatransrun/prolog/PSOATransRunProlog.java b/PSOATransRun/src/main/java/org/ruleml/psoa/psoatransrun/prolog/PSOATransRunProlog.java
@@ -9,7 +9,9 @@
 
 import org.apache.commons.exec.OS;
 import org.ruleml.psoa.psoa2x.common.TranslatorException;
+import org.ruleml.psoa.psoa2x.psoa2prolog.PSOA2PrologConfig;
 import org.ruleml.psoa.psoa2x.psoa2prolog.PrologTranslator;
+import org.ruleml.psoa.psoatransrun.PSOATransRun;
 
 import com.declarativa.interprolog.*;
 
@@ -19,8 +21,9 @@ public class PSOATransRunProlog
 {
 	private static PrologEngine _engine;
 	private static boolean _outputTrans = false, _getAllAnswers = false;
+	private static PSOA2PrologConfig _config = new PSOA2PrologConfig();
 	private static int _maxDepth = 0;
-	
+
 	public static void main(String[] args) throws TranslatorException, IOException
 	{
 		LongOpt[] opts = new LongOpt[]
@@ -33,10 +36,11 @@ public static void main(String[] args) throws TranslatorException, IOException
 			new LongOpt("xsbfolder", LongOpt.REQUIRED_ARGUMENT, null,'x'),
 			new LongOpt("query", LongOpt.REQUIRED_ARGUMENT, null, 'q'),
 			new LongOpt("allAns", LongOpt.NO_ARGUMENT, null, 'a'),
+			new LongOpt("repClass", LongOpt.REQUIRED_ARGUMENT, null, 'r'),
 			new LongOpt("termDep", LongOpt.REQUIRED_ARGUMENT, null, 'd')
 		};
 
-		Getopt optionsParser = new Getopt("", args, "?i:po:x:q:ad:t:", opts);
+		Getopt optionsParser = new Getopt("", args, "?i:po:x:q:ad:t:r", opts);
 		FileInputStream kbStream = null,
 						queryStream = null;
 //		boolean outputTrans = false;
@@ -88,7 +92,9 @@ public static void main(String[] args) throws TranslatorException, IOException
 						printErrln("Unable to read query file ", arg, ". Read from console.");
 					}
 					break;
-				
+				case 'r':
+					_config.reproduceClass = true;
+					break;
 				case 'p':
 					_outputTrans = true;
 					break;
@@ -108,7 +114,7 @@ public static void main(String[] args) throws TranslatorException, IOException
 					assert false;
 			}
 		}
-		
+
 		if (kbStream == null)
 			printErrlnAndExit("Input KB must be specified.");
 		
@@ -156,14 +162,18 @@ else if (OS.isFamilyWindows())
 			printErrlnAndExit("Unsupported operating system.");
 		}
 		
-		PrologTranslator translator = new PrologTranslator();
+		PrologTranslator translator = new PrologTranslator(_config);
 		String transKB = translator.translateKB(kbStream);
 		
 		if (transKBFile == null)
 			transKBFile = tmpFile("tmp-", ".pl");
 		PrintWriter writer = new PrintWriter(transKBFile);
 		writer.println(":- table(memterm/2).");
-		writer.println(":- table(sloterm/3).");
+		if (_config.reproduceClass)
+			writer.println(":- table(sloterm/4).");
+		else
+			writer.println(":- table(sloterm/3).");
+		
 		for (int i = 2; i < 11; i++)
 		{
 			writer.println(":- table(tupterm/" + i + ").");
diff --git a/PSOATransRun/src/main/java/org/ruleml/psoa/psoatransrun/prolog/XSBEngine.java b/PSOATransRun/src/main/java/org/ruleml/psoa/psoatransrun/prolog/XSBEngine.java
@@ -119,6 +119,7 @@ public void loadKB(String kb) {
 		
 		writer.println(":- table(memterm/2).");
 		writer.println(":- table(sloterm/3).");
+		writer.println(":- table(sloterm/4).");
 		for (int i = 2; i < 11; i++)
 		{
 			writer.println(":- table(tupterm/" + i + ").");
diff --git a/PSOATransRun/src/main/java/org/ruleml/psoa/psoatransrun/test/TestCase.java b/PSOATransRun/src/main/java/org/ruleml/psoa/psoatransrun/test/TestCase.java
@@ -215,7 +215,7 @@ public String getDirName()
 	}
 	
 	public void cleanup() {
-		System.out.println("Shutdown engine");
+//		System.out.println("Shutdown engine");
 		try
 		{
 //			Scanner sc = new Scanner(System.in);
diff --git a/PSOATransRunWebService/.classpath b/PSOATransRunWebService/.classpath
diff --git a/ruleml-api/.classpath b/ruleml-api/.classpath
diff --git a/ruleml-api/src/main/antlr3/org/ruleml/psoa/normalizer/SlotTupributor.g b/ruleml-api/src/main/antlr3/org/ruleml/psoa/normalizer/SlotTupributor.g
diff --git a/ruleml-api/src/main/java/org/ruleml/psoa/test/TreeWalkerTest.java b/ruleml-api/src/main/java/org/ruleml/psoa/test/TreeWalkerTest.java

Original file line number	Diff line number	Diff line change
`@@ -15,22 +15,32 @@ options`
`15`	`15`	`import static org.ruleml.psoa.psoa2x.common.PSOATranslatorUtil.*;`
`16`	`16`	`import org.ruleml.psoa.psoa2x.common.*;`
`17`	`17`	`import org.ruleml.psoa.psoa2x.common.ANTLRBasedTranslator.TranslatorWalker;`
`18`		`- import java.io.*;`
`19`		`- import java.util.Set;`
`20`		`- import java.util.HashSet;`
`21`		`- import java.util.Map;`
`22`		`- import java.util.LinkedHashMap;`
	`18`	`+ import java.io.*;`
	`19`	`+ import java.util.Set;`
	`20`	`+ import java.util.HashSet;`
	`21`	`+ import java.util.Map;`
	`22`	`+ import java.util.LinkedHashMap;`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`@members`
`26`	`26`	`{`
	`27`	`+ private PSOA2PrologConfig m_config;`
`27`	`28`	`private StringBuilder _output = new StringBuilder(256);`
`28`	`29`
`29`	`30`	`private enum TermType { CONST, VAR, FUNC_INTERNAL, FUNC_EXTERNAL };`
	`31`	`+`
	`32`	`+ public PSOA2PrologWalker(TreeNodeStream input, PSOA2PrologConfig config) {`
	`33`	`+ this(input);`
	`34`	`+ m_config = config;`
	`35`	`+ }`
`30`	`36`	`}`
`31`	`37`
`32`	`38`	`document`
`33`	`39`	`: ^(DOCUMENT base? prefix* importDecl* group?)`
	`40`	`+ {`
	`41`	`+ if (m_config.crossOverAxiom)`
	`42`	`+ println("sloterm(X,C1,P,V) :- (sloterm(X,C2,P,V),memterm(X,C1)).");`
	`43`	`+ }`
`34`	`44`	`;`
`35`	`45`
`36`	`46`	`base`
`@@ -198,17 +208,22 @@ scope`
`198`	`208`	`{`
`199`	`209`	`String oid;`
`200`	`210`	`String func;`
	`211`	`+ String type;`
`201`	`212`	`}`
`202`	`213`	`@init`
`203`	`214`	`{`
`204`	`215`	`boolean hasTupleOrSlot = false;`
`205`	`216`	`}`
`206`	`217`	`: ^(PSOA (o=term { $psoa::oid = $o.output; })?`
`207`		`- ^(INSTANCE type=term`
	`218`	`+ ^(INSTANCE t=term`
`208`	`219`	`{`
`209`	`220`	`if ($psoa::oid == null)`
`210`	`221`	`{`
`211`		`- $psoa::func = $type.output;`
	`222`	`+ $psoa::func = $t.output;`
	`223`	`+ }`
	`224`	`+ else`
	`225`	`+ {`
	`226`	`+ $psoa::type = $t.output;`
`212`	`227`	`}`
`213`	`228`	`})`
`214`	`229`	`({ hasTupleOrSlot = true; } tuple)*`
`@@ -218,11 +233,11 @@ scope`
`218`	`233`	`if (!hasTupleOrSlot)`
`219`	`234`	`{`
`220`	`235`	`// Class membership`
`221`		`- if (!$type.output.equals("TOP"))`
`222`		`- append(_output, "memterm(", $psoa::oid, ",", $type.output, ")");`
	`236`	`+ if (!$t.output.equals("TOP"))`
	`237`	`+ append(_output, "memterm(", $psoa::oid, ",", $t.output, ")");`
`223`	`238`	`else`
`224`	`239`	`append(_output, "true");`
`225`		`- }`
	`240`	`+ }`
`226`	`241`	`}`
`227`	`242`	`;`
`228`	`243`
`@@ -244,7 +259,10 @@ tuple`
`244`	`259`	`else`
`245`	`260`	`{`
`246`	`261`	`b = _output;`
`247`		`- append(b, "tupterm(", oid, ",");`
	`262`	`+ if (m_config.reproduceClass)`
	`263`	`+ append(b, "tupterm(", oid, ",", $psoa::type, ",");`
	`264`	`+ else`
	`265`	`+ append(b, "tupterm(", oid, ",");`
`248`	`266`	`}`
`249`	`267`	`}`
`250`	`268`	`: ^(TUPLE (term { append(b, $term.output, ","); })+)`
`@@ -259,7 +277,12 @@ slot`
`259`	`277`	`{`
`260`	`278`	`String oid;`
`261`	`279`	`if ((oid = $psoa::oid) != null)`
`262`		`- append(_output, "sloterm(", oid, ",", $s.output, ",", $v.output, ")");`
	`280`	`+ {`
	`281`	`+ if (m_config.reproduceClass)`
	`282`	`+ append(_output, "sloterm(", oid, ",", $psoa::type, ",", $s.output, ",", $v.output, ")");`
	`283`	`+ else`
	`284`	`+ append(_output, "sloterm(", oid, ",", $s.output, ",", $v.output, ")");`
	`285`	`+ }`
`263`	`286`	`}`
`264`	`287`	`;`
`265`	`288`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,13 @@ options`
`26`	`26`	`@members`
`27`	`27`	`{`
`28`	`28`	`private TPTPASOGenerator m_generator = new TPTPASOGenerator();`
	`29`	`+ private PSOA2TPTPConfig m_config;`
`29`	`30`
	`31`	`+ public TPTPASOTranslatorWalker(TreeNodeStream input, PSOA2TPTPConfig config) {`
	`32`	`+ this(input);`
	`33`	`+ m_config = config;`
	`34`	`+ }`
	`35`	`+`
`30`	`36`	`public void parseDocument() throws RecognitionException {`
`31`	`37`	`document();`
`32`	`38`	`}`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,6 @@ @@
 +package org.ruleml.psoa.psoa2x.common;
++
 +public abstract class TranslatorConfig
 +{
++
 +}