Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ASTDiff Oracle update #675

Merged
merged 3 commits into from
Mar 8, 2024
Merged

ASTDiff Oracle update #675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
21e17b1
ASTDiff: Update oracle for the String literals
pouryafard75 Mar 8, 2024
134e93f
ASTDiff: Update logs
pouryafard75 Mar 8, 2024
e91fa66
ASTDiff: Update the snapshots
pouryafard75 Mar 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/org/refactoringminer/astDiff/matchers/ProjectASTDiffer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,14 @@ private void diff() throws RefactoringMinerTimedOutException {
makeASTDiff(withCorrectOrder(modelDiff.getClassMoveDiffList()),false);
makeASTDiff(modelDiff.getInnerClassMoveDiffList(),true);
makeASTDiff(getExtraDiffs(),true);
long diff_execution_finished = System.currentTimeMillis();
logger.info("Diff execution: " + (diff_execution_finished - diff_execution_started)/ 1000 + " seconds");
for (ASTDiff diff : projectASTDiff.getDiffSet()) {
processOptimization(diff, optimizationDataMap.get(diff.getSrcPath()));
}
for (ASTDiff diff : projectASTDiff.getDiffSet()) {
new MissingIdenticalSubtree().match(diff.src.getRoot(), diff.dst.getRoot(), diff.getAllMappings());
}
long diff_execution_finished = System.currentTimeMillis();
logger.info("Diff execution: " + (diff_execution_finished - diff_execution_started)/ 1000 + " seconds");
computeAllEditScripts();
}

