Fixed export of LaTeX-Protocol, Fixed build process for newer Java-versions

Author: moritzfl

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.github.moritzfl</groupId>
 	<artifactId>sortingalgorithms</artifactId>
-	<version>1.4.1</version>
+	<version>1.4.2</version>
 	<name>sortingalgorithms</name>
 	<prerequisites>
 		<maven>3</maven>
@@ -91,7 +91,7 @@
 			<plugin>
 				<groupId>com.akathist.maven.plugins.launch4j</groupId>
 				<artifactId>launch4j-maven-plugin</artifactId>
-				<version>1.7.24</version>
+				<version>2.1.2</version>
 				<executions>
 					<execution>
 						<id>l4j-clui</id>
@@ -115,7 +115,7 @@
 								<fileVersion>${project.version}.0</fileVersion>
 								<txtFileVersion>${project.version}</txtFileVersion>
 								<fileDescription>${project.name}</fileDescription>
-								<copyright>2015-2017 Moritz Flöter</copyright>
+								<copyright>2015-2022 Moritz Flöter</copyright>
 								<productVersion>${project.version}.0</productVersion>
 								<txtProductVersion>${project.version}.0</txtProductVersion>
 								<productName>${project.name}</productName>

src/main/java/de/moritzf/sorting/gui/util/SaveFileUtil.java

@@ -16,7 +16,7 @@
  */
 public class SaveFileUtil {
 
-    private static String TEMPLATE_FILE = "export-template.txt";
+    private static String TEMPLATE_FILE = "/de/moritzf/sorting/io/export-template.txt";
 
     /**
      * Saves the String passed to it as LaTeX document

src/main/java/de/moritzf/sorting/logic/sorting/algorithms/HeapSort.java

@@ -157,11 +157,98 @@ public int getInputSize() {
     public void reset() {
     }
 
-    @Override
+    /**
+     * Renders the protocol to LaTeX-code.
+     *
+     * @return the string
+     */
     public String protocol2LaTeX() {
-        return null;
+        String retString = "";
+        for (int i = 0; i < protocol.size(); i++) {
+            retString += " " + this.step2LaTeX(i) + "\n \n";
+        }
+        return retString;
+    }
+
+    /**
+     * Generates a LaTeX-Expression representing one step. This is used for
+     * export only as JLaTeX-Math does not allow the use of tikz. The GUI uses
+     * HeapSortPanelExtended as replacement (which uses BinaryTreePanel to
+     * render the binary tree)
+     *
+     * @param chosenStepNumber the chosen step number
+     * @return the string
+     */
+    public String step2LaTeX(int chosenStepNumber) {
+        HeapStep chosenStep = this.protocol.get(chosenStepNumber);
+        String retString = "";
+        if (chosenStepNumber == 0) {
+            retString += "\\underline{\\textbf{Heap Creation}}\n\n original binary tree \n\n";
+        } else if (chosenStepNumber == 1) {
+            retString += "$\\rhd number\\lhd$ := element that is to be heapified \n\n";
+        }
+
+        final TreeNode<HeapSortNodeValue> renderingTarget = chosenStep.getRootNode();
+
+        /*
+         * Generate elements for the part of the protocol where values get
+         * removed from the Heap and inserted into the Array
+         */
+        if (chosenStep.getCurrentNode() < 1) {
+            if (chosenStep.getCurrentNode() == 0) {
+                retString += "\\underline{\\textbf{Sorting}}\n\n";
+              }
+            retString += "sorted array : [";
+            for (int i = 0; i < chosenStep.getSortedNumbers().size(); i++) {
+                retString += Integer.toString(chosenStep.getSortedNumbers().get(i));
+                if (i < chosenStep.getSortedNumbers().size() - 1) {
+                    retString += ", ";
+                }
+            }
+            retString += "]\n\n";
+        }
+
+
+        if (renderingTarget != null) {
+            retString += "\\begin{tikzpicture}[very thick,level/.style={sibling distance=60mm/#1}]\n \\"
+                    + generateLaTeXHeapNode(renderingTarget, chosenStep) + "; \n \\end{tikzpicture}";
+        } else {
+            retString += "$\\rightarrow finished  \\, sorting$";
+        }
+
+        retString += "\n\n ............................ \n\n";
+        return retString;
+    }
+
+    /**
+     * Generate heap node. This generates a node of the binary tree as well as
+     * all its children by recursively calling this function
+     *
+     * @param step       the step
+     * @return the string
+     */
+    private String generateLaTeXHeapNode(TreeNode<HeapSortNodeValue> renderingTarget, HeapStep step) {
+        String retString = "node [vertex]";
+        String[] parts = renderingTarget.toString().split("%begin-above-node");
+        if (parts.length > 1)  {
+            retString += "[label={\\small $" + parts[1].replace("st", "cancel") + "$}] ";
+        }
+        retString += "{$" + parts[0].replace("st", "cancel") + "$}";
+
+        if (!renderingTarget.getChildren().isEmpty()) {
+            List<TreeNode<HeapSortNodeValue>> children = renderingTarget.getChildren();
+            retString += "child{" + generateLaTeXHeapNode(children.get(0), step) + "}";
+            if (children.size() > 1) {
+                retString += "\nchild{" + generateLaTeXHeapNode(children.get(1), step) + "}";
+            } else {
+                retString += "child[missing]{}";
+            }
+
+        }
+        return retString;
     }
 
+
     @Override
     public boolean undoStep() {
         return false;

src/main/resources/de/moritzf/sorting/gui/windows/about-copyright.txt

@@ -10,7 +10,7 @@
   -----------------------------------------------------------------------------
   This program is licensed under the terms of the GPL.
 
-    Copyright (C) 2015 - 2019  Moritz Floeter
+    Copyright (C) 2015 - 2022  Moritz Floeter
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

src/main/resources/de/moritzf/sorting/gui/windows/about-version.txt

@@ -1,2 +1,2 @@
-\text{\textit{Sorting Algorithms V 1.4.1}} \\
-\scriptsize \text{© 2015-2019 by Moritz Fl\ddot{o}ter}
+\text{\textit{Sorting Algorithms V 1.4.2}} \\
+\scriptsize \text{© 2015-2022 by Moritz Fl\ddot{o}ter}