Merge pull request #18 from zhugeyicixin/master

Code cleaning

README.md

@@ -21,10 +21,10 @@ Use:
 
 	from materials_entity_recognition import MatRecognition   
 	model = MatRecognition()  
-	all_materials, precursors, targets, other_materials = model.mat_recognize(input_para_text)  
+	result = model.mat_recognize(input_para_text)  
 
 Parameters:
 
 	Input: plain text of a paragraph  
-	Output: 4 list objects, which are all materials, precursors, targets, other materials, respectively.  
+	Output: a list of dict objects, containing all materials, precursors, targets, and other materials for each sentence in the input paragraph.  
 

materials_entity_recognition/__init__.py

@@ -1,6 +1,9 @@
 from .scripts import MatIdentification
 from .scripts import MatRecognition
 from .scripts import MatTPIdentification
+from .scripts import MatIdentificationBagging
+from .scripts import MatRecognitionBagging
+from .scripts import MatTPIdentificationBagging
 
 __author__ = 'Tanjin He'
 __maintainer__ = 'Tanjin He'

materials_entity_recognition/scripts/__init__.py

@@ -1,6 +1,9 @@
 from .mat_models import MatIdentification
 from .mat_models import MatRecognition
 from .mat_models import MatTPIdentification
+from .mat_models import MatIdentificationBagging
+from .mat_models import MatRecognitionBagging
+from .mat_models import MatTPIdentificationBagging
 
 __author__ = 'Tanjin He'
 __maintainer__ = 'Tanjin He'

materials_entity_recognition/scripts/loader.py

@@ -140,10 +140,15 @@ def cap_feature(s):
         return 3
 
 
-def prepare_sentence(str_words, word_to_id, char_to_id, lower=False,
-                        use_key_word=False, use_topic=False,
-                        use_CHO=False, use_eleNum=False, input_tokens=[],
-                        original_para_text=''):
+def prepare_sentence(str_words,
+                     word_to_id,
+                     char_to_id,
+                     lower=False,
+                     use_CHO=False,
+                     use_eleNum=False,
+                     input_tokens=[],
+                     original_para_text='',
+                     ):
     """
     Prepare a sentence for evaluation.