From 910e82b07dfa9adaeb6522318527e1a3ec9b3fc3 Mon Sep 17 00:00:00 2001 From: Christiaan Goossens Date: Sat, 17 Dec 2016 13:16:10 +0100 Subject: [PATCH] Finished up the v1 simulator --- simulator/.idea/workspace.xml | 448 +++++++++++------- .../src/com/verictas/pos/simulator/Main.java | 2 +- .../pos/simulator/SimulatorConfig.java | 24 +- 3 files changed, 308 insertions(+), 166 deletions(-) diff --git a/simulator/.idea/workspace.xml b/simulator/.idea/workspace.xml index 81cbe73..6906e95 100644 --- a/simulator/.idea/workspace.xml +++ b/simulator/.idea/workspace.xml @@ -7,7 +7,9 @@ - + + + @@ -19,6 +21,7 @@ + @@ -28,41 +31,84 @@ - - - - - - - - - - - - - - - - - - - - - - + + - + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -71,11 +117,9 @@ - - + + - - @@ -83,6 +127,16 @@ + + + + + + + + + + @@ -127,17 +181,18 @@ - @@ -155,7 +210,16 @@ - + + + + + + + + + + @@ -171,11 +235,15 @@ - - + + + + + + @@ -340,6 +410,25 @@ + + + @@ -419,6 +499,27 @@ + + + + + + + + @@ -493,6 +594,34 @@ + + + + + @@ -503,25 +632,6 @@ - - - - - + + - + - - + - - + - - + - - + + + - + + + @@ -620,14 +730,14 @@ - + - + @@ -635,14 +745,14 @@ - + - + @@ -650,7 +760,7 @@ - + @@ -671,21 +781,21 @@ - + - + - + @@ -693,7 +803,7 @@ - + @@ -714,21 +824,21 @@ - + - + - + @@ -736,7 +846,7 @@ - + @@ -757,21 +867,21 @@ - + - + - + @@ -779,7 +889,7 @@ - + @@ -800,21 +910,21 @@ - + - + - + @@ -836,7 +946,7 @@ - + @@ -851,7 +961,7 @@ - + @@ -860,47 +970,18 @@ - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + @@ -918,61 +999,104 @@ - + - - + + + - - - - - - - - - - - - - - - - - - - - - + - + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + diff --git a/simulator/src/com/verictas/pos/simulator/Main.java b/simulator/src/com/verictas/pos/simulator/Main.java index e484401..e887240 100644 --- a/simulator/src/com/verictas/pos/simulator/Main.java +++ b/simulator/src/com/verictas/pos/simulator/Main.java @@ -59,7 +59,7 @@ public class Main { * Object listing */ - Object[] objects = {sun, jupiter, object1, object2}; + Object[] objects = {sun, earth, moon, jupiter, mars, venus}; /** diff --git a/simulator/src/com/verictas/pos/simulator/SimulatorConfig.java b/simulator/src/com/verictas/pos/simulator/SimulatorConfig.java index fd050ca..ca0dde1 100644 --- a/simulator/src/com/verictas/pos/simulator/SimulatorConfig.java +++ b/simulator/src/com/verictas/pos/simulator/SimulatorConfig.java @@ -1,19 +1,37 @@ package com.verictas.pos.simulator; public class SimulatorConfig { + + /** + * (Example) Settings for the EARTH + * Rounds: 1051896 * (amount of years to run) + * Time: 30 + */ + + /** + * (Example) Settings for SEDNA + * Rounds: 184000000 (approx. 1 million years) + * Time: 172800 (2 days) + */ + + /** + * (Example) Settings for 2012 VP113 + * Rounds: 184000000 (approx. 1 million years) + * Time: 172800 (2 days) + */ /** * Time settings */ - public static int rounds = 3000000; // Amount of rounds to run the simulator for // 3000000 = 250.000 jaar - public static double time = 2592000; // Time steps in seconds // 259200 = 1 month + public static int rounds = 1051896*500; // Amount of rounds to run the simulator for // 3000000 = 250.000 jaar + public static double time = 30; // Time steps in seconds // 2592000 = 1 month /** * Object settings */ public static String sunName = "Sun"; // The name of the sun to calculate values TO - public static String[] objectNames = { "Sedna", "2012 VP113" }; // The name of the object(s) your want to calculate the values OF + public static String[] objectNames = { "Earth" }; // The name of the object(s) your want to calculate the values OF /** * Output preferences