Skip to content

Commit 45b1c6c

Browse files
committed
Merge branch 'master' into portable
# Conflicts: # pom.xml # src/main/java/com/hankcs/hanlp/HanLP.java
2 parents 9da3a02 + c748819 commit 45b1c6c

File tree

8 files changed

+9
-9
lines changed

8 files changed

+9
-9
lines changed

src/main/java/com/hankcs/hanlp/dictionary/CoreDictionary.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public class CoreDictionary
4141
long start = System.currentTimeMillis();
4242
if (!load(path))
4343
{
44-
System.err.printf("核心词典%s加载失败\n", path);
44+
logger.severe("核心词典" + path + "加载失败");
4545
System.exit(-1);
4646
}
4747
else

src/main/java/com/hankcs/hanlp/dictionary/CoreDictionaryTransformMatrixDictionary.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public class CoreDictionaryTransformMatrixDictionary
2828
long start = System.currentTimeMillis();
2929
if (!transformMatrixDictionary.load(HanLP.Config.CoreDictionaryTransformMatrixDictionaryPath))
3030
{
31-
System.err.println("加载核心词典词性转移矩阵" + HanLP.Config.CoreDictionaryTransformMatrixDictionaryPath + "失败");
31+
logger.severe("加载核心词典词性转移矩阵" + HanLP.Config.CoreDictionaryTransformMatrixDictionaryPath + "失败");
3232
System.exit(-1);
3333
}
3434
else

src/main/java/com/hankcs/hanlp/dictionary/CoreSynonymDictionary.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public class CoreSynonymDictionary
4040
}
4141
catch (Exception e)
4242
{
43-
System.err.println("载入核心同义词词典失败" + e);
43+
logger.severe("载入核心同义词词典失败" + e);
4444
System.exit(-1);
4545
}
4646
}

src/main/java/com/hankcs/hanlp/dictionary/CoreSynonymDictionaryEx.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public class CoreSynonymDictionaryEx
4141
}
4242
catch (Exception e)
4343
{
44-
System.err.println("载入核心同义词词典失败" + e);
44+
logger.severe("载入核心同义词词典失败" + e);
4545
System.exit(-1);
4646
}
4747
}

src/main/java/com/hankcs/hanlp/dictionary/nr/PersonDictionary.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public class PersonDictionary
5656
dictionary = new NRDictionary();
5757
if (!dictionary.load(HanLP.Config.PersonDictionaryPath))
5858
{
59-
System.err.println("人名词典加载失败:" + HanLP.Config.PersonDictionaryPath);
59+
logger.severe("人名词典加载失败:" + HanLP.Config.PersonDictionaryPath);
6060
System.exit(-1);
6161
}
6262
transformMatrixDictionary = new TransformMatrixDictionary<NR>(NR.class);

src/main/java/com/hankcs/hanlp/dictionary/other/CharType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public class CharType
6666
ByteArray byteArray = ByteArray.createByteArray(HanLP.Config.CharTypePath);
6767
if (byteArray == null)
6868
{
69-
System.err.println("字符类型对应表加载失败:" + HanLP.Config.CharTypePath);
69+
logger.severe("字符类型对应表加载失败:" + HanLP.Config.CharTypePath);
7070
System.exit(-1);
7171
}
7272
else

src/main/java/com/hankcs/hanlp/dictionary/stopword/CoreStopWordDictionary.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020

2121
import java.io.DataOutputStream;
2222
import java.io.File;
23-
import java.io.FileOutputStream;
2423
import java.util.List;
2524
import java.util.ListIterator;
25+
import static com.hankcs.hanlp.utility.Predefine.logger;
2626

2727

2828
/**
@@ -46,7 +46,7 @@ public class CoreStopWordDictionary
4646
}
4747
catch (Exception e)
4848
{
49-
System.err.println("载入停用词词典" + HanLP.Config.CoreStopWordDictionaryPath + "失败" + TextUtility.exceptionToString(e));
49+
logger.severe("载入停用词词典" + HanLP.Config.CoreStopWordDictionaryPath + "失败" + TextUtility.exceptionToString(e));
5050
}
5151
}
5252
else

src/main/java/com/hankcs/hanlp/seg/Other/AhoCorasickDoubleArrayTrieSegment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ protected List<Term> segSentence(char[] sentence)
4040
{
4141
if (trie == null)
4242
{
43-
System.err.println("还未加载任何词典");
43+
logger.warning("还未加载任何词典");
4444
return Collections.emptyList();
4545
}
4646
final int[] wordNet = new int[sentence.length];

0 commit comments

Comments
 (0)