Permalink
Browse files

Using common-java and openregex.

  • Loading branch information...
1 parent 1775fc2 commit 104e71f088683f18b5489eca20277847d46c02d0 @schmmd schmmd committed Dec 30, 2011
View
9 pom.xml
@@ -53,8 +53,13 @@
</dependency>
<dependency>
<groupId>edu.washington.cs.knowitall</groupId>
- <artifactId>commonlib</artifactId>
- <version>1.1.2</version>
+ <artifactId>common-java</artifactId>
+ <version>2.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>edu.washington.cs.knowitall</groupId>
+ <artifactId>openregex</artifactId>
+ <version>1.0.0</version>
</dependency>
<!-- Common -->
<dependency>
View
4 src/main/java/edu/washington/cs/knowitall/argumentidentifier/PatternExtractor.java
@@ -5,8 +5,8 @@
import java.util.Set;
import java.util.regex.Pattern;
-import edu.washington.cs.knowitall.commonlib.regex.Match;
-import edu.washington.cs.knowitall.commonlib.regex.RegularExpression;
+import edu.washington.cs.knowitall.regex.Match;
+import edu.washington.cs.knowitall.regex.RegularExpression;
import edu.washington.cs.knowitall.nlp.ChunkedSentence;
import edu.washington.cs.knowitall.nlp.ChunkedSentencePattern;
import edu.washington.cs.knowitall.nlp.ChunkedSentenceToken;
View
4 src/main/java/edu/washington/cs/knowitall/extractor/conf/ReVerbFeatures.java
@@ -6,8 +6,8 @@
import com.google.common.base.Predicate;
import edu.washington.cs.knowitall.commonlib.Range;
-import edu.washington.cs.knowitall.commonlib.regex.Match;
-import edu.washington.cs.knowitall.commonlib.regex.RegularExpression;
+import edu.washington.cs.knowitall.regex.Match;
+import edu.washington.cs.knowitall.regex.RegularExpression;
import edu.washington.cs.knowitall.extractor.ReVerbExtractor;
import edu.washington.cs.knowitall.extractor.conf.featureset.BooleanFeatureSet;
import edu.washington.cs.knowitall.extractor.conf.featureset.ChunkFeature;
View
18 src/main/java/edu/washington/cs/knowitall/nlp/ChunkedSentencePattern.java
@@ -5,13 +5,13 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import edu.washington.cs.knowitall.commonlib.logic.ArgFactory;
-import edu.washington.cs.knowitall.commonlib.logic.LogicExpression;
-import edu.washington.cs.knowitall.commonlib.logic.Tok.Arg;
-import edu.washington.cs.knowitall.commonlib.regex.Expression;
-import edu.washington.cs.knowitall.commonlib.regex.ExpressionFactory;
-import edu.washington.cs.knowitall.commonlib.regex.Match;
-import edu.washington.cs.knowitall.commonlib.regex.RegularExpression;
+import edu.washington.cs.knowitall.logic.ArgFactory;
+import edu.washington.cs.knowitall.logic.LogicExpression;
+import edu.washington.cs.knowitall.logic.Expression.Arg;
+import edu.washington.cs.knowitall.regex.Expression;
+import edu.washington.cs.knowitall.regex.ExpressionFactory;
+import edu.washington.cs.knowitall.regex.Match;
+import edu.washington.cs.knowitall.regex.RegularExpression;
public class ChunkedSentencePattern {
/***
@@ -41,7 +41,7 @@
* @return
*/
public static RegularExpression<ChunkedSentenceToken> compile(String regex) {
- return new RegularExpression<ChunkedSentenceToken>(regex,
+ return RegularExpression.compile(regex,
new ExpressionFactory<ChunkedSentenceToken>() {
@Override
@@ -53,7 +53,7 @@
private final LogicExpression<ChunkedSentenceToken> logic;
{
- this.logic = new LogicExpression<ChunkedSentenceToken>(
+ this.logic = LogicExpression.compile(
expression, new ArgFactory<ChunkedSentenceToken>() {
@Override
public Arg<ChunkedSentenceToken> create(

0 comments on commit 104e71f

Please sign in to comment.