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

Jump to bottom

File total tokens added to report output #1036

Merged
merged 5 commits into from
May 10, 2023
Merged

File total tokens added to report output #1036

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9ebf6f5
File total tokens added to report output
jazerix Apr 20, 2023
f2aae56
Renamed variables and ran mvn:spotless
jazerix Apr 21, 2023
4622601
Switched to Objects.equals
jazerix May 1, 2023
9f22784
Merge branch 'develop' into develop
TwoOfTwelve May 10, 2023
e060624
Fixed formatting for spotless.
TwoOfTwelve May 10, 2023
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
6 changes: 5 additions & 1 deletion core/src/main/java/de/jplag/reporting/jsonfactory/ComparisonReportWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Function;
Expand Down Expand Up @@ -103,9 +104,12 @@ private Match convertMatchToReportMatch(JPlagComparison comparison, de.jplag.Mat
Token startOfSecond = tokensSecond.stream().min(lineComparator).orElseThrow();
Token endOfSecond = tokensSecond.stream().max(lineComparator).orElseThrow();

List<Token> firstTotalTokens = tokensFirst.stream().filter(x -> Objects.equals(x.getFile(), startOfFirst.getFile())).toList();
List<Token> secondTotalTokens = tokensSecond.stream().filter(x -> Objects.equals(x.getFile(), startOfSecond.getFile())).toList();

return new Match(relativizedFilePath(startOfFirst.getFile(), comparison.firstSubmission()),
relativizedFilePath(startOfSecond.getFile(), comparison.secondSubmission()), startOfFirst.getLine(), endOfFirst.getLine(),
startOfSecond.getLine(), endOfSecond.getLine(), match.length());
startOfSecond.getLine(), endOfSecond.getLine(), match.length(), firstTotalTokens.size(), secondTotalTokens.size());
}

private String relativizedFilePath(File file, Submission submission) {
Expand Down
3 changes: 2 additions & 1 deletion core/src/main/java/de/jplag/reporting/reportobject/model/Match.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@

public record Match(@JsonProperty("file1") String firstFileName, @JsonProperty("file2") String secondFileName,
@JsonProperty("start1") int startInFirst, @JsonProperty("end1") int endInFirst, @JsonProperty("start2") int startInSecond,
@JsonProperty("end2") int endInSecond, @JsonProperty("tokens") int tokens) {
@JsonProperty("end2") int endInSecond, @JsonProperty("tokens") int tokens, @JsonProperty("file1Tokens") long file1Tokens,
@JsonProperty("file2Tokens") long file2Tokens) {
}