Merge branch 'master' of https://github.com/richmondvan/threebodysimulation

� Conflicts:
�	src/main/java/stl/threebodysimulation/UserManualFXMLController.java

Author: darkpositive

.idea/artifacts/threebodysimulation_jar.xml

@@ -1,2 +1,4 @@
 theme: jekyll-theme-cayman
+logo: /favicon.ico
 title: Three-Body Simulation
+show_downloads: true

_config.yml

@@ -59,6 +59,28 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.2.4</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <transformers>
+                                <!-- add Main-Class to manifest file -->
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                    <mainClass>stl.threebodysimulation.Launcher</mainClass>
+                                </transformer>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+                            </transformers>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -100,6 +122,7 @@
                 <artifactId>client-maven-plugin</artifactId>
                 <version>0.1.27-SNAPSHOT</version>
                 <configuration>
+                    <verbose>true</verbose>
                     <reflectionList>
 <!--                        Include every class that is imported or created here, in case they involve reflection.-->
                         <list>javafx.application.Platform</list>
@@ -198,7 +221,6 @@
                         <list>stl.threebodysimulation.SettingsPanelFXMLController</list>
                         <list>stl.threebodysimulation.SimulationSettings</list>
                         <list>stl.threebodysimulation.SimulationState</list>
-                        <list>stl.threebodysimulation.UserManualFXMLController</list>
                         <list>stl.threebodysimulation.LimitedTextFieldWrapper</list>
                         <list>stl.threebodysimulation.WarningWindowFXMLController</list>
                     </reflectionList>

pom.xml

