azalea/fixminer_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix the issue of getting patch source code, and rename the package and class to make them consistent.

Browse Source
This commit is contained in:
Kui LIU
2017-07-25 11:29:13 +02:00
parent 73fedd9a46
commit e7a4fd6eca
9 changed files with 92 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/edu/lu/uni/serval/FixPatternMiner/App.java
-13
View File
@@ -1,13 +0,0 @@
package edu.lu.uni.serval.FixPatternMiner;
/**
* Hello world!
*
*/
public class App
{
public static void main( String[] args )
{
System.out.println( "Hello World!" );
}
}
src/main/java/edu/lu/uni/serval/FixPatternMiner/Miner2.java
-338
View File
@@ -1,338 +0,0 @@
package edu.lu.uni.serval.FixPatternMiner;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.StringReader;
import java.util.ArrayList;
import java.util.List;
import org.eclipse.jdt.core.dom.CompilationUnit;
import com.github.gumtreediff.actions.model.Move;
import com.github.gumtreediff.actions.model.Update;
import com.github.gumtreediff.tree.ITree;
import edu.lu.uni.serval.gumtree.GumTreeComparer;
import edu.lu.uni.serval.gumtree.regroup.ActionFilter;
import edu.lu.uni.serval.gumtree.regroup.HierarchicalActionSet;
import edu.lu.uni.serval.gumtree.regroup.SimpleTree;
import edu.lu.uni.serval.gumtree.regroup.SimplifyTree;
import edu.lu.uni.serval.gumtree.utils.CUCreator;
import edu.lu.uni.serval.utils.FileHelper;
public class Miner2 {
public static void main(String[] args) {
try {
inputData();
} catch (FileNotFoundException e) {
e.printStackTrace();
} catch (IOException e) {
e.printStackTrace();
}
}
public static void inputData() throws FileNotFoundException, IOException {
String inputPath = "../../OUTPUT/"; //DiffEntries prevFiles revFiles
File inputFileDirector = new File(inputPath);
File[] files = inputFileDirector.listFiles(); // project folders
FileHelper.deleteDirectory("../../GumTreeResults/Exp/");
FileHelper.deleteDirectory("../../GumTreeResults/Exp_ASTNode/");
FileHelper.deleteDirectory("../../GumTreeResults/Exp_RawCode/");
StringBuilder astEditScriptsBuilder = new StringBuilder();
for (File file : files) {
String projectFolder = file.getPath();
File revFileFolder = new File(projectFolder + "/revFiles/");// revised file folder
File[] revFiles = revFileFolder.listFiles();
for (File revFile : revFiles) {
if (revFile.getName().endsWith(".java")) {
File prevFile = new File(projectFolder + "/prevFiles/prev_" + revFile.getName());// previous file
File diffentryFile = new File(projectFolder + "/DiffEntries/" + revFile.getName().replace(".java", ".txt")); // DiffEntry file
// GumTree results
List<HierarchicalActionSet> gumTreeResults = new GumTreeComparer().compareTwoFilesWithGumTree(prevFile, revFile);
// Filter out modified actions of changing method names, method parameters, variable names and field names in declaration part.
gumTreeResults = new ActionFilter().filterOutUselessActions(gumTreeResults);
if (gumTreeResults.size() > 0) {
CUCreator cuCreator = new CUCreator();
CompilationUnit prevUnit = cuCreator.createCompilationUnit(prevFile);
CompilationUnit revUnit = cuCreator.createCompilationUnit(revFile);
// Commit Message TODO
// COMMIT_MSG#Num.
String sourceCode = FileHelper.readFile(diffentryFile);
for (HierarchicalActionSet gumTreeResult : gumTreeResults) {
// set line numbers
// position of buggy statements
int startPosition = 0;
int endPosition = 0;
// position of fixed statements
int startPosition2 = 0;
int endPosition2 = 0;
String actionStr = gumTreeResult.getActionString();
if (actionStr.startsWith("INS")) {
startPosition2 = gumTreeResult.getStartPosition();
endPosition2 = startPosition2 + gumTreeResult.getLength();
if (actionStr.startsWith("INS LabeledStatement") || actionStr.startsWith("INS ForStatement")
|| actionStr.startsWith("INS EnhancedForStatement") || actionStr.startsWith("INS DoStatement")
|| actionStr.startsWith("INS WhileStatement") || actionStr.startsWith("INS SynchronizedStatement")
|| actionStr.startsWith("INS IfStatement") || actionStr.startsWith("INS TryStatement")) {
List<Move> firstAndLastMov = getFirstAndLastMoveAction(gumTreeResult);
if (firstAndLastMov != null) {
startPosition = firstAndLastMov.get(0).getNode().getPos();
endPosition = firstAndLastMov.get(1).getNode().getPos() + firstAndLastMov.get(1).getNode().getLength();
} else { // Pure insert actions without any move actions.
continue;
}
} else { // other insert statements
continue;
}
} else if (actionStr.startsWith("UPD")) {
startPosition = gumTreeResult.getStartPosition();
endPosition = startPosition + gumTreeResult.getLength();
Update update = (Update) gumTreeResult.getAction();
ITree newNode = update.getNewNode();
startPosition2 = newNode.getPos();
endPosition2 = startPosition2 + newNode.getLength();
if (actionStr.startsWith("UPD LabeledStatement") || actionStr.startsWith("UPD ForStatement")
|| actionStr.startsWith("UPD EnhancedForStatement") || actionStr.startsWith("UPD DoStatement")
|| actionStr.startsWith("UPD WhileStatement") || actionStr.startsWith("UPD SynchronizedStatement")
|| actionStr.startsWith("UPD IfStatement") || actionStr.startsWith("UPD TryStatement")) {
List<ITree> children = gumTreeResult.getAction().getNode().getChildren();
endPosition = getEndPosition(children);
List<ITree> newChildren = newNode.getChildren();
endPosition2 = getEndPosition(newChildren);
}
} else {// DEL actions and MOV actions: we don't need these actions, as for now.
continue;
}
// Get the buggy code and fixed code
if (startPosition != 0 && startPosition2 != 0) {
// Line numbers of buggy statements
int startLineNum = prevUnit.getLineNumber(startPosition);
int endLineNum = prevUnit.getLineNumber(endPosition);
// Line numbers of fixed statements
int startLineNum2 = revUnit.getLineNumber(startPosition2);
int endLineNum2 = revUnit.getLineNumber(endPosition2);
// Limit the range of buggy code and fixed code. TODO:
gumTreeResult.setStartLineNum(startLineNum);
gumTreeResult.setEndLineNum(endLineNum);
// Source Code of patches.
String patchSourceCode = getPatchSourceCode(sourceCode, startLineNum, endLineNum, startLineNum2, endLineNum2);
if (patchSourceCode != null) {
patchSourceCode = "PATCH###Num\n" + patchSourceCode + "\n";
/**
* Simple tree of buggy code.
* TODO: it will be used to compute the similarity.
* Or re-parse the buggy code to get the simple tree.
*/
// convert the ITree of buggy code to a simple tree.
SimplifyTree abstractIdentifier = new SimplifyTree();
abstractIdentifier.abstractTree(gumTreeResult);
SimpleTree simpleTree = gumTreeResult.getSimpleTree();
SimpleTree abstractSimpleTree = gumTreeResult.getAbstractSimpleTree();
clearITree(gumTreeResult);
/**
* Select edit scripts for deep learning.
* Edit scripts will be used to mine common fix patterns.
*/
// 1. First level: AST node type.
String astEditScripts = getASTEditScripts(gumTreeResult);
astEditScriptsBuilder.append(astEditScripts + "\n");
// 2. source code TODO
// 3. abstract identifiers TODO
// 4. semi-source code. TODO
}
}
}
}
}
}
FileHelper.outputToFile("../../GumTreeResults/Exp_ASTNode/EditScripts.list", astEditScriptsBuilder, true);
astEditScriptsBuilder.setLength(0);
System.out.println(file);
}
}
private static int getEndPosition(List<ITree> children) {
int endPosition = 0;
for (ITree child : children) {
if (child.getLabel().endsWith("Body")) {
endPosition = child.getPos() - 1;
break;
}
}
return endPosition;
}
private static List<Move> getFirstAndLastMoveAction(HierarchicalActionSet gumTreeResult) {
List<Move> firstAndLastMoveActions = new ArrayList<>();
List<HierarchicalActionSet> actions = gumTreeResult.getSubActions();
if (actions.size() == 0) {
return null;
}
Move firstMoveAction = null;
Move lastMoveAction = null;
while (actions.size() > 0) {
List<HierarchicalActionSet> subActions = new ArrayList<>();
for (HierarchicalActionSet action : actions) {
subActions.addAll(action.getSubActions());
if (action.toString().startsWith("MOV")) {
if (firstMoveAction == null) {
firstMoveAction = (Move) action.getAction();
}
lastMoveAction = (Move) action.getAction();
}
}
actions.clear();
actions.addAll(subActions);
}
if (firstMoveAction == null) {
return null;
}
firstAndLastMoveActions.add(firstMoveAction);
firstAndLastMoveActions.add(lastMoveAction);
return firstAndLastMoveActions;
}
private static String getPatchSourceCode(String sourceCode, int startLineNum, int endLineNum, int startLineNum2, int endLineNum2) {
String buggyStatements = "";
String fixedStatements = "";
BufferedReader reader = null;
try {
reader = new BufferedReader(new StringReader(sourceCode));
String line = null;
int startLine = 0;
int counter = 0;
int range = 0;
int startLine2 = 0;
int counter2 = 0;
int range2 = 0;
int counter3 = 0; // counter of non-buggy code line.
while ((line = reader.readLine()) != null) {
if (startLine == 0 && line.startsWith("@@ -")) {
String lineNum = line.substring(4);
lineNum = lineNum.substring(0, lineNum.indexOf(" "));
String[] nums = lineNum.split(",");
startLine = Integer.parseInt(nums[0].trim());
range = Integer.parseInt(nums[1].trim());
if (startLine > startLineNum) {
return null; // Wrong Matching.
}
if (startLine + range < startLineNum) {
startLine = 0;
continue;
}
String lineNum2 = line.substring(line.indexOf("+")).trim();
lineNum2 = lineNum2.substring(1, lineNum2.length() - 2);
String[] nums2 = lineNum2.split(",");
startLine2 = Integer.parseInt(nums2[0].trim());
range2 = Integer.parseInt(nums2[1].trim());
continue;
}
int lineNum1 = counter + counter3;
int lineNum2 = counter2 + counter3;
if (startLine > 0 && lineNum1 < range && lineNum2 < range2) {
if (line.startsWith("-") && startLine + lineNum1 >= startLineNum && startLine + lineNum1 <= endLineNum) {
buggyStatements += line + "\n";
} else if (line.startsWith("+") && startLine2 + lineNum2 >= startLineNum2 && startLine2 + lineNum2 <= endLineNum2) {
fixedStatements += line + "\n";
}
if (line.startsWith("-")) {
counter ++;
} else if (line.startsWith("+")) {
counter2 ++;
} else {
counter3 ++;
}
}
}
} catch (IOException e) {
e.printStackTrace();
} finally {
try {
if (reader != null) {
reader.close();
reader = null;
}
} catch (IOException e) {
e.printStackTrace();
}
}
return buggyStatements + "\n" + fixedStatements;
}
/**
* Get the AST node based edit script of patches in terms of breadth first.
*
* @param actionSet
* @return
*/
private static String getASTEditScripts(HierarchicalActionSet actionSet) {
String editScript = "";
List<HierarchicalActionSet> actionSets = new ArrayList<>();
actionSets.add(actionSet);
while (actionSets.size() != 0) {
List<HierarchicalActionSet> subSets = new ArrayList<>();
for (HierarchicalActionSet set : actionSets) {
subSets.addAll(set.getSubActions());
String actionStr = set.getActionString();
int index = actionStr.indexOf("@@");
String singleEdit = actionStr.substring(0, index).replace(" ", "");
if (singleEdit.endsWith("SimpleName")) {
actionStr = actionStr.substring(index + 2);
if (actionStr.startsWith("MethodName")) {
singleEdit = singleEdit.replace("SimpleName", "MethodName");
} else {
if (actionStr.startsWith("Name")) {
actionStr = actionStr.substring(5, 6);
if (!actionStr.equals(actionStr.toLowerCase())) {
singleEdit = singleEdit.replace("SimpleName", "Name");
} else {
singleEdit = singleEdit.replace("SimpleName", "Variable");
}
} else {
singleEdit = singleEdit.replace("SimpleName", "Variable");
}
}
}
editScript += singleEdit + " ";
}
actionSets.clear();
actionSets.addAll(subSets);
}
return editScript;
}
private static void clearITree(HierarchicalActionSet actionSet) {
actionSet.getAction().setNode(null);
for (HierarchicalActionSet subActionSet : actionSet.getSubActions()) {
clearITree(subActionSet);
}
}
}
src/main/java/edu/lu/uni/serval/FixPatternMiner/Miner.java → src/main/java/edu/lu/uni/serval/FixPatternParser/Parser.java
+17 -10
View File
@@ -1,4 +1,4 @@
package edu.lu.uni.serval.FixPatternMiner; package edu.lu.uni.serval.FixPatternParser;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.File; import java.io.File;
@@ -23,12 +23,13 @@ import edu.lu.uni.serval.gumtree.utils.CUCreator;
import edu.lu.uni.serval.utils.FileHelper; import edu.lu.uni.serval.utils.FileHelper;
/** /**
* Mine fix patterns from GumTree results. * Parse fix patterns with GumTree..
* *
* @author kui.liu * @author kui.liu
* *
*/ */
public class Miner { public class Parser {
private String astEditScripts = ""; private String astEditScripts = "";
private String patchesSourceCode = ""; private String patchesSourceCode = "";
private int maxSize = 0; private int maxSize = 0;
@@ -91,6 +92,10 @@ public class Miner {
endPosition = getEndPosition(children); endPosition = getEndPosition(children);
List<ITree> newChildren = newNode.getChildren(); List<ITree> newChildren = newNode.getChildren();
endPosition2 = getEndPosition(newChildren); endPosition2 = getEndPosition(newChildren);
if (endPosition == 0 || endPosition2 == 0) {
continue;
}
} }
} else {// DEL actions and MOV actions: we don't need these actions, as for now. } else {// DEL actions and MOV actions: we don't need these actions, as for now.
continue; continue;
@@ -114,7 +119,8 @@ public class Miner {
String patchSourceCode = getPatchSourceCode(sourceCode, startLineNum, endLineNum, startLineNum2, String patchSourceCode = getPatchSourceCode(sourceCode, startLineNum, endLineNum, startLineNum2,
endLineNum2); endLineNum2);
if (patchSourceCode != null) { if (patchSourceCode != null) {
patchesSourceCode += "PATCH###Num\n" + patchSourceCode + "\n"; patchesSourceCode += "PATCH###Num\n" + patchSourceCode;
patchesSourceCode += actionSet.toString() + "\n";
/** /**
* Convert the ITree of buggy code to a simple tree. * Convert the ITree of buggy code to a simple tree.
@@ -197,11 +203,12 @@ public class Miner {
int startPositionFirst = firstMoveAction.getPosition(); int startPositionFirst = firstMoveAction.getPosition();
int startPositionLast = lastMoveAction.getPosition(); int startPositionLast = lastMoveAction.getPosition();
int lengthLast = lastMoveAction.getNode().getLength(); int lengthLast = lastMoveAction.getNode().getLength();
if (startPosition < startPositionFirst) { if (startPosition < startPositionFirst || (startPosition == startPositionFirst && length > firstMoveAction.getLength())) {
firstMoveAction = (Move) action.getAction(); firstMoveAction = (Move) action.getAction();
} else if ((startPosition + length) > (startPositionLast + lengthLast)) {
lastMoveAction = (Move) action.getAction();
} }
if ((startPosition + length) > (startPositionLast + lengthLast)) {
lastMoveAction = (Move) action.getAction();
}
} }
} }
} }
@@ -241,7 +248,7 @@ public class Miner {
} }
startLine = Integer.parseInt(nums[0].trim()); startLine = Integer.parseInt(nums[0].trim());
range = Integer.parseInt(nums[1].trim()); range = Integer.parseInt(nums[1].trim());
if (startLine > startLineNum) { if (startLine > endLineNum) {
return null; // Wrong Matching. return null; // Wrong Matching.
} }
if (startLine + range < startLineNum) { if (startLine + range < startLineNum) {
@@ -263,7 +270,7 @@ public class Miner {
int lineNum1 = counter + counter3; int lineNum1 = counter + counter3;
int lineNum2 = counter2 + counter3; int lineNum2 = counter2 + counter3;
if (startLine > 0 && lineNum1 < range && lineNum2 < range2) { if (startLine > 0 && startLine2 > 0 && lineNum1 < range && lineNum2 < range2) {
if (line.startsWith("-") && startLine + lineNum1 >= startLineNum && startLine + lineNum1 <= endLineNum) { if (line.startsWith("-") && startLine + lineNum1 >= startLineNum && startLine + lineNum1 <= endLineNum) {
buggyStatements += line + "\n"; buggyStatements += line + "\n";
} else if (line.startsWith("+") && startLine2 + lineNum2 >= startLineNum2 && startLine2 + lineNum2 <= endLineNum2) { } else if (line.startsWith("+") && startLine2 + lineNum2 >= startLineNum2 && startLine2 + lineNum2 <= endLineNum2) {
@@ -290,7 +297,7 @@ public class Miner {
e.printStackTrace(); e.printStackTrace();
} }
} }
return buggyStatements + "\n" + fixedStatements; return buggyStatements + fixedStatements;
} }
/** /**
src/main/java/edu/lu/uni/serval/FixPatternParser/TestParser.java
+52
View File
@@ -0,0 +1,52 @@
package edu.lu.uni.serval.FixPatternParser;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import edu.lu.uni.serval.utils.FileHelper;
/**
* Test fix pattern parser.
*/
public class TestParser {
public static void main(String[] args) {
String testDataPath = "../../gumtree/gen.jdt/Dataset/"; //DiffEntries prevFiles revFiles
File inputFileDirector = new File(testDataPath);
File[] files = inputFileDirector.listFiles(); // project folders
FileHelper.deleteDirectory("OUTPUT/GumTreeResults_Exp/");
FileHelper.deleteDirectory("OUTPUT/GumTreeResults_Exp_ASTNode/");
FileHelper.deleteDirectory("OUTPUT/GumTreeResults_Exp_RawCode/");
StringBuilder astEditScriptsBuilder = new StringBuilder();
StringBuilder sourceCodeBuilder = new StringBuilder();
for (File file : files) {
String projectFolder = file.getPath();
File revFileFolder = new File(projectFolder + "/revFiles/");// revised file folder
File[] revFiles = revFileFolder.listFiles();
for (File revFile : revFiles) {
if (revFile.getName().endsWith(".java")) {
File prevFile = new File(projectFolder + "/prevFiles/prev_" + revFile.getName());// previous file
File diffentryFile = new File(projectFolder + "/DiffEntries/" + revFile.getName().replace(".java", ".txt")); // DiffEntry file
Parser parser = new Parser();
try {
parser.mineFixPatterns(prevFile, revFile, diffentryFile);
astEditScriptsBuilder.append(parser.getAstEditScripts());
sourceCodeBuilder.append(parser.getPatchesSourceCode());
} catch (FileNotFoundException e) {
e.printStackTrace();
} catch (IOException e) {
e.printStackTrace();
}
}
}
}
FileHelper.outputToFile("OUTPUT/GumTreeResults_Exp/EditScripts.list", astEditScriptsBuilder, false);
FileHelper.outputToFile("OUTPUT/GumTreeResults_Exp/Patches.list", sourceCodeBuilder, false);
}
}
src/main/java/edu/lu/uni/serval/FixPatternMiner/AkkaMiner.java → src/main/java/edu/lu/uni/serval/MultipleThreadsParser/AkkaParser.java
+5 -5
View File
@@ -1,4 +1,4 @@
package edu.lu.uni.serval.FixPatternMiner; package edu.lu.uni.serval.MultipleThreadsParser;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
@@ -11,9 +11,9 @@ import akka.actor.ActorRef;
import akka.actor.ActorSystem; import akka.actor.ActorSystem;
import edu.lu.uni.serval.utils.FileHelper; import edu.lu.uni.serval.utils.FileHelper;
public class AkkaMiner { public class AkkaParser {
private static Logger log = LoggerFactory.getLogger(AkkaMiner.class); private static Logger log = LoggerFactory.getLogger(AkkaParser.class);
public static void main(String[] args) { public static void main(String[] args) {
// input data // input data
@@ -32,9 +32,9 @@ public class AkkaMiner {
final int numberOfWorkers = 200; final int numberOfWorkers = 200;
final WorkMessage msg = new WorkMessage(0, msgFiles); final WorkMessage msg = new WorkMessage(0, msgFiles);
try { try {
log.info("Akka beings..."); log.info("Akka begins...");
system = ActorSystem.create("Mining-FixPattern-System"); system = ActorSystem.create("Mining-FixPattern-System");
parsingActor = system.actorOf(MineFixPatternActor.props(numberOfWorkers, editScriptsFilePath, patchesSourceCodeFilePath), "mine-fix-pattern-actor"); parsingActor = system.actorOf(ParseFixPatternActor.props(numberOfWorkers, editScriptsFilePath, patchesSourceCodeFilePath), "mine-fix-pattern-actor");
parsingActor.tell(msg, ActorRef.noSender()); parsingActor.tell(msg, ActorRef.noSender());
} catch (Exception e) { } catch (Exception e) {
system.shutdown(); system.shutdown();
src/main/java/edu/lu/uni/serval/FixPatternMiner/MessageFile.java → src/main/java/edu/lu/uni/serval/MultipleThreadsParser/MessageFile.java
+1 -1
View File
@@ -1,4 +1,4 @@
package edu.lu.uni.serval.FixPatternMiner; package edu.lu.uni.serval.MultipleThreadsParser;
import java.io.File; import java.io.File;
src/main/java/edu/lu/uni/serval/FixPatternMiner/MineFixPatternActor.java → src/main/java/edu/lu/uni/serval/MultipleThreadsParser/ParseFixPatternActor.java
+8 -8
View File
@@ -1,4 +1,4 @@
package edu.lu.uni.serval.FixPatternMiner; package edu.lu.uni.serval.MultipleThreadsParser;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -12,29 +12,29 @@ import akka.actor.UntypedActor;
import akka.japi.Creator; import akka.japi.Creator;
import akka.routing.RoundRobinPool; import akka.routing.RoundRobinPool;
public class MineFixPatternActor extends UntypedActor { public class ParseFixPatternActor extends UntypedActor {
private static Logger logger = LoggerFactory.getLogger(MineFixPatternActor.class); private static Logger logger = LoggerFactory.getLogger(ParseFixPatternActor.class);
private ActorRef mineRouter; private ActorRef mineRouter;
private final int numberOfWorkers; private final int numberOfWorkers;
private int counter = 0; private int counter = 0;
public MineFixPatternActor(int numberOfWorkers, String editScriptsFilePath, String patchesSourceCodeFilePath) { public ParseFixPatternActor(int numberOfWorkers, String editScriptsFilePath, String patchesSourceCodeFilePath) {
mineRouter = this.getContext().actorOf(new RoundRobinPool(numberOfWorkers) mineRouter = this.getContext().actorOf(new RoundRobinPool(numberOfWorkers)
.props(MineFixPatternWorker.props(editScriptsFilePath, patchesSourceCodeFilePath)), "mine-fix-pattern-router"); .props(ParseFixPatternWorker.props(editScriptsFilePath, patchesSourceCodeFilePath)), "mine-fix-pattern-router");
this.numberOfWorkers = numberOfWorkers; this.numberOfWorkers = numberOfWorkers;
} }
public static Props props(final int numberOfWorkers, final String editScriptsFilePath, final String patchesSourceCodeFilePath) { public static Props props(final int numberOfWorkers, final String editScriptsFilePath, final String patchesSourceCodeFilePath) {
return Props.create(new Creator<MineFixPatternActor>() { return Props.create(new Creator<ParseFixPatternActor>() {
private static final long serialVersionUID = 9207427376110704705L; private static final long serialVersionUID = 9207427376110704705L;
@Override @Override
public MineFixPatternActor create() throws Exception { public ParseFixPatternActor create() throws Exception {
return new MineFixPatternActor(numberOfWorkers, editScriptsFilePath, patchesSourceCodeFilePath); return new ParseFixPatternActor(numberOfWorkers, editScriptsFilePath, patchesSourceCodeFilePath);
} }
}); });
src/main/java/edu/lu/uni/serval/FixPatternMiner/MineFixPatternWorker.java → src/main/java/edu/lu/uni/serval/MultipleThreadsParser/ParseFixPatternWorker.java
+8 -7
View File
@@ -1,4 +1,4 @@
package edu.lu.uni.serval.FixPatternMiner; package edu.lu.uni.serval.MultipleThreadsParser;
import java.io.File; import java.io.File;
import java.util.List; import java.util.List;
@@ -6,26 +6,27 @@ import java.util.List;
import akka.actor.Props; import akka.actor.Props;
import akka.actor.UntypedActor; import akka.actor.UntypedActor;
import akka.japi.Creator; import akka.japi.Creator;
import edu.lu.uni.serval.FixPatternParser.Parser;
import edu.lu.uni.serval.utils.FileHelper; import edu.lu.uni.serval.utils.FileHelper;
public class MineFixPatternWorker extends UntypedActor { public class ParseFixPatternWorker extends UntypedActor {
private String editScriptsFilePath; private String editScriptsFilePath;
private String patchesSourceCodeFilePath; private String patchesSourceCodeFilePath;
public MineFixPatternWorker(String editScriptsFilePath, String patchesSourceCodeFilePath) { public ParseFixPatternWorker(String editScriptsFilePath, String patchesSourceCodeFilePath) {
this.editScriptsFilePath = editScriptsFilePath; this.editScriptsFilePath = editScriptsFilePath;
this.patchesSourceCodeFilePath = patchesSourceCodeFilePath; this.patchesSourceCodeFilePath = patchesSourceCodeFilePath;
} }
public static Props props(final String editScriptsFile, final String patchesSourceCodeFile) { public static Props props(final String editScriptsFile, final String patchesSourceCodeFile) {
return Props.create(new Creator<MineFixPatternWorker>() { return Props.create(new Creator<ParseFixPatternWorker>() {
private static final long serialVersionUID = -7615153844097275009L; private static final long serialVersionUID = -7615153844097275009L;
@Override @Override
public MineFixPatternWorker create() throws Exception { public ParseFixPatternWorker create() throws Exception {
return new MineFixPatternWorker(editScriptsFile, patchesSourceCodeFile); return new ParseFixPatternWorker(editScriptsFile, patchesSourceCodeFile);
} }
}); });
@@ -43,7 +44,7 @@ public class MineFixPatternWorker extends UntypedActor {
File revFile = msgFile.getRevFile(); File revFile = msgFile.getRevFile();
File prevFile = msgFile.getPrevFile(); File prevFile = msgFile.getPrevFile();
File diffentryFile = msgFile.getDiffEntryFile(); File diffentryFile = msgFile.getDiffEntryFile();
Miner miner = new Miner(); Parser miner = new Parser();
miner.mineFixPatterns(prevFile, revFile, diffentryFile); miner.mineFixPatterns(prevFile, revFile, diffentryFile);
editScripts.append(miner.getAstEditScripts()); editScripts.append(miner.getAstEditScripts());
patchesSourceCode.append(miner.getPatchesSourceCode()); patchesSourceCode.append(miner.getPatchesSourceCode());
src/main/java/edu/lu/uni/serval/FixPatternMiner/WorkMessage.java → src/main/java/edu/lu/uni/serval/MultipleThreadsParser/WorkMessage.java
+1 -1
View File
@@ -1,4 +1,4 @@
package edu.lu.uni.serval.FixPatternMiner; package edu.lu.uni.serval.MultipleThreadsParser;
import java.util.List; import java.util.List;