small changes

Author: xpqiu

fnlp-core/pom.xml

@@ -21,7 +21,7 @@
 <scm>
 <url>scm:git:git@github.com:xpqiu/fnlp.git</url>
 <connection>scm:git:git@github.com:xpqiu/fnlp.git</connection>
-<tag>fnlp-core-2.0</tag>
+<tag>fnlp-core-2.1</tag>
 </scm>
 
 <properties>

fnlp-core/src/main/java/org/fnlp/nlp/cn/tag/AbstractTagger.java

@@ -87,12 +87,15 @@ public AbstractTagger(String file) throws LoadModelException	{
  * @param tagger 另一个标注器
  */
 public AbstractTagger(AbstractTagger tagger){
+//modify for parallel
+Linear originClassifier = tagger.getClassifier();
+Linear newClassifier = new Linear(originClassifier.getInferencer(),originClassifier.getAlphabetFactory());
+setClassifier(newClassifier);
 
-setClassifier(tagger.getClassifier());
 factory = getClassifier().getAlphabetFactory();
 labels = factory.DefaultLabelAlphabet();
 IFeatureAlphabet features = factory.DefaultFeatureAlphabet();
-featurePipe = new Sequence2FeatureSequence(templets, features,
+featurePipe = new Sequence2FeatureSequence(tagger.templets, features,
 labels);
 }
 
@@ -213,4 +216,4 @@ public Linear getClassifier() {
 public void setClassifier(Linear cl) {
 this.cl = cl;
 }
-}
+}

fnlp-core/src/main/java/org/fnlp/nlp/cn/tag/POSTagger.java

@@ -62,6 +62,17 @@ public class POSTagger extends AbstractTagger {
 public POSTagger(String cwsmodel, String str) throws LoadModelException {
 super(str);
 cws = new CWSTagger(cwsmodel);
+}
+
+/**
+ * 构造函数
+ * @param cwsmodel 分词模型文件
+ * @param posmodel 词性模型文件
+ */
+public POSTagger(CWSTagger cwsmodel, POSTagger posmodel) throws LoadModelException {
+super(posmodel);
+prePipe = posmodel.prePipe;
+cws = new CWSTagger(cwsmodel);
 }
 
 //分词词典也被dict指定
@@ -360,4 +371,4 @@ public void SetTagType(String lang){
 else if(lang.equals("cn"))
 this.labels = factory.DefaultLabelAlphabet();
 }
-}
+}

fnlp-core/src/main/java/org/fnlp/nlp/corpus/WordCount.java

@@ -46,7 +46,7 @@ public class WordCount {
 public static void main(String[] args) throws Exception {
 
 WordCount wc = new WordCount();
- wc.seg = new CWSTagger("./models/seg.m");
+ wc.seg = new CWSTagger("../models/seg.m");
 
 wc.count("./tmp/filterTweets.y");
 wc.count("./tmp/filterTweets.n");