@@ -204,8 +204,6 @@ void setup() {
         currentTime = 0;
         // Wrap the canvas.
         canvasWrapper = new CanvasWrapper(canvas, gridCanvas, trailCanvas);
-        // Set up the integrator that we will be using. The minimum step size is 10 ^ -20, so that the integrator will return errors at asymptotes.
-        integrator = new DormandPrince853Integrator(Math.pow(10, -10), 10000, 0.01, 0.0001);
     }
 
     /**
@@ -246,6 +244,9 @@ void runSimulation(SimulationSettings settings) {
         // Set up the particle differential equation according to the masses of each particle.
         particleDifferentialEquations = new ParticleDifferentialEquations(settings.getMass());
 
+        // Set up the integrator that we will be using. The minimum step size is 10 ^ -20, so that the integrator will return errors at asymptotes.
+        integrator = new DormandPrince853Integrator(Math.pow(10, -10), 10000, 0.01, 0.0001);
+
         // Flatten particles into the flattenedParticles array.
         flattenParticles();
 
@@ -254,12 +255,28 @@ void runSimulation(SimulationSettings settings) {
 
         // Get position, velocity, acceleration at current time.
         if (currentTime != 0) {
-            if (!tryToIntegrate(0, currentTime, flattenedParticles, true)) {
+            try {
+                // Get the position and velocity of particles at currentTime
+                integrator.integrate(particleDifferentialEquations, 0, flattenedParticles, currentTime, flattenedParticles);
+            } catch (NumberIsTooSmallException e) {
+                // Asymptote error (the integrator can't converge and gives up)
+                System.out.println(e.getMessage());
+                breakSimulationAfterUpdate(FilenameUnspecificMessage.ASYMPTOTE_ERROR);
+                return;
+            } catch (NumberIsTooLargeException e) {
+                // Double overflow error (inputs too large for double datatype to handle)
+                System.out.println(e.getMessage());
+                breakSimulationAfterUpdate(FilenameUnspecificMessage.OVERFLOW_ERROR);
+                return;
+            } catch (Exception e) {
+                // Other errors
+                System.out.println(e.getMessage());
+                breakSimulationAfterUpdate(FilenameUnspecificMessage.UNKNOWN_ERROR);
                 return;
             }
         }
 
-        double[][] scales = generateScale(flattenedParticles.clone(), settings);
+        double[][] scales = generateScale(integrator, flattenedParticles.clone(), settings);
 
         updateParticles();
 
@@ -289,99 +306,36 @@ void runSimulation(SimulationSettings settings) {
         }
     }
 
-    /**
-     * Attempts to integrate and find particle states at another time.
-     *
-     * @param time0 The current time.
-     * @param time The time to travel to.
-     * @param particles The particles involved.
-     * @param wantErrors Whether errors should be reported to the user (True if you want reports, false otherwise)
-     * @return True if the integration was successful, false otherwise.
-     */
-    @SuppressWarnings("BooleanMethodIsAlwaysInverted") // Inverted for clarity.
-    private boolean tryToIntegrate(double time0, double time, double[] particles, boolean wantErrors) {
-
-        final boolean[] successfulIntegration = {false};
-
-        Task<Void> integrationTask = new Task<>() {
-            @Override
-            protected Void call() {
-                try {
-                    integrator.integrate(particleDifferentialEquations, time0, particles, time, particles);
-                } catch (NumberIsTooSmallException e) {
-                    // Asymptote error catching
-                    e.printStackTrace();
-                    if (wantErrors) {
-                        Platform.runLater(() -> breakSimulationAfterUpdate(FilenameUnspecificMessage.ASYMPTOTE_ERROR));
-                    }
-                    return null;
-                } catch (NumberIsTooLargeException e) {
-                    // Double overflow error catching.
-                    e.printStackTrace();
-                    if (wantErrors) {
-                        Platform.runLater(() -> breakSimulationAfterUpdate(FilenameUnspecificMessage.OVERFLOW_ERROR));
-                    }
-                    return null;
-                } catch (Exception e) {
-                    // Other errors
-                    e.printStackTrace();
-                    if (wantErrors) {
-                        Platform.runLater(() -> breakSimulationAfterUpdate(FilenameUnspecificMessage.UNKNOWN_ERROR));
-                    }
-                    return null;
-                }
-                successfulIntegration[0] = true;
-                return null;
-            }
-        };
-
-
-        // Run the thread.
-        Thread simulationThread = new Thread(integrationTask);
-        simulationThread.setDaemon(true);
-        // For debugging purposes, an exception handler to terminal output is created.
-        simulationThread.setUncaughtExceptionHandler((t, e) -> System.out.println(e.getMessage()));
-
-        double deadline = System.currentTimeMillis() + 50; // half a second
-        simulationThread.start();
-        while ((!simulationThread.isInterrupted()) && simulationThread.isAlive()) {
-            if (System.currentTimeMillis() > deadline) {
-                simulationThread.interrupt();
-                if (wantErrors) {
-                    Platform.runLater(() -> breakSimulation(FilenameUnspecificMessage.ASYMPTOTE_ERROR));
-                }
-                return false;
-            }
-        }
-        return successfulIntegration[0];
-    }
-
     /**
      * Calculates the maximum and minimum x/y coordinates during the first ten seconds of simulation.
      *
+     * @param integrator The integrator used.
      * @param particles  The particles' initial states in flattened form.
      * @param settings   The settings of the simulation.
      * @return The four corners of the smallest possible rectangle that all three particles do not escape in the first 10 seconds of simulation.
      */
