[DL-Learner SVN] SF.net SVN: dl-learner: [85] trunk/src/dl-learner/org/dllearner/parser

[<jen...@us...>]

Revision: 85
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=85&view=rev
Author:   jenslehmann
Date:     2007-08-28 06:23:47 -0700 (Tue, 28 Aug 2007)

Log Message:
-----------
updated parser with more getters and ability to parse several files in a row

Modified Paths:
--------------
    trunk/src/dl-learner/org/dllearner/parser/DLLearner.java
    trunk/src/dl-learner/org/dllearner/parser/dllearner.jj
    trunk/src/dl-learner/org/dllearner/parser/dllearner.jjt

Modified: trunk/src/dl-learner/org/dllearner/parser/DLLearner.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/parser/DLLearner.java	2007-08-28 11:42:35 UTC (rev 84)
+++ trunk/src/dl-learner/org/dllearner/parser/DLLearner.java	2007-08-28 13:23:47 UTC (rev 85)
@@ -81,6 +81,18 @@
                 return negativeExamples;
         }
 
+        public static List<ConfigurationOption> getConfOptions() {
+                return confOptions;
+        }
+
+        public static List<List<String>> getFunctionCalls() {
+                return functionCalls;
+        }
+
+        public static KB getKB() {
+                return kb;
+        }
+
         /*
 	private static void addFunctionCall(String functionName, String argument) {
 		if(functionCalls.containsKey(functionName)) {
@@ -137,7 +149,11 @@
 
         public static void parseFile(String filename) {
                 try {
-                        new DLLearner(new FileInputStream(filename));
+                        if(constructorCalled)
+                                DLLearner.ReInit(new FileInputStream(filename));
+                        else
+                                new DLLearner(new FileInputStream(filename));
+                        constructorCalled = true;
                         DLLearner.Start();
                 } catch(Exception e) {
                         e.printStackTrace();
@@ -1561,25 +1577,6 @@
     finally { jj_save(11, xla); }
   }
 
-  static final private boolean jj_3R_19() {
-    if (jj_3R_4()) return true;
-    return false;
-  }
-
-  static final private boolean jj_3R_9() {
-    if (jj_3R_12()) return true;
-    return false;
-  }
-
-  static final private boolean jj_3R_36() {
-    if (jj_3R_50()) return true;
-    if (jj_3R_22()) return true;
-    if (jj_3R_17()) return true;
-    if (jj_scan_token(COMMAND_END)) return true;
-    if (jj_3R_14()) return true;
-    return false;
-  }
-
   static final private boolean jj_3R_18() {
     if (jj_3R_12()) return true;
     return false;
@@ -2012,6 +2009,25 @@
     return false;
   }
 
+  static final private boolean jj_3R_19() {
+    if (jj_3R_4()) return true;
+    return false;
+  }
+
+  static final private boolean jj_3R_9() {
+    if (jj_3R_12()) return true;
+    return false;
+  }
+
+  static final private boolean jj_3R_36() {
+    if (jj_3R_50()) return true;
+    if (jj_3R_22()) return true;
+    if (jj_3R_17()) return true;
+    if (jj_scan_token(COMMAND_END)) return true;
+    if (jj_3R_14()) return true;
+    return false;
+  }
+
   static private boolean jj_initialized_once = false;
   static public DLLearnerTokenManager token_source;
   static SimpleCharStream jj_input_stream;

Modified: trunk/src/dl-learner/org/dllearner/parser/dllearner.jj
===================================================================
--- trunk/src/dl-learner/org/dllearner/parser/dllearner.jj	2007-08-28 11:42:35 UTC (rev 84)
+++ trunk/src/dl-learner/org/dllearner/parser/dllearner.jj	2007-08-28 13:23:47 UTC (rev 85)
@@ -99,6 +99,18 @@
 		return negativeExamples;
 	}
 	
+	public static List<ConfigurationOption> getConfOptions() {
+		return confOptions;
+	}
+	
+	public static List<List<String>> getFunctionCalls() {
+		return functionCalls;
+	}
+	
+	public static KB getKB() {
+		return kb;
+	}
+	
 	/*
 	private static void addFunctionCall(String functionName, String argument) {
 		if(functionCalls.containsKey(functionName)) {
@@ -155,7 +167,11 @@
 	
 	public static void parseFile(String filename) {
 		try {
-			new DLLearner(new FileInputStream(filename));
+			if(constructorCalled)
+				DLLearner.ReInit(new FileInputStream(filename));
+			else
+				new DLLearner(new FileInputStream(filename));
+			constructorCalled = true;
 			DLLearner.Start();
 		} catch(Exception e) {
 			e.printStackTrace();

Modified: trunk/src/dl-learner/org/dllearner/parser/dllearner.jjt
===================================================================
--- trunk/src/dl-learner/org/dllearner/parser/dllearner.jjt	2007-08-28 11:42:35 UTC (rev 84)
+++ trunk/src/dl-learner/org/dllearner/parser/dllearner.jjt	2007-08-28 13:23:47 UTC (rev 85)
@@ -95,6 +95,18 @@
 		return negativeExamples;
 	}
 	
+	public static List<ConfigurationOption> getConfOptions() {
+		return confOptions;
+	}
+	
+	public static List<List<String>> getFunctionCalls() {
+		return functionCalls;
+	}
+	
+	public static KB getKB() {
+		return kb;
+	}
+	
 	/*
 	private static void addFunctionCall(String functionName, String argument) {
 		if(functionCalls.containsKey(functionName)) {
@@ -151,7 +163,11 @@
 	
 	public static void parseFile(String filename) {
 		try {
-			new DLLearner(new FileInputStream(filename));
+			if(constructorCalled)
+				DLLearner.ReInit(new FileInputStream(filename));
+			else
+				new DLLearner(new FileInputStream(filename));
+			constructorCalled = true;
 			DLLearner.Start();
 		} catch(Exception e) {
 			e.printStackTrace();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.