소스 검색

fix restful web demo eval bug

will-jl944 4 년 전
부모
커밋
d48601a840
2개의 변경된 파일8개의 추가작업 그리고 8개의 파일을 삭제
  1. 4 4
      paddlex_restful/restful/project/evaluate/detection.py
  2. 4 4
      static/paddlex_restful/restful/project/evaluate/detection.py

+ 4 - 4
paddlex_restful/restful/project/evaluate/detection.py

@@ -405,8 +405,8 @@ class InsSegConfusionMatrix(object):
 class DetEvaluator(object):
     def __init__(self, model_path, overlap_thresh=0.5, score_threshold=0.3):
         self.model_path = model_path
-        self.overlap_thresh = overlap_thresh
-        self.score_threshold = score_threshold
+        self.overlap_thresh = overlap_thresh if overlap_thresh is not None else .5
+        self.score_threshold = score_threshold if score_threshold is not None else .3
 
     def _prepare_data(self):
         with open(osp.join(self.model_path, 'eval_details.json'), 'r') as f:
@@ -616,8 +616,8 @@ class InsSegEvaluator(DetEvaluator):
     def __init__(self, model_path, overlap_thresh=0.5, score_threshold=0.3):
         super(DetEvaluator, self).__init__()
         self.model_path = model_path
-        self.overlap_thresh = overlap_thresh
-        self.score_threshold = score_threshold
+        self.overlap_thresh = overlap_thresh if overlap_thresh is not None else .5
+        self.score_threshold = score_threshold if score_threshold is not None else .3
 
     def cal_confusion_matrix_mask(self):
         '''计算Mask的混淆矩阵。

+ 4 - 4
static/paddlex_restful/restful/project/evaluate/detection.py

@@ -405,8 +405,8 @@ class InsSegConfusionMatrix(object):
 class DetEvaluator(object):
     def __init__(self, model_path, overlap_thresh=0.5, score_threshold=0.3):
         self.model_path = model_path
-        self.overlap_thresh = overlap_thresh
-        self.score_threshold = score_threshold
+        self.overlap_thresh = overlap_thresh if overlap_thresh is not None else .5
+        self.score_threshold = score_threshold if score_threshold is not None else .3
 
     def _prepare_data(self):
         with open(osp.join(self.model_path, 'eval_details.json'), 'r') as f:
@@ -616,8 +616,8 @@ class InsSegEvaluator(DetEvaluator):
     def __init__(self, model_path, overlap_thresh=0.5, score_threshold=0.3):
         super(DetEvaluator, self).__init__()
         self.model_path = model_path
-        self.overlap_thresh = overlap_thresh
-        self.score_threshold = score_threshold
+        self.overlap_thresh = overlap_thresh if overlap_thresh is not None else .5
+        self.score_threshold = score_threshold if score_threshold is not None else .3
 
     def cal_confusion_matrix_mask(self):
         '''计算Mask的混淆矩阵。