Merge branch 'master' of https://github.com/xpqiu/fnlp

Author: cxzhu

fnlp-core/src/test/java/org/fnlp/util/MyFilesTest.java

@@ -20,7 +20,5 @@ public static void setUpBeforeClass() throws Exception {
 	public static void tearDownAfterClass() throws Exception {
 	}
 
-	
-
 
 }

fnlp-train/src/main/java/org/fnlp/train/parsing/DepPrepare.java

@@ -59,7 +59,7 @@ public static void main(String[] args) throws Exception {
 		//处理测试数据
 		FNLPCorpus corpust = new FNLPCorpus();
 		//读自有数据
-//		corpust.read(datapath + "/FNLPDATA/WeiboFTB(v1.0)-test.dat", null);	
+		corpust.read(datapath + "/FNLPDATA/WeiboFTB(v1.0)-test.dat", null);	
 		corpust.writeOne(testfile);
 
 		TreeSet<String> set2 = corpus.getAllRelations();

fnlp-train/src/main/java/org/fnlp/train/parsing/DepRun.java

@@ -38,7 +38,7 @@ public static void main(String[] args) throws Exception {
 		eval();
 
 		bw.println("优化");
-		float thres = 0.00001f;
+		float thres = 1.0E-5f;
 		bw.println(thres);
 
 		ModelOptimization op = new ModelOptimization(thres);
@@ -48,7 +48,7 @@ public static void main(String[] args) throws Exception {
 		/////////////////////////////////////////
 
 		bw.println("优化");
-		thres = 0.001f;
+		thres = 1.0E-4f;
 		bw.println(thres);
 		op = new ModelOptimization(thres);
 		op.optimizeDep(model);