-    private double[][] generateScale(double[] particles, SimulationSettings settings) {
+    private double[][] generateScale(DormandPrince853Integrator integrator, double[] particles, SimulationSettings settings) {
         final int SIMULATION_LENGTH = 10;
         double simulationTime = currentTime;
 
         double[][] minsAndMaxs = minAndMaxPositions(particles);
 
         for (double time = simulationTime; time < SIMULATION_LENGTH * settings.getSpeed() + simulationTime; time += settings.getSpeed() / 5) {
-            if (!tryToIntegrate(time, time + settings.getSpeed() / 5, particles, false)) {
-                break;
-            }
-
-            double[][] currentMinsAndMaxs = minAndMaxPositions(particles);
-            for (int i = 0; i < 2; i++) {
-                if (currentMinsAndMaxs[0][i] < minsAndMaxs[0][i]) {
-                    minsAndMaxs[0][i] = currentMinsAndMaxs[0][i];
-                }
-                if (currentMinsAndMaxs[1][i] > minsAndMaxs[1][i]) {
-                    minsAndMaxs[1][i] = currentMinsAndMaxs[1][i];
+            try {
+                // Get the position and velocity of particles at currentTime
+                integrator.integrate(particleDifferentialEquations, time, particles, time + settings.getSpeed() / 5, particles);
+                double[][] currentMinsAndMaxs = minAndMaxPositions(particles);
+                for (int i = 0; i < 2; i++) {
+                    if (currentMinsAndMaxs[0][i] < minsAndMaxs[0][i]) {
+                        minsAndMaxs[0][i] = currentMinsAndMaxs[0][i];
+                    }
+                    if (currentMinsAndMaxs[1][i] > minsAndMaxs[1][i]) {
+                        minsAndMaxs[1][i] = currentMinsAndMaxs[1][i];
+                    }
                 }
+            } catch (Exception e) {
+                // All exceptions mean automatic break.
+                break;
             }
         }
 
@@ -513,7 +467,23 @@ private void startSimulation() {
             protected Void call() throws Exception {
                 while (state == SimulationState.ACTIVE) { // Break if the simulation becomes inactive or paused.
                     long taskTime = System.currentTimeMillis(); // Record current time (to sync framerate)
-                    if (!tryToIntegrate(currentTime, currentTime + (speed / MAX_FRAMERATE), flattenedParticles, true)) {
+                    try {
+                        // Store the state of the particles at the next frame.
+                        integrator.integrate(particleDifferentialEquations, currentTime, flattenedParticles, currentTime + (speed / MAX_FRAMERATE), flattenedParticles);
+                    } catch (NumberIsTooSmallException e) {
+                        // Asymptote error catching
+                        System.out.println(e.getMessage());
+                        Platform.runLater(() -> breakSimulationAfterUpdate(FilenameUnspecificMessage.ASYMPTOTE_ERROR));
+                        break;
+                    } catch (NumberIsTooLargeException e) {
+                        // Double overflow error catching.
+                        System.out.println(e.getMessage());
+                        Platform.runLater(() -> breakSimulationAfterUpdate(FilenameUnspecificMessage.OVERFLOW_ERROR));
+                        break;
+                    } catch (Exception e) {
+                        // Other errors
+                        System.out.println(e.getMessage());
+                        Platform.runLater(() -> breakSimulationAfterUpdate(FilenameUnspecificMessage.UNKNOWN_ERROR));
                         break;
                     }
 

splashscreen.bmp

@@ -78,8 +78,8 @@ class CanvasWrapper {
     /**
      * Constructs a basic CanvasWrapper object for a particular canvas UI element.
      *
-     * @param canvas The main canvas for particles.
-     * @param gridCanvas The canvas that manages gridlines.
+     * @param canvas      The main canvas for particles.
+     * @param gridCanvas  The canvas that manages gridlines.
      * @param trailCanvas The canvas that manages trails.
      */
     CanvasWrapper(Canvas canvas, Canvas gridCanvas, Canvas trailCanvas) {
@@ -129,6 +129,23 @@ private static double[][] calculateRectangle(double[][] originalRectangle, doubl
         return newRectangle;
     }
 
+    /**
+     * Calculates the first gridline based on a corner coordinate and a grid interval.
+     *
+     * @param base     The corner coordinate.
+     * @param interval The grid interval.
+     * @return The coordinate of the first gridline.
+     */
+    private static double calculateFirstGridline(double base, double interval) {
+        if (base < 0) { // Modulo works differently with positive and negative numbers in Java
+            return base + Math.abs(base % interval);
+        } else if (base > 0) {
+            return base + (interval - base % interval);
+        } else {
+            return 0;
+        }
+    }
+
     /**
      * Sets the graphics options and particles for the canvas.
      *
@@ -210,7 +227,7 @@ private void printVerticalGridlines(double interval) {
             double relativeCurrentGridline = returnRelativePosition(new double[]{currentGridline, 0})[0];
             gridGC.strokeLine(relativeCurrentGridline, -20, relativeCurrentGridline, 800);
             // Draw the label for the gridline, but only if it isn't too close to the left side of the canvas (to prevent overlap)
-            if (!(relativeCurrentGridline < 60)) {
+            if (!(relativeCurrentGridline < 100)) {
                 drawRotatedText(gridGC, String.format("%g", currentGridline), 270, relativeCurrentGridline - 10, 710);
             }
             currentGridline += interval;
@@ -234,23 +251,6 @@ private void drawRotatedText(GraphicsContext gc, String text, double angle, doub
         gc.restore(); // back to original state (before rotation)
     }
 
-    /**
-     * Calculates the first gridline based on a corner coordinate and a grid interval.
-     *
-     * @param base The corner coordinate.
-     * @param interval The grid interval.
-     * @return The coordinate of the first gridline.
-     */
-    private static double calculateFirstGridline(double base, double interval) {
-        if (base < 0) { // Modulo works differently with positive and negative numbers in Java
-            return base + Math.abs(base % interval);
-        } else if (base > 0) {
-            return base + (interval - base % interval);
-        } else {
-            return 0;
-        }
-    }
-
     /**
      * Prints the horizontal gridlines based on the calculated grid interval.
      *

src/main/java/stl/threebodysimulation/CanvasPanelFXMLController.java

@@ -89,4 +89,4 @@ public String getMessage() {
             return "An unknown error occurred during the simulation. Please let the developers know, and try your simulation again.";
         }
     }
-}
+}

src/main/java/stl/threebodysimulation/CanvasWrapper.java

@@ -12,6 +12,7 @@ public class Launcher {
      * @param args Terminal arguments.
      */
     public static void main(String[] args) {
+        System.setProperty("prism.allowhidpi", "false");
         Application.launch(MainApp.class, args);
     }
 }

src/main/java/stl/threebodysimulation/FilenameUnspecificMessage.java

@@ -9,8 +9,10 @@
 <?import javafx.scene.text.Font?>
 <StackPane xmlns:fx="http://javafx.com/fxml/1" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity"
            minWidth="-Infinity"
-           style="-fx-background-color: #F2F2F2; -fx-border-color: #C0C0C0 transparent transparent transparent;" stylesheets="@../styles/bootstrap3.css"
-           xmlns="http://javafx.com/javafx/10.0.2-internal" fx:controller="stl.threebodysimulation.CanvasPanelFXMLController">
+           style="-fx-background-color: #F2F2F2; -fx-border-color: #C0C0C0 transparent transparent transparent;"
+           stylesheets="@../styles/bootstrap3.css"
+           xmlns="http://javafx.com/javafx/10.0.2-internal"
+           fx:controller="stl.threebodysimulation.CanvasPanelFXMLController">
     <Canvas fx:id="gridCanvas" height="720.0" layoutX="11.0" layoutY="11.0" width="800.0"/>
     <Canvas fx:id="trailCanvas" height="720.0" layoutX="11.0" layoutY="11.0" width="800.0"/>
     <Canvas fx:id="canvas" height="720.0" width="800.0"/>

src/main/java/stl/threebodysimulation/Launcher.java

@@ -10,7 +10,8 @@
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
-<TitledPane xmlns:fx="http://javafx.com/fxml/1" fx:id="fileTitle" alignment="CENTER" expanded="false" maxHeight="-Infinity"
+<TitledPane xmlns:fx="http://javafx.com/fxml/1" fx:id="fileTitle" alignment="CENTER" expanded="false"
+            maxHeight="-Infinity"
             maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity"
             style="-fx-background-color: white;" stylesheets="@../styles/bootstrap3.css" text="untitled"
             xmlns="http://javafx.com/javafx/10.0.2-internal"