add default model

shineware · May 4, 2017 · 906b2db · 906b2db
1 parent a68dbbb
commit 906b2db
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 116 deletions.
diff --git a/models_full/irregular.model b/models_full/irregular.model
diff --git a/models_full/observation.model b/models_full/observation.model
diff --git a/models_full/pos.table b/models_full/pos.table
diff --git a/models_full/transition.model b/models_full/transition.model
diff --git a/models_light/irregular.model b/models_light/irregular.model
diff --git a/models_light/observation.model b/models_light/observation.model
diff --git a/models_light/pos.table b/models_light/pos.table
diff --git a/models_light/transition.model b/models_light/transition.model
diff --git a/src/main/java/kr/co/shineware/nlp/komoran/constant/DEFAULT_MODEL.java b/src/main/java/kr/co/shineware/nlp/komoran/constant/DEFAULT_MODEL.java
@@ -0,0 +1,8 @@
+package kr.co.shineware.nlp.komoran.constant;
+
+/**
+ * Created by shin285 on 2017. 5. 5..
+ */
+public enum DEFAULT_MODEL {
+	LIGHT, FULL
+}
diff --git a/src/main/java/kr/co/shineware/nlp/komoran/constant/FILENAME.java b/src/main/java/kr/co/shineware/nlp/komoran/constant/FILENAME.java
@@ -28,4 +28,6 @@ public class FILENAME {
 	public static final String OBSERVATION="observation.model";
 	public static final String TRANSITION="transition.model";
 	public static final String IRREGULAR_MODEL="irregular.model";
+	public static final String FULL_MODEL = "models_full";
+	public static final String LIGHT_MODEL = "models_light";
 }
diff --git a/src/main/java/kr/co/shineware/nlp/komoran/core/Komoran.java b/src/main/java/kr/co/shineware/nlp/komoran/core/Komoran.java
@@ -18,6 +18,7 @@
 package kr.co.shineware.nlp.komoran.core;
 
 import kr.co.shineware.ds.aho_corasick.FindContext;
+import kr.co.shineware.nlp.komoran.constant.DEFAULT_MODEL;
 import kr.co.shineware.nlp.komoran.constant.FILENAME;
 import kr.co.shineware.nlp.komoran.constant.SCORE;
 import kr.co.shineware.nlp.komoran.constant.SYMBOL;
@@ -52,30 +53,31 @@ public class Komoran implements Cloneable{
 	private Observation userDic;
 	private KoreanUnitParser unitParser;
 
-//	private Lattice lattice;
-
-
 	private HashMap<String, List<Pair<String, String>>> fwd;
 
-//	private String prevPos;
-//	private String prevMorph;
-//	private int prevBeginIdx;
-
-
 	public Komoran(String modelPath){
 		this.resources = new Resources();
 		this.load(modelPath);
 		this.unitParser = new KoreanUnitParser();
 	}
 
-	public Komoran(){
+	public Komoran(DEFAULT_MODEL modelType){
 
 		this.resources = new Resources();
 		this.resources.init();
-		InputStream posTableFile = this.getResourceStream("models_full"+File.separator+ FILENAME.POS_TABLE);
-		InputStream irrModelFile = this.getResourceStream("models_full"+File.separator+ FILENAME.IRREGULAR_MODEL);
-		InputStream observationFile = this.getResourceStream("models_full"+File.separator+ FILENAME.OBSERVATION);
-		InputStream transitionFile = this.getResourceStream("models_full"+File.separator+ FILENAME.TRANSITION);
+		String modelPath;
+		if(modelType == DEFAULT_MODEL.FULL){
+			modelPath = FILENAME.FULL_MODEL;
+		}else if(modelType == DEFAULT_MODEL.LIGHT){
+			modelPath = FILENAME.LIGHT_MODEL;
+		}else{
+			modelPath = FILENAME.FULL_MODEL;
+		}
+		InputStream posTableFile = this.getResourceStream(modelPath+File.separator+ FILENAME.POS_TABLE);
+		InputStream irrModelFile = this.getResourceStream(modelPath+File.separator+ FILENAME.IRREGULAR_MODEL);
+		InputStream observationFile = this.getResourceStream(modelPath+File.separator+ FILENAME.OBSERVATION);
+		InputStream transitionFile = this.getResourceStream(modelPath+File.separator+ FILENAME.TRANSITION);
+
 		this.resources.loadPosTable(posTableFile);
 		this.resources.loadIrregular(irrModelFile);
 		this.resources.loadObservation(observationFile);

diff --git a/src/test/java/kr/co/shineware/nlp/komoran/core/KomoranTest.java b/src/test/java/kr/co/shineware/nlp/komoran/core/KomoranTest.java
@@ -17,6 +17,7 @@
  *******************************************************************************/
 package kr.co.shineware.nlp.komoran.core;
 
+import kr.co.shineware.nlp.komoran.constant.DEFAULT_MODEL;
 import kr.co.shineware.nlp.komoran.model.KomoranResult;
 import kr.co.shineware.nlp.komoran.model.Token;
 import kr.co.shineware.nlp.komoran.util.KomoranCallable;
@@ -38,8 +39,7 @@ public class KomoranTest {
 
 	@Before
 	public void init() throws Exception {
-//		this.komoran = new Komoran("models_full");
-		this.komoran = new Komoran();
+		this.komoran = new Komoran(DEFAULT_MODEL.LIGHT);
 	}
 
 	@Test
@@ -102,7 +102,6 @@ public void multiThreadSpeedTest() throws ExecutionException, InterruptedExcepti
 
 		List<Future<KomoranResult>> komoranList = new ArrayList<>();
 		ThreadPoolExecutor executor = (ThreadPoolExecutor) Executors.newFixedThreadPool(2);
-		int count = 0;
 
 
 		for (String line : lines) {
@@ -124,19 +123,11 @@ public void multiThreadSpeedTest() throws ExecutionException, InterruptedExcepti
 		System.out.println("Elapsed time : "+(end-begin));
 	}
 
-	private void flush(List<Future<KomoranResult>> komoranList, String analyze) throws ExecutionException, InterruptedException {
-		for (Future<KomoranResult> komoranResultFuture : komoranList) {
-			KomoranResult komoranResult = komoranResultFuture.get();
-		}
-	}
 
 	@Test
 	public void threadSafeTest() throws ExecutionException, InterruptedException {
 		List<String> lines = FileUtil.load2List("in.txt");
 
-
-		List<CallableImpl> invokeTargetList = new ArrayList<>();
-		List<Future<String>> futureList = new ArrayList<>();
 		ExecutorService executorService = Executors.newFixedThreadPool(10);
 		for(int k=0;k<100000;k++) {
 			long b = System.currentTimeMillis();