You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ctakes.apache.org by ch...@apache.org on 2012/10/26 21:30:25 UTC

svn commit: r1402627 - in /incubator/ctakes/trunk: ctakes-constituency-parser/src/main/java/org/apache/ctakes/constituency/parser/treekernel/ ctakes-constituency-parser/src/main/java/org/apache/ctakes/constituency/parser/util/ ctakes-coreference/src/ma...

Author: chenpei
Date: Fri Oct 26 19:30:24 2012
New Revision: 1402627

URL: http://svn.apache.org/viewvc?rev=1402627&view=rev
Log:
CTAKES-62 moved the common utils functionality org.chboston.cnlp.ctakes.kernel.* and org.chboston.cnlp.ctakes.utils.* out of the types system project
 and into ctakes-utils

Modified:
    incubator/ctakes/trunk/ctakes-constituency-parser/src/main/java/org/apache/ctakes/constituency/parser/treekernel/TreeExtractor.java
    incubator/ctakes/trunk/ctakes-constituency-parser/src/main/java/org/apache/ctakes/constituency/parser/treekernel/TreeKernel.java
    incubator/ctakes/trunk/ctakes-constituency-parser/src/main/java/org/apache/ctakes/constituency/parser/util/TreeUtils.java
    incubator/ctakes/trunk/ctakes-coreference/src/main/java/org/apache/ctakes/coreference/cc/ODIEVectorFileWriter.java
    incubator/ctakes/trunk/ctakes-coreference/src/main/java/org/apache/ctakes/coreference/treekernel/training/LinearKernelMatrixWriter.java
    incubator/ctakes/trunk/ctakes-coreference/src/main/java/org/apache/ctakes/coreference/treekernel/training/RowFillerThread.java
    incubator/ctakes/trunk/ctakes-coreference/src/main/java/org/apache/ctakes/coreference/util/SvmVectorCreator.java

Modified: incubator/ctakes/trunk/ctakes-constituency-parser/src/main/java/org/apache/ctakes/constituency/parser/treekernel/TreeExtractor.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-constituency-parser/src/main/java/org/apache/ctakes/constituency/parser/treekernel/TreeExtractor.java?rev=1402627&r1=1402626&r2=1402627&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-constituency-parser/src/main/java/org/apache/ctakes/constituency/parser/treekernel/TreeExtractor.java (original)
+++ incubator/ctakes/trunk/ctakes-constituency-parser/src/main/java/org/apache/ctakes/constituency/parser/treekernel/TreeExtractor.java Fri Oct 26 19:30:24 2012
@@ -26,7 +26,7 @@ import org.apache.uima.jcas.cas.FSArray;
 import org.apache.ctakes.typesystem.type.syntax.TerminalTreebankNode;
 import org.apache.ctakes.typesystem.type.syntax.TopTreebankNode;
 import org.apache.ctakes.typesystem.type.syntax.TreebankNode;