Expand Down
11 changes: 11 additions & 0 deletions ...78f880ffc9/src.com.jwetherell.algorithms.data_structures.timing.DataStructuresTiming.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115806,6 +115806,17 @@
"secondPos" : 67349,
"firstEndPos" : 80395,
"secondEndPos" : 67355
}, {
"firstType" : "StringLiteral",
"secondType" : "StringLiteral",
"firstLabel" : "\"Data Structure\"",
"secondLabel" : "\"Data Structure (\"",
"firstParentType" : "METHOD_INVOCATION_ARGUMENTS",
"secondParentType" : "InfixExpression",
"firstPos" : 80397,
"secondPos" : 67357,
"firstEndPos" : 80413,
"secondEndPos" : 67375
}, {
"firstType" : "StringLiteral",
"secondType" : "StringLiteral",
Expand Down
132 changes: 132 additions & 0 deletions ...a040ea4ff18a23ce5b63a4eeacf29/src.com.jwetherell.algorithms.sorts.timing.SortsTiming.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47980,6 +47980,17 @@
"secondPos" : 27759,
"firstEndPos" : 27601,
"secondEndPos" : 27897
}, {
"firstType" : "StringLiteral",
"secondType" : "StringLiteral",
"firstLabel" : "\"Insertion sort\\t\\t\\t\"",
"secondLabel" : "\"Insertion sort\"",
"firstParentType" : "InfixExpression",
"secondParentType" : "METHOD_INVOCATION_ARGUMENTS",
"firstPos" : 27448,
"secondPos" : 27767,
"firstEndPos" : 27470,
"secondEndPos" : 27783
}, {
"firstType" : "MethodInvocation",
"secondType" : "MethodInvocation",
Expand Down Expand Up @@ -48453,6 +48464,17 @@
"secondPos" : 27988,
"firstEndPos" : 27835,
"secondEndPos" : 28114
}, {
"firstType" : "StringLiteral",
"secondType" : "StringLiteral",
"firstLabel" : "\"Bubble sort\\t\\t\\t\"",
"secondLabel" : "\"Bubble sort\"",
"firstParentType" : "InfixExpression",
"secondParentType" : "METHOD_INVOCATION_ARGUMENTS",
"firstPos" : 27694,
"secondPos" : 27996,
"firstEndPos" : 27713,
"secondEndPos" : 28009
}, {
"firstType" : "MethodInvocation",
"secondType" : "MethodInvocation",
Expand Down Expand Up @@ -48926,6 +48948,17 @@
"secondPos" : 28204,
"firstEndPos" : 28064,
"secondEndPos" : 28326
}, {
"firstType" : "StringLiteral",
"secondType" : "StringLiteral",
"firstLabel" : "\"Shell sort\\t\\t\\t\"",
"secondLabel" : "\"Shell sort\"",
"firstParentType" : "InfixExpression",
"secondParentType" : "METHOD_INVOCATION_ARGUMENTS",
"firstPos" : 27927,
"secondPos" : 28212,
"firstEndPos" : 27945,
"secondEndPos" : 28224
}, {
"firstType" : "MethodInvocation",
"secondType" : "MethodInvocation",
Expand Down Expand Up @@ -49399,6 +49432,17 @@
"secondPos" : 28423,
"firstEndPos" : 28330,
"secondEndPos" : 28577
}, {
"firstType" : "StringLiteral",
"secondType" : "StringLiteral",
"firstLabel" : "\"Merge (in-place) sort\\t\\t\"",
"secondLabel" : "\"Merge (in-place) sort\"",
"firstParentType" : "InfixExpression",
"secondParentType" : "METHOD_INVOCATION_ARGUMENTS",
"firstPos" : 28163,
"secondPos" : 28431,
"firstEndPos" : 28190,
"secondEndPos" : 28454
}, {
"firstType" : "MethodInvocation",
"secondType" : "MethodInvocation",
Expand Down Expand Up @@ -49872,6 +49916,17 @@
"secondPos" : 28677,
"firstEndPos" : 28610,
"secondEndPos" : 28844
}, {
"firstType" : "StringLiteral",
"secondType" : "StringLiteral",
"firstLabel" : "\"Merge (not-in-place) sort\\t\"",
"secondLabel" : "\"Merge (not-in-place) sort\"",
"firstParentType" : "InfixExpression",
"secondParentType" : "METHOD_INVOCATION_ARGUMENTS",
"firstPos" : 28432,
"secondPos" : 28685,
"firstEndPos" : 28461,
"secondEndPos" : 28712
}, {
"firstType" : "MethodInvocation",
"secondType" : "MethodInvocation",
Expand Down Expand Up @@ -50345,6 +50400,17 @@
"secondPos" : 28934,
"firstEndPos" : 28854,
"secondEndPos" : 29075
}, {
"firstType" : "StringLiteral",
"secondType" : "StringLiteral",
"firstLabel" : "\"Quicksort with first as pivot\\t\"",
"secondLabel" : "\"Quicksort with first as pivot\"",
"firstParentType" : "InfixExpression",
"secondParentType" : "METHOD_INVOCATION_ARGUMENTS",
"firstPos" : 28702,
"secondPos" : 28942,
"firstEndPos" : 28735,
"secondEndPos" : 28973
}, {
"firstType" : "MethodInvocation",
"secondType" : "MethodInvocation",
Expand Down Expand Up @@ -50730,6 +50796,17 @@
"secondPos" : 29107,
"firstEndPos" : 29041,
"secondEndPos" : 29249
}, {
"firstType" : "StringLiteral",
"secondType" : "StringLiteral",
"firstLabel" : "\"Quicksort with middle as pivot\\t\"",
"secondLabel" : "\"Quicksort with middle as pivot\"",
"firstParentType" : "InfixExpression",
"secondParentType" : "METHOD_INVOCATION_ARGUMENTS",
"firstPos" : 28888,
"secondPos" : 29115,
"firstEndPos" : 28922,
"secondEndPos" : 29147
}, {
"firstType" : "MethodInvocation",
"secondType" : "MethodInvocation",
Expand Down Expand Up @@ -51115,6 +51192,17 @@
"secondPos" : 29281,
"firstEndPos" : 29228,
"secondEndPos" : 29423
}, {
"firstType" : "StringLiteral",
"secondType" : "StringLiteral",
"firstLabel" : "\"Quicksort with random as pivot\\t\"",
"secondLabel" : "\"Quicksort with random as pivot\"",
"firstParentType" : "InfixExpression",
"secondParentType" : "METHOD_INVOCATION_ARGUMENTS",
"firstPos" : 29075,
"secondPos" : 29289,
"firstEndPos" : 29109,
"secondEndPos" : 29321
}, {
"firstType" : "MethodInvocation",
"secondType" : "MethodInvocation",
Expand Down Expand Up @@ -51588,6 +51676,17 @@
"secondPos" : 29512,
"firstEndPos" : 29452,
"secondEndPos" : 29630
}, {
"firstType" : "StringLiteral",
"secondType" : "StringLiteral",
"firstLabel" : "\"Heap sort\\t\\t\\t\"",
"secondLabel" : "\"Heap sort\"",
"firstParentType" : "InfixExpression",
"secondParentType" : "METHOD_INVOCATION_ARGUMENTS",
"firstPos" : 29319,
"secondPos" : 29520,
"firstEndPos" : 29336,
"secondEndPos" : 29531
}, {
"firstType" : "MethodInvocation",
"secondType" : "MethodInvocation",
Expand Down Expand Up @@ -52061,6 +52160,17 @@
"secondPos" : 29723,
"firstEndPos" : 29696,
"secondEndPos" : 29857
}, {
"firstType" : "StringLiteral",
"secondType" : "StringLiteral",
"firstLabel" : "\"Counting sort\\t\\t\\t\"",
"secondLabel" : "\"Counting sort\"",
"firstParentType" : "InfixExpression",
"secondParentType" : "METHOD_INVOCATION_ARGUMENTS",
"firstPos" : 29547,
"secondPos" : 29731,
"firstEndPos" : 29568,
"secondEndPos" : 29746
}, {
"firstType" : "MethodInvocation",
"secondType" : "MethodInvocation",
Expand Down Expand Up @@ -52534,6 +52644,17 @@
"secondPos" : 29947,
"firstEndPos" : 29925,
"secondEndPos" : 30069
}, {
"firstType" : "StringLiteral",
"secondType" : "StringLiteral",
"firstLabel" : "\"Radix sort\\t\\t\\t\"",
"secondLabel" : "\"Radix sort\"",
"firstParentType" : "InfixExpression",
"secondParentType" : "METHOD_INVOCATION_ARGUMENTS",
"firstPos" : 29788,
"secondPos" : 29955,
"firstEndPos" : 29806,
"secondEndPos" : 29967
}, {
"firstType" : "MethodInvocation",
"secondType" : "MethodInvocation",
Expand Down Expand Up @@ -53007,6 +53128,17 @@
"secondPos" : 30166,
"firstEndPos" : 30188,
"secondEndPos" : 30317
}, {
"firstType" : "StringLiteral",
"secondType" : "StringLiteral",
"firstLabel" : "\"American Flag sort\\t\\t\"",
"secondLabel" : "\"American Flag sort\"",
"firstParentType" : "InfixExpression",
"secondParentType" : "METHOD_INVOCATION_ARGUMENTS",
"firstPos" : 30024,
"secondPos" : 30174,
"firstEndPos" : 30048,
"secondEndPos" : 30194
}, {
"firstType" : "MethodInvocation",
"secondType" : "MethodInvocation",
Expand Down
Loading