diff --git a/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/EDiffHunkParser.java b/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/EDiffHunkParser.java index 5348144..8ca7eca 100755 --- a/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/EDiffHunkParser.java +++ b/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/EDiffHunkParser.java @@ -36,10 +36,10 @@ public class EDiffHunkParser extends EDiffParser { boolean processActionSet = true; - if (actionSets.size() > Integer.valueOf(hunkLimit)) { - processActionSet = false; - logger.debug("Skipping {} set size {}", diffentryFile.getName(), hunkLimit); - } +// if (actionSets.size() > Integer.valueOf(hunkLimit)) { +// processActionSet = false; +// logger.debug("Skipping {} set size {}", diffentryFile.getName(), hunkLimit); +// } int hunkSet = 0; if (processActionSet) { diff --git a/richedit/src/main/java/edu/lu/uni/serval/richedit/jobs/EnhancedASTDiff.java b/richedit/src/main/java/edu/lu/uni/serval/richedit/jobs/EnhancedASTDiff.java index dca2c5b..29d3cc7 100755 --- a/richedit/src/main/java/edu/lu/uni/serval/richedit/jobs/EnhancedASTDiff.java +++ b/richedit/src/main/java/edu/lu/uni/serval/richedit/jobs/EnhancedASTDiff.java @@ -77,7 +77,7 @@ public class EnhancedASTDiff { List allMessageFiles = new ArrayList<>(); for (File target : folders) { - List msgFiles = getMessageFiles(target.toString() + "/", project, patchSize, isJava); //"/Users/anilkoyuncu/bugStudy/code/python/GumTreeInput/Apache/CAMEL/" + List msgFiles = getMessageFiles(target.toString() + "/", project, patchSize, isJava,Integer.valueOf(hunkLimit)); //"/Users/anilkoyuncu/bugStudy/code/python/GumTreeInput/Apache/CAMEL/" // msgFiles = msgFiles.subList(0,3000); if (msgFiles == null) @@ -121,7 +121,7 @@ public class EnhancedASTDiff { - private static List getMessageFiles(String gumTreeInput,String datasetName,String patchSize,boolean isJava) { + private static List getMessageFiles(String gumTreeInput,String datasetName,String patchSize,boolean isJava,int hunkLimit) { String inputPath = gumTreeInput; // prevFiles revFiles diffentryFile positionsFile File revFilesPath = new File(inputPath + "revFiles/"); log.info(revFilesPath.getPath()); @@ -151,8 +151,8 @@ public class EnhancedASTDiff { if(count>= Integer.valueOf(patchSize)) // if(count>201) continue; -// if(FileHelper.readFile(diffentryFile).split("@@\\s\\-\\d+,*\\d*\\s\\+\\d+,*\\d*\\s@@").length > 2) -// continue; + if(FileHelper.readFile(diffentryFile).split("@@\\s\\-\\d+,*\\d*\\s\\+\\d+,*\\d*\\s@@").length >= hunkLimit) + continue; // String datasetName = project; String[] split1 = diffentryFile.getParent().split(datasetName);