fix style issues

Author: Peng Li

paddle/gserver/evaluators/ChunkEvaluator.cpp

@@ -162,9 +162,9 @@ class ChunkEvaluator : public Evaluator {
     getSegments(label, length, labelSegments_);
     size_t i = 0, j = 0;
     while (i < outputSegments_.size() && j < labelSegments_.size()) {
-      if (outputSegments_[i] == labelSegments_[j]) {
-        if (excludedChunkTypes_.count(outputSegments_[i].type) != 1)
-          ++numCorrect_;
+      if (outputSegments_[i] == labelSegments_[j] &&
+          excludedChunkTypes_.count(outputSegments_[i].type) != 1) {
+        ++numCorrect_;
       }
       if (outputSegments_[i].end < labelSegments_[j].end) {
         ++i;

proto/ModelConfig.proto

@@ -437,8 +437,6 @@ message EvaluatorConfig {
   optional string chunk_scheme = 4;
   // number of chunk types other than "other"
   optional int32 num_chunk_types = 5;
-  // chunk of these types are not counted
-  repeated int32 excluded_chunk_types = 12;
 
   // Used by PrecisionRecallEvaluator and ClassificationErrorEvaluator
   // For multi binary labels: true if output > classification_threshold
@@ -458,7 +456,9 @@ message EvaluatorConfig {
   // whether to delimit the sequence in the seq_text_printer
   optional bool delimited = 11 [default = true];
 
-  // NOTE: 12 has been occupied by excluded_chunk_types
+  // Used by ChunkEvaluator
+  // chunk of these types are not counted
+  repeated int32 excluded_chunk_types = 12;
 }
 
 message LinkConfig {

python/paddle/trainer_config_helpers/evaluators.py

@@ -381,7 +381,7 @@ def chunk_evaluator(
     :param name: The Evaluator name, it is optional.
     :type name: basename|None
     :param excluded_chunk_types: chunks of these types are not considered
-    :type excluded_chunk_types: list of integer|[]
+    :type excluded_chunk_types: list of integer|None
     """
     evaluator_base(
         name=name,