Added average solution length to statistics table. Fixed table header alignment.

Author: mikkomaran

src/main/java/ee/ut/similaritydetector/backend/Analyser.java

@@ -47,6 +47,10 @@ public Analyser(File zipDirectory, double similarityThreshold, boolean preproces
         similarSolutionClusters = new ArrayList<>();
     }
 
+    public boolean isPreprocessSourceCode() {
+        return preprocessSourceCode;
+    }
+
     public File getZipDirectory() {
         return zipDirectory;
     }

src/main/java/ee/ut/similaritydetector/backend/SolutionParser.java

@@ -10,7 +10,6 @@
 import java.nio.file.InvalidPathException;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.time.format.DateTimeFormatterBuilder;
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.List;
@@ -100,7 +99,6 @@ public List<Exercise> parseSolutions() {
                                 // Replace with latest submission of solution if a solution is already present for the author
                                 if (existingSolution.isPresent()) {
                                     if (existingSolution.get().getSubmissionTime().isBefore(newSolution.getSubmissionTime())) {
-                                        System.out.println(newSolution.getAuthor() + " - " + existingSolution.get().getSubmissionTime() + " - " + newSolution.getSubmissionTime());
                                         exercise.replaceSolution(exercise.getSolutions().indexOf(existingSolution.get()), newSolution);
                                     }
                                 } else {

src/main/java/ee/ut/similaritydetector/ui/controllers/MenuBarController.java

@@ -50,11 +50,7 @@ private void initialize() {
         lightTheme.setOnAction(event -> Platform.runLater(this::activateLightTheme));
         darkTheme.setOnAction(event -> Platform.runLater(this::activateDarkTheme));
         // When scenes are switched then persists theme selection
-        if (UserData.getInstance().isDarkMode()) {
-            darkTheme.setSelected(true);
-        } else {
-            lightTheme.setSelected(true);
-        }
+        persistCurrentTheme();
     }
 
     @FXML
@@ -66,6 +62,7 @@ private void exitMenuItemClicked() {
      * Activates dark theme on every currently opened window by adding a css stylesheet to the scenes.
      */
     private void activateDarkTheme() {
+        darkTheme.setSelected(true);
         UserData.getInstance().setDarkMode(true);
         Stage.getWindows().forEach(window -> {
             ObservableList<String> stylesheets = window.getScene().getStylesheets();
@@ -82,6 +79,7 @@ private void activateDarkTheme() {
      * Activates light theme on every currently opened window by adding a css stylesheet to the scenes.
      */
     private void activateLightTheme() {
+        lightTheme.setSelected(true);
         UserData.getInstance().setDarkMode(false);
         Stage.getWindows().forEach(window -> window.getScene().getStylesheets().remove(String.valueOf(this.getClass().getResource(darkThemeStylesheetPath))));
         if (CodeViewController.getInstance() != null){

src/main/java/ee/ut/similaritydetector/ui/controllers/ResultsViewController.java

@@ -51,6 +51,8 @@ public class ResultsViewController {
     @FXML
     private TableColumn<ExerciseStatistics, Integer> similarClustersColumn;
     @FXML
+    private TableColumn<ExerciseStatistics, Integer> averageSolutionLengthColumn;
+    @FXML
     private TableColumn<ExerciseStatistics, String> similarityThresholdColumn;
 
     @FXML
@@ -98,6 +100,7 @@ private void fillExerciseStatisticsTable() {
         suspiciousSolutionsColumn.setCellValueFactory(new PropertyValueFactory<>("suspiciousSolutions"));
         similarPairsColumn.setCellValueFactory(new PropertyValueFactory<>("similarPairs"));
         similarClustersColumn.setCellValueFactory(new PropertyValueFactory<>("similarClusters"));
+        averageSolutionLengthColumn.setCellValueFactory(new PropertyValueFactory<>("averageSolutionLength"));
         similarityThresholdColumn.setCellValueFactory(new PropertyValueFactory<>("similarityThreshold"));
 
         analyser.getExercises().forEach(exercise -> exerciseStatisticsTable.getItems().add(new ExerciseStatistics(exercise, analyser)));

src/main/java/ee/ut/similaritydetector/ui/utils/ExerciseStatistics.java

@@ -16,6 +16,7 @@ public class ExerciseStatistics {
     private final double percentageSuspiciousSolutions;
     private final int similarPairs;
     private final int similarClusters;
+    private final int averageSolutionLength;
     private final String similarityThreshold;
 
     public String getExerciseName() {
@@ -42,6 +43,10 @@ public int getSimilarClusters() {
         return similarClusters;
     }
 
+    public int getAverageSolutionLength() {
+        return averageSolutionLength;
+    }
+
     public String getSimilarityThreshold() {
         return similarityThreshold;
     }
@@ -59,6 +64,10 @@ public ExerciseStatistics(Exercise exercise, Analyser analyser) {
                 pair.getFirstSolution().getExerciseName().equals(exerciseName)).count();
         this.similarClusters = (int) analyser.getSimilarSolutionClusters().stream().filter(cluster ->
                 cluster.getExerciseName().equals(exerciseName)).count();
+        this.averageSolutionLength = (int) Math.round(
+                analyser.isPreprocessSourceCode() ?
+                exercise.getAverageSolutionPreprocessedCodeLength() :
+                exercise.getAverageSolutionSourceCodeLength());
         this.similarityThreshold = String.format("%.1f%%", exercise.getSimilarityThreshold() * 100);
     }
 

src/main/resources/ee/ut/similaritydetector/fxml/results_view.fxml

@@ -61,7 +61,8 @@
                         <TableColumn fx:id="suspiciousSolutionsColumn" editable="false" prefWidth="100.0" sortType="DESCENDING" styleClass="number-column, column-header-alignment-center" text="Suspicious&#10;solutions" />
                         <TableColumn fx:id="similarPairsColumn" editable="false" prefWidth="100.0" sortType="DESCENDING" styleClass="number-column" text="Similar pairs " />
                         <TableColumn fx:id="similarClustersColumn" editable="false" prefWidth="100.0" sortType="DESCENDING" styleClass="number-column" text="Similar clusters" />
-                        <TableColumn fx:id="similarityThresholdColumn" editable="false" prefWidth="100.0" sortType="DESCENDING" styleClass="number-column, column-header-alignment-center" text="Used similarity &#10;threshold" />
+                       <TableColumn fx:id="averageSolutionLengthColumn" editable="false" prefWidth="100.0" sortType="DESCENDING" styleClass="number-column, column-header-alignment-center" text="Average&#10;solution length" />
+                       <TableColumn fx:id="similarityThresholdColumn" editable="false" prefWidth="100.0" sortType="DESCENDING" styleClass="number-column, column-header-alignment-center" text="Used similarity &#10;threshold" />
                     </columns>
                      <VBox.margin>
                         <Insets left="75.0" right="75.0" />

src/main/resources/ee/ut/similaritydetector/style/results_view_style.scss

@@ -5,5 +5,5 @@
 }
 
 .column-header-alignment-center .label {
-  -fx-alignment: center;
+  -fx-text-alignment: center;
 }