-import org.apache.ctakes.typesystem.util.SimpleTree;
+import org.apache.ctakes.utils.tree.SimpleTree;
 
 /*
  * This class extracts tree relations between two nodes in a tree (or from 2 separate trees).

Modified: incubator/ctakes/trunk/ctakes-constituency-parser/src/main/java/org/apache/ctakes/constituency/parser/treekernel/TreeKernel.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-constituency-parser/src/main/java/org/apache/ctakes/constituency/parser/treekernel/TreeKernel.java?rev=1402627&r1=1402626&r2=1402627&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-constituency-parser/src/main/java/org/apache/ctakes/constituency/parser/treekernel/TreeKernel.java (original)
+++ incubator/ctakes/trunk/ctakes-constituency-parser/src/main/java/org/apache/ctakes/constituency/parser/treekernel/TreeKernel.java Fri Oct 26 19:30:24 2012
@@ -21,7 +21,7 @@ package org.apache.ctakes.constituency.p
 import opennlp.tools.parser.Parse;
 
 import org.apache.ctakes.constituency.parser.util.TreeUtils;
-import org.apache.ctakes.typesystem.kernel.Kernel;
+import org.apache.ctakes.utils.kernel.Kernel;
 
 import java.util.HashMap;
 import java.util.List;

Modified: incubator/ctakes/trunk/ctakes-constituency-parser/src/main/java/org/apache/ctakes/constituency/parser/util/TreeUtils.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-constituency-parser/src/main/java/org/apache/ctakes/constituency/parser/util/TreeUtils.java?rev=1402627&r1=1402626&r2=1402627&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-constituency-parser/src/main/java/org/apache/ctakes/constituency/parser/util/TreeUtils.java (original)
+++ incubator/ctakes/trunk/ctakes-constituency-parser/src/main/java/org/apache/ctakes/constituency/parser/util/TreeUtils.java Fri Oct 26 19:30:24 2012
@@ -23,7 +23,7 @@ import opennlp.tools.parser.Parse;
 
 import org.apache.ctakes.typesystem.type.syntax.TopTreebankNode;
 import org.apache.ctakes.typesystem.type.syntax.TreebankNode;
-import org.apache.ctakes.typesystem.util.SimpleTree;
+import org.apache.ctakes.utils.tree.SimpleTree;
 
 import java.util.List;
 import java.util.ArrayList;

Modified: incubator/ctakes/trunk/ctakes-coreference/src/main/java/org/apache/ctakes/coreference/cc/ODIEVectorFileWriter.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-coreference/src/main/java/org/apache/ctakes/coreference/cc/ODIEVectorFileWriter.java?rev=1402627&r1=1402626&r2=1402627&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-coreference/src/main/java/org/apache/ctakes/coreference/cc/ODIEVectorFileWriter.java (original)
+++ incubator/ctakes/trunk/ctakes-coreference/src/main/java/org/apache/ctakes/coreference/cc/ODIEVectorFileWriter.java Fri Oct 26 19:30:24 2012
@@ -65,7 +65,7 @@ import org.apache.ctakes.coreference.uti
 import org.apache.ctakes.coreference.util.SvmUtils;
 import org.apache.ctakes.coreference.util.SvmVectorCreator;
 import org.apache.ctakes.typesystem.type.syntax.TreebankNode;
-import org.apache.ctakes.typesystem.util.SimpleTree;
+import org.apache.ctakes.utils.tree.SimpleTree;
 import org.apache.ctakes.coreference.type.MarkablePairSet;
 import org.apache.ctakes.coreference.type.Markable;
 import org.apache.ctakes.coreference.type.DemMarkable;

Modified: incubator/ctakes/trunk/ctakes-coreference/src/main/java/org/apache/ctakes/coreference/treekernel/training/LinearKernelMatrixWriter.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-coreference/src/main/java/org/apache/ctakes/coreference/treekernel/training/LinearKernelMatrixWriter.java?rev=1402627&r1=1402626&r2=1402627&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-coreference/src/main/java/org/apache/ctakes/coreference/treekernel/training/LinearKernelMatrixWriter.java (original)
+++ incubator/ctakes/trunk/ctakes-coreference/src/main/java/org/apache/ctakes/coreference/treekernel/training/LinearKernelMatrixWriter.java Fri Oct 26 19:30:24 2012
@@ -25,10 +25,10 @@ import java.util.ArrayList;
 import java.util.Scanner;
 
 import org.apache.ctakes.coreference.util.ThreadDelegator;
-import org.apache.ctakes.typesystem.kernel.Kernel;
-import org.apache.ctakes.typesystem.kernel.LinearKernel;
-import org.apache.ctakes.typesystem.kernel.PolyKernel;
-import org.apache.ctakes.typesystem.kernel.RBFKernel;
+import org.apache.ctakes.utils.kernel.Kernel;
+import org.apache.ctakes.utils.kernel.LinearKernel;
+import org.apache.ctakes.utils.kernel.PolyKernel;
+import org.apache.ctakes.utils.kernel.RBFKernel;
 
 
 import libsvm.svm_node;

Modified: incubator/ctakes/trunk/ctakes-coreference/src/main/java/org/apache/ctakes/coreference/treekernel/training/RowFillerThread.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-coreference/src/main/java/org/apache/ctakes/coreference/treekernel/training/RowFillerThread.java?rev=1402627&r1=1402626&r2=1402627&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-coreference/src/main/java/org/apache/ctakes/coreference/treekernel/training/RowFillerThread.java (original)
+++ incubator/ctakes/trunk/ctakes-coreference/src/main/java/org/apache/ctakes/coreference/treekernel/training/RowFillerThread.java Fri Oct 26 19:30:24 2012
@@ -22,7 +22,7 @@ import java.util.ArrayList;
 
 import org.apache.ctakes.constituency.parser.treekernel.TreeKernel;
 import org.apache.ctakes.coreference.util.ThreadDelegator;
-import org.apache.ctakes.typesystem.kernel.Kernel;
+import org.apache.ctakes.utils.kernel.Kernel;
 
 
 import opennlp.tools.parser.Parse;

Modified: incubator/ctakes/trunk/ctakes-coreference/src/main/java/org/apache/ctakes/coreference/util/SvmVectorCreator.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-coreference/src/main/java/org/apache/ctakes/coreference/util/SvmVectorCreator.java?rev=1402627&r1=1402626&r2=1402627&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-coreference/src/main/java/org/apache/ctakes/coreference/util/SvmVectorCreator.java (original)
+++ incubator/ctakes/trunk/ctakes-coreference/src/main/java/org/apache/ctakes/coreference/util/SvmVectorCreator.java Fri Oct 26 19:30:24 2012
@@ -36,8 +36,8 @@ import org.apache.uima.jcas.JCas;
 import org.apache.uima.jcas.tcas.Annotation;
 
 import org.apache.ctakes.coreference.type.Markable;
-import org.apache.ctakes.typesystem.util.FragmentUtils;
-import org.apache.ctakes.typesystem.util.SimpleTree;
+import org.apache.ctakes.utils.tree.FragmentUtils;
+import org.apache.ctakes.utils.tree.SimpleTree;
 
 public class SvmVectorCreator {
 	HashSet<String> stopwords = null;