Merge branch 'dev' into test

src/main/java/edu/nju/model/AnalyseVO2.java

@@ -33,7 +33,9 @@ public class AnalyseVO2 {
 
     private Map<Integer,Integer> gradeDistrubute;
 
-    public AnalyseVO2(int likeNum, int dislikeNum, int forkNum, int reportNum, int testcaseNum, int bugNum, long startTime, long endTime, int workerNum, String taskName, JSONArray workerDistribute, List<WorkerVO> workerRank, Map<Integer, Integer> gradeDistrubute) {
+    private double pageCover;
+
+    public AnalyseVO2(int likeNum, int dislikeNum, int forkNum, int reportNum, int testcaseNum, int bugNum, long startTime, long endTime, int workerNum, String taskName, JSONArray workerDistribute, List<WorkerVO> workerRank, Map<Integer, Integer> gradeDistrubute,double pageCover) {
         this.likeNum = likeNum;
         this.dislikeNum = dislikeNum;
         this.forkNum = forkNum;
@@ -47,6 +49,7 @@ public class AnalyseVO2 {
         this.workerDistribute = workerDistribute;
         this.workerRank = workerRank;
         this.gradeDistrubute = gradeDistrubute;
+        this.pageCover=pageCover;
     }
 
     public int getLikeNum() {
@@ -152,4 +155,12 @@ public class AnalyseVO2 {
     public void setGradeDistrubute(Map<Integer, Integer> gradeDistrubute) {
         this.gradeDistrubute = gradeDistrubute;
     }
+
+    public double getPageCover() {
+        return pageCover;
+    }
+
+    public void setPageCover(double pageCover) {
+        this.pageCover = pageCover;
+    }
 }

src/main/java/edu/nju/service/AnalyzeService.java

@@ -941,7 +941,16 @@ public class AnalyzeService {
 			jsonObject.put("value",mapValue);
 			workerDistribute.put(jsonObject);
 		}
-		AnalyseVO2 analyseVO=new AnalyseVO2(likeNum,dislikeNum,forkNum,reportNum,testCaseNum,bugNum,startTime,endTime,reportNum,taskName,workerDistribute,workerRank,gradeDistribution);
+		Map<String,Integer>coverMap=getPageCover(taskId,caseId);
+		int size=coverMap.size();
+		int noBugPage=0;
+		for (Map.Entry<String, Integer> entry : coverMap.entrySet()) {
+			if(entry.getValue()==0){
+				noBugPage++;
+			}
+		}
+		double pageCover=noBugPage*1.0/size;
+		AnalyseVO2 analyseVO=new AnalyseVO2(likeNum,dislikeNum,forkNum,reportNum,testCaseNum,bugNum,startTime,endTime,reportNum,taskName,workerDistribute,workerRank,gradeDistribution,pageCover);
 		return analyseVO;
 	}