From 13044b2a2543eb1d512abc2fe2e64dbd65df1f32 Mon Sep 17 00:00:00 2001
From: Christiaan Goossens <contact@verictas.nl>
Date: Tue, 1 Nov 2016 19:07:36 +0100
Subject: [PATCH] Changed the nodes algoritms and fixed the argument of
 periapsis calculation

---
 simulator/.idea/workspace.xml                 | 190 +++++++++---------
 .../com/verictas/pos/simulator/Main.class     | Bin 1407 -> 1867 bytes
 .../verictas/pos/simulator/Simulator.class    | Bin 3280 -> 3327 bytes
 .../pos/simulator/SimulatorConfig.class       | Bin 895 -> 811 bytes
 .../pos/simulator/mathUtils/AOP.class         | Bin 760 -> 875 bytes
 .../verictas/pos/simulator/mathUtils/AU.class | Bin 1011 -> 1084 bytes
 .../simulator/processor/ObjectProcessor.class | Bin 3948 -> 4933 bytes
 .../pos/simulator/processor/Processor.class   | Bin 7291 -> 7442 bytes
 .../src/com/verictas/pos/simulator/Main.java  |   9 +-
 .../com/verictas/pos/simulator/Simulator.java |   2 +-
 .../pos/simulator/SimulatorConfig.java        |  10 +-
 .../verictas/pos/simulator/mathUtils/AOP.java |   7 +-
 .../verictas/pos/simulator/mathUtils/AU.java  |   4 +
 .../simulator/processor/ObjectProcessor.java  | 108 ++++++----
 .../pos/simulator/processor/Processor.java    |  78 ++++---
 15 files changed, 226 insertions(+), 182 deletions(-)

diff --git a/simulator/.idea/workspace.xml b/simulator/.idea/workspace.xml
index 3961df1..dfeffe1 100644
--- a/simulator/.idea/workspace.xml
+++ b/simulator/.idea/workspace.xml
@@ -7,24 +7,14 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="17f368cb-44f8-4101-9a29-49a0f4ff1f92" name="Default" comment="Update workspace">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/com/verictas/pos/simulator/mathUtils/AOP.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/com/verictas/pos/simulator/processor/ObjectProcessor.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/com/verictas/pos/simulator/processor/ProcessingException.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/com/verictas/pos/simulator/processor/Processor.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/artifacts/simulator_jar/simulator.jar" afterPath="$PROJECT_DIR$/out/artifacts/simulator_jar/simulator.jar" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/simulator/com/verictas/pos/simulator/Main.class" afterPath="$PROJECT_DIR$/out/production/simulator/com/verictas/pos/simulator/Main.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/simulator/com/verictas/pos/simulator/Object.class" afterPath="$PROJECT_DIR$/out/production/simulator/com/verictas/pos/simulator/Object.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/simulator/com/verictas/pos/simulator/Simulator.class" afterPath="$PROJECT_DIR$/out/production/simulator/com/verictas/pos/simulator/Simulator.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/simulator/com/verictas/pos/simulator/SimulatorConfig.class" afterPath="$PROJECT_DIR$/out/production/simulator/com/verictas/pos/simulator/SimulatorConfig.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/simulator/com/verictas/pos/simulator/dataWriter/DataWriter.class" afterPath="$PROJECT_DIR$/out/production/simulator/com/verictas/pos/simulator/dataWriter/DataWriter.class" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/artifacts/simulator_jar/run.bat" afterPath="$PROJECT_DIR$/out/artifacts/simulator_jar/run.bat" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/verictas/pos/simulator/Main.java" afterPath="$PROJECT_DIR$/src/com/verictas/pos/simulator/Main.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/verictas/pos/simulator/Object.java" afterPath="$PROJECT_DIR$/src/com/verictas/pos/simulator/Object.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/verictas/pos/simulator/Simulator.java" afterPath="$PROJECT_DIR$/src/com/verictas/pos/simulator/Simulator.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/verictas/pos/simulator/SimulatorConfig.java" afterPath="$PROJECT_DIR$/src/com/verictas/pos/simulator/SimulatorConfig.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/verictas/pos/simulator/dataWriter/DataWriter.java" afterPath="$PROJECT_DIR$/src/com/verictas/pos/simulator/dataWriter/DataWriter.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/verictas/pos/simulator/mathUtils/AOP.java" afterPath="$PROJECT_DIR$/src/com/verictas/pos/simulator/mathUtils/AOP.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/verictas/pos/simulator/mathUtils/AU.java" afterPath="$PROJECT_DIR$/src/com/verictas/pos/simulator/mathUtils/AU.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/verictas/pos/simulator/processor/ObjectProcessor.java" afterPath="$PROJECT_DIR$/src/com/verictas/pos/simulator/processor/ObjectProcessor.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/verictas/pos/simulator/processor/Processor.java" afterPath="$PROJECT_DIR$/src/com/verictas/pos/simulator/processor/Processor.java" />
     </list>
     <ignored path="simulator.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -46,46 +36,51 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="SimulatorConfig.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/SimulatorConfig.java">
+      <file leaf-file-name="AOP.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/mathUtils/AOP.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="272">
-              <caret line="16" column="0" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
+            <state relative-caret-position="204">
+              <caret line="12" column="52" selection-start-line="12" selection-start-column="52" selection-end-line="12" selection-end-column="52" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="ObjectProcessor.java" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/processor/ObjectProcessor.java">
+      <file leaf-file-name="Simulator.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/Simulator.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-105">
-              <caret line="78" column="41" selection-start-line="78" selection-start-column="41" selection-end-line="78" selection-end-column="41" />
+            <state relative-caret-position="-3">
+              <caret line="62" column="0" selection-start-line="62" selection-start-column="0" selection-end-line="62" selection-end-column="0" />
               <folding>
                 <element signature="imports" expanded="true" />
-                <element signature="method#processAphelionAndPerihelion#0;class#ObjectProcessor#0" expanded="false" />
-                <element signature="method#processRoundCheck#0;class#ObjectProcessor#0" expanded="false" />
-                <element signature="method#reset#0;class#ObjectProcessor#0" expanded="false" />
+                <element signature="method#accelerate#0;class#Simulator#0" expanded="false" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Main.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/Main.java">
+      <file leaf-file-name="ObjectProcessor.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/processor/ObjectProcessor.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="731">
-              <caret line="45" column="37" selection-start-line="45" selection-start-column="37" selection-end-line="45" selection-end-column="37" />
-              <folding />
+            <state relative-caret-position="-479">
+              <caret line="9" column="31" selection-start-line="9" selection-start-column="31" selection-end-line="9" selection-end-column="31" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#processAphelionAndPerihelion#0;class#ObjectProcessor#0" expanded="false" />
+                <element signature="method#calculateTops#0;class#ObjectProcessor#0" expanded="false" />
+                <element signature="method#processNodes#0;class#ObjectProcessor#0" expanded="false" />
+                <element signature="method#processRoundCheck#0;class#ObjectProcessor#0" expanded="false" />
+                <element signature="method#reset#0;class#ObjectProcessor#0" expanded="false" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Processor.java" pinned="false" current-in-tab="false">
+      <file leaf-file-name="Processor.java" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/processor/Processor.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1972">
-              <caret line="123" column="13" selection-start-line="123" selection-start-column="13" selection-end-line="123" selection-end-column="13" />
+            <state relative-caret-position="425">
+              <caret line="102" column="64" selection-start-line="102" selection-start-column="64" selection-end-line="102" selection-end-column="64" />
               <folding>
                 <element signature="imports" expanded="true" />
                 <element signature="method#objectArrayToHashMap#0;class#Processor#0" expanded="false" />
@@ -95,19 +90,6 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="DataWriter.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/dataWriter/DataWriter.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2006">
-              <caret line="145" column="35" selection-start-line="145" selection-start-column="35" selection-end-line="145" selection-end-column="35" />
-              <folding>
-                <element signature="method#write#0;class#DataWriter#0" expanded="false" />
-                <element signature="method#save#0;class#DataWriter#0" expanded="false" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -147,14 +129,14 @@
         <option value="$PROJECT_DIR$/src/com/verictas/pos/simulator/Processor.java" />
         <option value="$PROJECT_DIR$/src/com/verictas/pos/simulator/processor/ProcessingException.java" />
         <option value="$PROJECT_DIR$/src/com/verictas/pos/simulator/Object.java" />
-        <option value="$PROJECT_DIR$/src/com/verictas/pos/simulator/Simulator.java" />
-        <option value="$PROJECT_DIR$/src/com/verictas/pos/simulator/mathUtils/AU.java" />
-        <option value="$PROJECT_DIR$/src/com/verictas/pos/simulator/mathUtils/AOP.java" />
         <option value="$PROJECT_DIR$/src/com/verictas/pos/simulator/dataWriter/DataWriter.java" />
+        <option value="$PROJECT_DIR$/src/com/verictas/pos/simulator/mathUtils/AU.java" />
+        <option value="$PROJECT_DIR$/src/com/verictas/pos/simulator/Simulator.java" />
         <option value="$PROJECT_DIR$/src/com/verictas/pos/simulator/processor/ObjectProcessor.java" />
+        <option value="$PROJECT_DIR$/src/com/verictas/pos/simulator/SimulatorConfig.java" />
         <option value="$PROJECT_DIR$/src/com/verictas/pos/simulator/Main.java" />
+        <option value="$PROJECT_DIR$/src/com/verictas/pos/simulator/mathUtils/AOP.java" />
         <option value="$PROJECT_DIR$/src/com/verictas/pos/simulator/processor/Processor.java" />
-        <option value="$PROJECT_DIR$/src/com/verictas/pos/simulator/SimulatorConfig.java" />
       </list>
     </option>
   </component>
@@ -205,6 +187,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scratches" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -295,13 +278,12 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="dataWriter" />
+              <option name="myItemId" value="mathUtils" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
         </subPane>
       </pane>
-      <pane id="Scratches" />
       <pane id="Scope" />
       <pane id="PackagesPane" />
     </panes>
@@ -611,29 +593,29 @@
     <layout>
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.2653277" sideWeight="0.49375" order="10" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3245243" sideWeight="0.415625" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.30866808" sideWeight="0.42083332" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.30866808" sideWeight="0.57916665" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.17864583" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32980973" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39852008" sideWeight="0.49791667" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39852008" sideWeight="0.49791667" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.2653277" sideWeight="0.49791667" order="10" side_tool="false" content_ui="tabs" />
       <window_info id="Documentation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="FLOATING" visible="false" show_stripe_button="true" weight="0.48125" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" x="1312" y="663" width="586" height="345" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3245243" sideWeight="0.584375" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32980973" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
   <component name="Vcs.Log.UiProperties">
@@ -653,7 +635,7 @@
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="31" />
+      <option name="time" value="36" />
     </breakpoint-manager>
     <watches-manager />
   </component>
@@ -662,7 +644,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/nBabel.java" />
     <entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/mathUtils/Vector3dMatrix.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="2442">
@@ -966,23 +947,24 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/mathUtils/AU.java">
+    <entry file="jar://$PROJECT_DIR$/vecmath-1.5.2.jar!/javax/vecmath/Tuple3d.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-116">
-          <caret line="7" column="7" selection-start-line="7" selection-start-column="7" selection-end-line="7" selection-end-column="7" />
+        <state relative-caret-position="205">
+          <caret line="31" column="0" selection-start-line="31" selection-start-column="0" selection-end-line="31" selection-end-column="0" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/mathUtils/AOP.java">
+    <entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/ObjectStore.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="170">
-          <caret line="10" column="47" selection-start-line="10" selection-start-column="47" selection-end-line="10" selection-end-column="47" />
+        <state relative-caret-position="85">
+          <caret line="5" column="24" selection-start-line="5" selection-start-column="24" selection-end-line="5" selection-end-column="24" />
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/Object.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="71">
+        <state relative-caret-position="164">
           <caret line="146" column="7" selection-start-line="146" selection-start-column="7" selection-end-line="146" selection-end-column="7" />
           <folding>
             <element signature="imports" expanded="true" />
@@ -1002,76 +984,90 @@
         </state>
       </provider>
     </entry>
-    <entry file="jar://$PROJECT_DIR$/vecmath-1.5.2.jar!/javax/vecmath/Tuple3d.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="205">
-          <caret line="31" column="0" selection-start-line="31" selection-start-column="0" selection-end-line="31" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/Simulator.java">
+    <entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/dataWriter/DataWriter.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="527">
-          <caret line="45" column="20" selection-start-line="45" selection-start-column="20" selection-end-line="45" selection-end-column="21" />
+        <state relative-caret-position="577">
+          <caret line="145" column="35" selection-start-line="145" selection-start-column="35" selection-end-line="145" selection-end-column="35" />
           <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#accelerate#0;class#Simulator#0" expanded="false" />
+            <element signature="method#write#0;class#DataWriter#0" expanded="false" />
+            <element signature="method#save#0;class#DataWriter#0" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/dataWriter/DataWriter.java">
+    <entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/mathUtils/AU.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2006">
-          <caret line="145" column="35" selection-start-line="145" selection-start-column="35" selection-end-line="145" selection-end-column="35" />
+        <state relative-caret-position="408">
+          <caret line="52" column="41" selection-start-line="52" selection-start-column="25" selection-end-line="52" selection-end-column="41" />
           <folding>
-            <element signature="method#write#0;class#DataWriter#0" expanded="false" />
-            <element signature="method#save#0;class#DataWriter#0" expanded="false" />
+            <element signature="e#1368#1369#0" expanded="true" />
+            <element signature="e#1412#1413#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/Main.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="731">
-          <caret line="45" column="37" selection-start-line="45" selection-start-column="37" selection-end-line="45" selection-end-column="37" />
+        <state relative-caret-position="272">
+          <caret line="39" column="94" selection-start-line="39" selection-start-column="94" selection-end-line="39" selection-end-column="94" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/processor/Processor.java">
+    <entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/SimulatorConfig.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1972">
-          <caret line="123" column="13" selection-start-line="123" selection-start-column="13" selection-end-line="123" selection-end-column="13" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#objectArrayToHashMap#0;class#Processor#0" expanded="false" />
-            <element signature="method#close#0;class#Processor#0" expanded="false" />
-          </folding>
+        <state relative-caret-position="102">
+          <caret line="6" column="0" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/SimulatorConfig.java">
+    <entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/mathUtils/AOP.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="272">
-          <caret line="16" column="0" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
+        <state relative-caret-position="204">
+          <caret line="12" column="52" selection-start-line="12" selection-start-column="52" selection-end-line="12" selection-end-column="52" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/processor/ObjectProcessor.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-105">
-          <caret line="78" column="41" selection-start-line="78" selection-start-column="41" selection-end-line="78" selection-end-column="41" />
+        <state relative-caret-position="-479">
+          <caret line="9" column="31" selection-start-line="9" selection-start-column="31" selection-end-line="9" selection-end-column="31" />
           <folding>
             <element signature="imports" expanded="true" />
             <element signature="method#processAphelionAndPerihelion#0;class#ObjectProcessor#0" expanded="false" />
+            <element signature="method#calculateTops#0;class#ObjectProcessor#0" expanded="false" />
+            <element signature="method#processNodes#0;class#ObjectProcessor#0" expanded="false" />
             <element signature="method#processRoundCheck#0;class#ObjectProcessor#0" expanded="false" />
             <element signature="method#reset#0;class#ObjectProcessor#0" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/Simulator.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-3">
+          <caret line="62" column="0" selection-start-line="62" selection-start-column="0" selection-end-line="62" selection-end-column="0" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#accelerate#0;class#Simulator#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/processor/Processor.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="425">
+          <caret line="102" column="64" selection-start-line="102" selection-start-column="64" selection-end-line="102" selection-end-column="64" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#objectArrayToHashMap#0;class#Processor#0" expanded="false" />
+            <element signature="method#close#0;class#Processor#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/simulator/out/production/simulator/com/verictas/pos/simulator/Main.class b/simulator/out/production/simulator/com/verictas/pos/simulator/Main.class
index 1d09e0391c136319d419df8c18d8c188df2bc6e1..38f42f4590b211686170e170285bbb447dc47ea8 100644
GIT binary patch
delta 875
zcmYk3SxggA6o&shw0CMPX!L>>9uz`w!6h!Z5W)yj4I&{>tkxi*)z(t6U>8vq5mDLE
zQb3H+xW*VYVvK=6?2xD-YJ4z0XpC<z7%(I*!GP<fjp96<^WSsN_s^U&ztvB|q96b2
z^#fRm4mEb6TttNmm2|^e?Ut!&ai>Ha@<z{DQl-XWRMX@e!(Y3u)oN+->yMF11NQ~$
z&qqelQ^&N4`y*-ys8Qjl*O5YwdAp=46^>I~XPx=VNQa5`vo8Dm(ejy88Y|UU$A7j^
zsc$$mc0sP1%I3Gj1IvA9s9X{L`NfX!gH#G91-13pM^vb#x=Pcf>#aMRX@BS~^Sirt
zC+&}EOWpVCS_74yKN|Y*Fg}G!u5XPmBd#`6*);2mxyH4Z%CVPo$~%YJ*Q-!Rb<?8;
zu09wgRDS>LqQ!MKi^@0Cg)sm5d@5bOWs|GVFQ<|bWpz#8cu!kzO43-t4=S%7?Ohx>
z@>`91G>B*v(c~R}Gu!SdDRf($1k`16dz=me<$jC9<MO>Co2dm>f@t3bA<FkFg!(dt
z=nM;*MYL#e0w*=_P6P{DIixc=-8KSMuFWzxv$&Z1h@1Xd>;GCCCagvHG-yNnopVAF
z$=k_))Wjoza4Rd1yZLD;&xB{?!fue;fomI&G*A>#$h9We06X^Z(-ah8FRyTz3?d9F
zp11m}iqlnn5R5Yt7*_Rx8X49wBr+s*BeVx$!BR5AI)>ChDZCpIiHZP|#-Ix}Y-C7h
z$oQYhWXNL3o@A5(M$eENWDE@37`As;{r93ghJ1#CNr<ZM@vjSs*Bcd!^hV`ky^(4a
zdZVaS>Jvq+*aP$A>~VZXAPy@qkFRMyPGbR{Vj&@jCka?avay;NuqLpZoZ$R$pg4y^
zD@ZI#u#d0DicfHIC2-si7gr(NqycWO6x_-H4_8WV7=!&>QIgG<UWx+{Ien0O2`Kvm
Dfad1;

delta 419
zcmYL_NiRcD6vuz}weP)p8kUqry$xchMGY-g^H_6DH4o8rA#EboEUlZj5FbHUR4j-@
zBe9SW-@wk2r8Q1#;V#bbAI`b=zLfn~_Vf2$9%yCPqJx;pgojCEIP6;}9jrYynabM!
zz_i5-vqtpt<12T5;xnRepH-2kN6pA@5ZixEmlyas3yrvk`E0sREo5^&r51}UnJk+m
zoCo#p<h3y)L|9=v8O?SAE;|@v#bnjX8tYy*3L(U%LLb^bI7}%#^Qpa>$xJ3~vgKu)
z9fe=K)z`PKDYe!vH!d6vCAP4{PU%`CE6IAp4eF{$cS$sgph-k(@1KBfqSBSnL$4rW
zRuz<?3wGt~=x4{qJzB!m7*DvH;t9Pu-s$$aZ)y7<S|wwlmLPQ`sppIU7xI}o+KP)>
o|Ax^=zvzM-F~Fd#N)ls8Doq@f3`^w_pTP*DxP>1RwY+Nl7ylthlK=n!

diff --git a/simulator/out/production/simulator/com/verictas/pos/simulator/Simulator.class b/simulator/out/production/simulator/com/verictas/pos/simulator/Simulator.class
index d4aa1bfe9c2cf53d7532a32d7ca66b6708f8ee63..10d69852128c3dddad4484006ef07b12d0cb650b 100644
GIT binary patch
delta 319
zcmW-bJ4=Fb6vlu5dcD2A5e^a}LWw~^IYe|Z)3OUR<YHRUQZzRNE$!_Nf1;~p*@c!!
z1cwSgfRkT92pa;CAU{BMXgWWh^E~G{HDAYPR)1eBz&H;@^W88`EKYURSXO7+V@uf2
z2`eVFNBMPsmtSXXf#8M3B{_>Lt}XK1Slps53fx)TlT(Dm9xAnMFG>yRxEkzU8P1gQ
zj$`FYVaJrRwvM?XYF{6^c6z){W4lb>kyAZ(vij4Nbl3SHK#)339W~RV1;RYB$}>sI
zq<CXZcAMf#(;&l_aFcafZ1AHi=D^kgQ%vGygd)>Ka7ZS|3{lY<*q9|ITI-+ULh=!F
k%*!<RCLviR&L#^i(uG&rmLzM)jhc?Q$5d}=&%LYu0NiR#;{X5v

delta 305
zcmW-b%Su9F6otQE&QZ@f|HL3dL@04s4x+2w?J~;-WfvMnBZ;7gXx`u-bhGTD1VK<8
zD2V6*q@bw~P6Cm@20cKwX|zAqUTd%2ioQqP%J0()&`0^seYUKA&AzEvbLzlE>`d^G
zlw!a{RLpb+VrI{dCyq476f`HCYKoj`&M}$`E;S_zilo?+{*QgD{I`%%&H_PPsrWW|
zC#|+k$=Pro=-3UbtClfsZq}>vL7W6t>SoK$^%O}_W}a)Z+_T6dOR`%NSB@IXd<xfD
zp}{Im({#JmcNk)jFx}iROq!5n5{xh^S`C{q#zkxV(}a+G!z5EOExyP|R*AFDG&2Nf
Vm$q5ST5{vn<h@?y`2}xN{Q;S<O8Ec)

diff --git a/simulator/out/production/simulator/com/verictas/pos/simulator/SimulatorConfig.class b/simulator/out/production/simulator/com/verictas/pos/simulator/SimulatorConfig.class
index c391a91963ba2046accd2cb29d252ee785a6f23b..2b2f31fcb5412b0d23f981bfa542ae7612f211dd 100644
GIT binary patch
delta 427
zcmXAkO)mpc6o#Lf>3p;uIvrJQX-j=8TGZE$2umRo5ethZk|I(`Q?`CX(?4KuC9{)Y
zEB=FpKZ0||UA*r(H|IX*y}#Czb^7`9@&+{6PT;d(aCGnyCr#DbIh1=js#|neQod|c
zbEvCw#bH(Xnv#Z+btM}%n>Jg$+w<Pn_whIrE<<EohRJFe!Cl*Bgq((V-MnwsZkp{@
zE$DWx+AR%pzuD<ty5uQn=({H_qvTx1)bpZ}66Jng-wV=`6dXw==qRDkBNue!f{0uI
zkqaYo!9*@3aUBgwC|c>i>)D4%xwE7LgDFurs!gVuk<MZEe^%-XVxmy@^$;UNEX4Bd
z5GVFZ{LJtZK}gbfLk5hH!L<1pl9CzkS>9-<Jr&_8rYXNjlET9)$XAQ9q9hB;R3)0m
JoDAvA{{bS0E^Yt-

delta 520
zcmX|;OHWfl7>1weIXyjXMq3W0pjar%rB*J2c)=^x6$@9$f<2cm2qlni*z`9LR`3^$
z3z!9o2_|m&32sgN8R|P@;#s`Ud^7XC^Uj>l$)BWu^ZV;JV43$NhFOf-KPr_XHI}?Q
zNm=%MTHsmAb3c5MeDCcX6wl7ieYKLTZmL_KuU@9S@_g;(O+>TN^`p05-W6Ca&^9E8
z-QNDzk-@AP;*;HvWpivO9e?T^ZXb2Jds`=$KSyS0T1L2Ixyz^_TJP;!?omJeV(Qal
zj9VIvS|<EruDxNoPu=psH%xk&V*2!#`OvTFPEb-hnT3?{3zS))%mU>XD9b<@2Ff!~
zwt;dMa~PCS`cTz^XvBQ$3Ud*bThfHSpN)7Vwf}Z7%bco|`TyNLV$HxxmUBd9N1Wvy
zNqkLVGs@C+N3lxDVXNG7l(ULsAaZ2cpraZ)hWv>Je_~5l_2zk9xJa3)+f?*|HNDob
Va@Un)OlimUyBlg*(B>SE{{n>CI*0%O

diff --git a/simulator/out/production/simulator/com/verictas/pos/simulator/mathUtils/AOP.class b/simulator/out/production/simulator/com/verictas/pos/simulator/mathUtils/AOP.class
index 23f5afc9cbfa832f465350ea084e98ca4b7081f7..6cf3c0d3c4e65c50350a2c0a6bce29c10b749d10 100644
GIT binary patch
delta 421
zcmXX?%T5A85UkmS-DMe8QB)8S0fl8@;NrofCd3<R0tY>gWP=YPhM-r!!R*1Czd%R~
zB%1gE{)#_fqA~V>lT3AWPgiwkzQUiz-pB9jJAhr(Y(%kXB5Om#mV%suyn=#>ZDT)`
z`))Tx(!`F5;<%J$wODH?JJ(Hl+m`1&pR^2itA97>_=lH0pTRmfKB-;Fd&$8O3nWVy
zIZ7NZ${Zdl990MgN43;@@}^sF%Hair``CAb7j_yAb^YNPgYK3afvuGv)Q;+CV9Jru
zp{!1kQ4D)iu<`79fzX&2u}GZ%^Ej3$i(nZEswi;)3n7Z)4ceLGI8*3HqEek8RGE+?
z-KS?nJTZYW8YE!NSa(DU9cs!d!h~wEDB`qIhFl9YQ%&{e&RC%?bp+OksZ|A%#5B_6
Wks_vJovIetkNWI1^=weCA@c`d!8f-6

delta 312
zcmXX=PfG$p9DOtE?z-bRmDO&UX<49bS(gr7yLha?OI-vBi9!&9y4F{a{UG5*p`Z`Y
zR|z_I65lVK!}~Y9H}ezx`Hk<{#}|Mz92$h!3bAdVQ5M({sD#)JQ5~PxRMm8b&rf&#
z_QRmBkiWRPK6&iD^epm-6ymI_<C2(~#UA!8>Nrqnj^3Ktue!-Py73zD2{{_<BO)5Q
zQ?era=@e@Ge_bF3ix8IDE_D%(F2V{{nMnDbLpgHt34QCFo5H(n9UV`QOIs88@4V8G
nIR~#zGBgFOaZz^DMVG!r#}%wo$!8L5P)XHdlgeWnGuKGwk{=((

diff --git a/simulator/out/production/simulator/com/verictas/pos/simulator/mathUtils/AU.class b/simulator/out/production/simulator/com/verictas/pos/simulator/mathUtils/AU.class
index bf3890f44de7944d8e653436e0f018142a8ea4cd..45881e85ff368beb484b915f93a54062f5b7eb49 100644
GIT binary patch
delta 178
zcmey&zK28g)W2Q(7#J8#7<9Q91Q=A<8C1C#m>AU992Z`VjZI5S1M$=+s;aSQurp|G
z^cP~}WYKWZbYWy*beSB_7{;c>!=TNeGkG^-DI?ovL#B8}dpQPq21W*9prHl~EI{21
z3~Xv54BXl4fh;Bl5fC3J&%j{DAPOXTz-%@KDFy`~kCQ=h@<e81PJ1BB3Fsb|$%V|a
NoQw=gKshD`WdIS286f}w

delta 110
zcmdnP@tIxq)W2Q(7#J8#7__+<1Q?Xq8I-vgm>5*p92Z`VjZI5S1MyTRs;aT5u`{S|
z^cP~BoWmHxroqFY$)Gj)7-K0T>t-9Kct%F~$qvkNlYcOaa#}NRGS~sla+s{ZEX&Er
Lpa3+Ui9rznfVma(

diff --git a/simulator/out/production/simulator/com/verictas/pos/simulator/processor/ObjectProcessor.class b/simulator/out/production/simulator/com/verictas/pos/simulator/processor/ObjectProcessor.class
index edf9fa31e0c2dd68ba4272f0e9632c548c4a800b..b7d618aef93a982a492f29551e5c042ab04ec7a5 100644
GIT binary patch
literal 4933
zcmb7I`+pSG760DsV>X*fLJ~*<23ZP$usjw61xg?#29cB`1cI@Mij&PGS=j7u_d$Vb
z)mrL{Dr#FERcx`9KB!hp76IQaXi;nJ`|(foxAxOoKK-7V+3apeQcXTN_s+fNo_p>&
z-}AjQxpMWw>i|~b?|ys^2fc6ngHQY^#TtA?#N8t95%E<G_xj<(L3y}O#Qh?^CgK4<
z=Hcra4wd2?cu>ScqWZ9(y+{10#G|5hSj0C)JSO6CnK<IzU~On``Gl-`vJ6k*TV?n*
zz9ZtOhT~<JixV2YEA7)7hGn~FME9f^dbSkb!}m3u@*{|YK0GJw4@CUXhv%g|?Z=Ps
zW6}MI4?h*J&iL>%@$&^AUexe&4KFG9jKr`Rjl^RL^__c+ea8OKJ~KRGq=!R&W;h*B
zt{7-h@F&b<B&Rnmw`5}^l{R8wQ$cN1sLt!;C;aK*NNQ{U9-2~^*BOqF(0noyP8+FE
zBAyDRA|sio!EHje68EZ1nuBK2q}|-QY1}56j>Lv~;;Bg5^0g{zq|&`IoZqXi-yDo5
z&CY9Q%8gXmj1AC2cYJ{ERt%WM17${kDjv<G%`RiVLjEbju=vOPxlKXiap>&<g&Heb
zp-egw4Q)13!(B##&X@K^hGIrKljJUK*J`Y@hoVMoDAW;4n?q)@W!Ge3Z>2r&x=1XN
zZdGtKE$UNnw_E;Kc1B`mcV?vDOztrHqui^yGafdgeMT}O&(5G*g0HY@s<0=L@vxan
zjU}Kb_sq>}Ql=f_qR?O0G?~NVp^sU0a#YUcb_zEdX+vQ_(^QT)`4=1BxC5A4TG(EU
z2HRAH<M!rUHr!1eveJ``XJP}yV~0Y6qtoU9ye&4+Q-I>KR3?_kPC2m@-pd?1p(|%J
z!-7n6M?Aq8>W(qN4<DW67v+(-VdW4UZONoTfXtjUvGmi7r3FNuo9tHah{eogJ3*Zi
z^D_#NL!ahbT1-f7ah4Axa+z+QXu+ohn}(OkIwTy0D(AG@C7SKSW_Yg!K;pmLD#d)<
z^ubItx;>sY?6Oo;@gz;Ajdjx-&m_a<rikEkx}Dyh9J-bX)#%uY9v$n^s^jw_Hj20j
zgnO0D7ZsO|E$GzIjusso(5B-?5x>A$hGk;j(lDyyi=v+uaSpHOIFAcDF5*=kYh`Sm
zh|MB8M7$;wUl1o=#~T{n)bSSHW?Xdq5-A<O!X*utnf<(TW7*O14ld>VF2se7cX3I_
zuW?1kdw5^R&1li^fsWtcLxnoal%?OBPO{E!%tWFCW>TT4qkGfVwQB>LBnJT_kf*Fb
zj35jc>3{|HfR5kdBN4wNvB_|*0@rft_xOW`KkE1s{;XpYh@pk!?2b|6HD=G_FSO{W
z+xer#zv6ESje%h!6&NwZkAOgczStND2r=89EmK%I1>rjwyOwzrrsbnz?@NNq$GjtL
zCgsW?8}Bos8FT9(A;9{#YoIXpJnq~nJjmJhq!Ok{)^H^<#O)fJ-$IrlTcxGIv@=q;
zn=?cL7%~g)qxGMN?<~_3Ub^0>85>FuTcyYQ)lK6pFP}vny;5OSO^z4VCBz|~w>%#w
zOUD-(i&kxsdM=7wqcNG?=6+gq$E;?0PO~ruMYf51@-#i#Vv@#u?DR=0*p0+;U0zwF
zVHf8t?jN7imI*^xkow*OskAvl3vo${!-<i2sE2jJdnsueBXr(tBoe&a6_ys}%`T>*
zEsE-k3ybt8$m)1~Upj6Nk<E(Y<Ls5=g<=mG-GulX<(tHei9F=3)jau)IypMrF=NEK
z`15gf9O3)o8ot<qZ<<PIjy)wzXSF0-t0muBEveLM$);9IezjUsvDK1|t(M$jwPY`=
zC23kMdDCjinpR7a=5Af=m!KPd_Q~;-+c>fZF7|*W!E;c-=_nb6+ipB|<Fy+tcoDvx
z=TJHd|4Wvo?Ub|NrS!p#GXCnQ=I>0@Ab{EE<&19I#tz)VCxt%T>g?M}UrIRU4K5x<
zS>B@G8V$h1h>3+-Tg$OPeYrhoLt!Uwo5+?v-qw8DYMjK@E=E{v-9E9c^6|EsXlv2`
zv2_RTbo{!5-pUypgJ<Et?iEycUPI+h7oYUAnAW?~ZTG5rv#7px{8q~`A2$?i)i@S{
zM(oC2mfOZy8b4wRT->T(O!BWhi<&H^Z)Vrcq#iv1UvQzM_AERF&z^;%aP%Z<g6xP_
zqnKeS%7o|G(}feYGT{+FU6ABAGrhoSLV7)c(26+>W{|G{Azs{TcxAWq?O-zjw~cVS
zot_$8l}~BEbDm0$^>ejCnAS?+{upyymG$);7#KU=MIKL3YSOE^cTkb{wvHq9MI-gj
zNwSzJ+H82faVzAc_Iy1X9<yM+K7Yam^aq57hFt{qorLyoW~HBn9Oiq`AR#zJCnMIW
zY^a;gspKqPxT~w?%%S6E?jR+71dxZ7a70cZdpj<Mr(;%p6b*dzXEFOcu2<+>d>(TY
zjw_R$fWn)Y+qL98J|n$(-R#YmUgKIxs()z~3*2`RV_7V`td`GoyP9q54Lsf9@fut<
zHqYopIp0um>=~>G%ED1Jy^KW{5oEnDu3nPGQd(bD9b(6}yDW?4S=?|M?>hR;1^O$d
z&_7n-7x#U5D!=G=WV~OWbf4v)?i^Q-NzUCCs=G;FKpb^Q65A<aI!*fA$IS1?V>pPT
zxEs&n9==-MhYxW-{)q?F0vu8yJg8RVA+;Nisv#U!hjBzbjwdW^1ZlfXZJ~`p)=sC|
zK->&-Y_+<D=!ptRs3Q(?M!36R$)1aGPOx-6ydPt}hWJ&S(vZ;bB@K<C|6u4}Sn_Y`
zD0-Ws+(t`_XxYs*rx-oqg0d`D3KzIq`JhSlA4ea%Uc0+RM&*$SX_m5=&LVefK}tW%
zlyZVqvx>dy)f6@Y1jXJ_E+;d1*>|kh$Z!G8j7>Q-q|H7KkNb@44863uq?IfJ#<mj2
zP=%9N$p56Q!zuE@bF8=Lc}<;WPF}zvyog6I%74dXae`kCCvkzAuUb(KSPXb-j8~pw
z=7d+On1u{8=&~YN2G4)d?^61#N)IQ$oGVRkVBdsYQ{I9~2$G^!M6-ydf}2sE>qOMs
zMj8ZHB^It$p`87<$R%&1g5NGP`03JsOT6YTV*$~$nBOGJ`AO1(EBuyvkDpxc6L%jJ
aa7&kSvJxUutRBE#wsM`%Wz_a~OaBK%th5dQ

literal 3948
zcma)9>sMS?75^QWVTR$7fe9fgO~@p%fgueeNo?9YPy(SzOMpT^^RV^KaA7XY%$>~K
zNt4)GAFYpA`_`0LV;gN7HGLsWx^yl5?l=Dhm*4fHF00GmzV{9@kbtrld!NTX`|SPO
zk8|fw|M}e?035)_A;fX6?vH=xjDPj$#(5!M74oEzr-Xb>h%O`{Bq?Mn1Ow9{%pg_I
zktu7lLgr*GU5^a1Ay~-C=z@@Z5QPwI6zg#jPX}-*gf^TD;<E57a`fvVJcDOt`i&r-
z6SdzA;#)HRb_n0W^Fh2IV&4tod&0jT#1F)Zt3muQh!+F+Q2;L~1od3XNSjtxVaw30
zeo?;^zi1>gx}Azo8cEyA@1HuX5Xu>Ovn<zCJ~ChyY(1Ma6x4u1q#{$<2-zvKFp`+1
zDurD`Nh?G3c{6G2g?P>?#0zGonAUks+!f+o;k+?z<PGXApKIbZdE3m+j9LZLc5H1<
z>jisUmMeE{P8icx-Wa-jr%^8?jqDUP3|mt)cf*via-s1`-zBq9QPrHIl2vN~xsnzr
z)EzOirroPh+Zmfw@bx=N!$W4)7%pZKM*g&(Nb{P=kd@TalX~8ixwq&OL=+xc4~tyh
zN*aa2GAg6xIpNt@FkHu1;BkNFTEP<wgM``xu93%GTnBVpSJ>UTo*`aPL`R+FMX{9{
z##V;NRkhVKyU)w0zU<U!RoXNZirEUnjSOCL?v$SMV9~t85+K6U>`lk4Vs@%OWhCbu
zw9hIuI>}H`q)ivo=`qXJ-NaB7@#hWN$gCZ=iut55Xi6|zTwj)<?3QHL(1&9h_Tzwt
zF9<m#<gk!lAzu{o2zoR;go7F$#=!ty*6<2m4d68muj363kIDAuh3pgZW4sZ-Pc&S^
zfdJmrFpujRekyw2!p{_H`X&Onq2cFvJAijI+{7;wHj6Fsw4R-bkK1_$_E^zOPZ@cI
z2Tu+UjvP7^9TXg*dNfOTqEDO5p={Jn8T_ZODJ#uAJF4NAcvr)h&=bIW8s5h(S@{)x
zk9JbNZz2|DfkfRvQu^0oklLZ)H@F?Z2O2)aM@%qBII~Lj2znGcJ!=LGn+0u5x#sAF
zL(#tR{^P>~Cx;)64v!2Rr^=%uA6rv?;P~nTuizF7(>vhCDyr~6G^H1!8J%A1QHgXk
z?}a)l<;WRv=~g(fPG|8_>F#P$XsQ73Ua7ES9ZhAKh8d%(?;QQVN@%V6RA{|-+hxh6
zjqHq_ax$L{*2i0!-CgS#I9_h2{Z@9`oMCjY5Y&p3r`Xr2PEWAJe4PU^Y7JdEUCtp+
ztfHMO+7oPV(!MGO-Lz!;sY1+MqnXBqqMoM4O>Pr%6WPV;aEumLpSfJHjSNlTMLgi%
zU|R7}W<A?l-q16=q)yM}*sm4#R%`TZh}~tDS1ml)u?{x!rcKypx)AT1piN0D%a_O=
z%v+gLOlQ{GzO{Sk+QD04VcF+(Ec9jd47*X#w#x9ebl&Ze^mzyTmCz^zaspJEuk{MB
z%g{_>2cP;lzfLwlNmJs8j(MDI&Y82*Ih;Ms;cROTXQOjCo1nwl2OZAZcQ|X>;cSf#
zXLocs8xDDpH?f<N_H%XtwHyKQt~*d&EvQ+7&t-m>)wwL-vY^ZAKjD!Y43M@XKw1wU
zG&G<Q5p2YLXhD>;gC9A^xvRNXU=WXTrf>o$z3Y3arG{&DU3-=gs%Q;4tL^Y(yQ87i
zmGU%DUfMZzC_Ij#d+BOet!pQB?OH?EDFQ3HhVQLQTdiw1b#?p?T_ej7|C!j-(#J&C
zA{zLwmC#tih7%n62>7+@2zGS{?2GVM&HWuBaP0;*c5%?Ki0~4c96{Oezxh`6Mzd`A
z#m-tMD*K2zuoq#znQaXJc6!*wcQMYV@?pL_{Y-%qlzf6-oF}R}XA&tF=Y)rI7~>e_
zX+=3F#-Cw(ZFtKTE{v7ktJ&nbr{+8>ONcCB<IJaM5fAIDJgP6x=V|&Pf>m3=@_b&k
ziB$O7ylR$#tP_KOh|e<koA3o}qWgbcKx<@k30vmz$O7*BJ=)IP!Tph~C2XTm`={7m
zLNv0&of5yD97T4Kl<>I{9(W)7?{P|w>|X1LsHJ;k5)O`LHqee9x+}a@;?%x`4yuiG
zIydxrOEFpMa+bPRNmp$-fv#2{r-Mrbfx!({vY@>Z=V?|MFv6;P0^1mrotR*JC;6<O
z;mTQ-_c{LhIFAK9iN7$)|3pG5Oey{hQ7uTRtuR#w(khOuItWW0LtZ_Gf*QjmbrzS^
zQ+P(r;@L`Ws5vh;BI=BMdwIFhg!<30v$pMDu;V?Ewy;$EI8KwY$*34p#78@C3Ud4p
zm9R%DpthHjfTY1ZCONEghmXsuOd0Qe5_lQJe7#lSdT?ck_AW<NP^w$vaY9xndR&!~
zZ;p1a*p|1vd0^W-{Jz_@w`rwYLA|UU@b_65&!ZVvS?@362wtMkFC&51Fw3t>3)k@i
zKN_#%9ez*V<m_GCz<YQbw;aTxPTk*JuBO)+9YL%auQEno=C0IL1N{F+qE=~bVLvy&
zQm!ms<o4#HZqr?(FDq#aB+WuPgv83dnqwzd+)mxin}844uRr9o^AR@TV{FAIe2NyZ
g8^6UKEb=K@Vy7t4(>sm_Zs$Jgd7zk8()Z8)7gf}uxc~qF

diff --git a/simulator/out/production/simulator/com/verictas/pos/simulator/processor/Processor.class b/simulator/out/production/simulator/com/verictas/pos/simulator/processor/Processor.class
index 3d722f07db940ea4b4170a725f2592c22cb22838..234d65fdb6b136cf143a68625f322e0e3b28cb73 100644
GIT binary patch
literal 7442
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
M8~@+N1s`tzFMK%mo&W#<

literal 7291
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

diff --git a/simulator/src/com/verictas/pos/simulator/Main.java b/simulator/src/com/verictas/pos/simulator/Main.java
index 0a161ce..0b51bb3 100644
--- a/simulator/src/com/verictas/pos/simulator/Main.java
+++ b/simulator/src/com/verictas/pos/simulator/Main.java
@@ -35,15 +35,18 @@ public class Main {
         //Object moon = new Object("The Moon", 734.9E20, AU.convertToMeter(new Vector3d(1.002390058141768E+00,-1.318677081380600E-01,-1.051759034600983E-04)), AU.convertToMetersPerSecond(new Vector3d(2.294349896503608E-03,1.752303034437222E-02,-5.522655228080146E-05)));
 
         // 1 januari startdag
-       Object sun = new Object("Sun", 1.988544E30, AU.convertToMeter(new Vector3d(3.737881713150281E-03,1.402397586692506E-03,-1.612700291840256E-04)), AU.convertToMetersPerSecond(new Vector3d(8.619338996535534E-07,6.895607793642275E-06,-2.794074909231784E-08)));
-       Object earth = new Object("Earth", 5.97219E24, AU.convertToMeter(new Vector3d(-1.630229002588497E-01,9.704723344534316E-01,-1.955367328932975E-04)), AU.convertToMetersPerSecond(new Vector3d(-1.723383356491747E-02,-2.969134550063944E-03,-4.433758674928828E-07)));
+        Object sun = new Object("Sun", 1.988544E30, AU.convertToMeter(new Vector3d(3.737881713150281E-03,1.402397586692506E-03,-1.612700291840256E-04)), AU.convertToMetersPerSecond(new Vector3d(8.619338996535534E-07,6.895607793642275E-06,-2.794074909231784E-08)));
+        Object earth = new Object("Earth", 5.97219E24, AU.convertToMeter(new Vector3d(-1.630229002588497E-01,9.704723344534316E-01,-1.955367328932975E-04)), AU.convertToMetersPerSecond(new Vector3d(-1.723383356491747E-02,-2.969134550063944E-03,-4.433758674928828E-07)));
         Object moon = new Object("The Moon", 734.9E20, AU.convertToMeter(new Vector3d(-1.657103868749121E-01,9.706382026425473E-01,-1.879812512691582E-04)), AU.convertToMetersPerSecond(new Vector3d(-1.728100931961937E-02,-3.525371122447976E-03,4.909148618073602E-05)));
+        Object jupiter = new Object("Jupiter", 1898.13E24, AU.convertToMeter(new Vector3d(-5.172279968303672E+00,1.591564562098799E+00,1.090553487095606E-01)), AU.convertToMetersPerSecond(new Vector3d(-2.306423668033420E-03,-6.856869314900905E-03,8.012916249248967E-05)));
+        Object saturn = new Object("Saturn", 5.68319E26, AU.convertToMeter(new Vector3d(-3.710637850378867E+00,-9.289569433157130E+00,3.091990731378936E-01)), AU.convertToMetersPerSecond(new Vector3d(4.874750391005278E-03,-2.086615906689840E-03,-1.574898601194673E-04)));
+        Object venus = new Object("Venus", 48.685E23, AU.convertToMeter(new Vector3d(-7.130901319004951E-01,-5.719763212192740E-02,4.040076577877051E-02)), AU.convertToMetersPerSecond(new Vector3d(1.525993024372452E-03,-2.024175581604569E-02,-3.656582385749146E-04)));
 
         /**
          * Object listing
          */
 
-        Object[] objects = {sun, earth, moon};
+        Object[] objects = {sun, earth, moon, jupiter, saturn};
 
 
         /**
diff --git a/simulator/src/com/verictas/pos/simulator/Simulator.java b/simulator/src/com/verictas/pos/simulator/Simulator.java
index bb48b97..e894b66 100644
--- a/simulator/src/com/verictas/pos/simulator/Simulator.java
+++ b/simulator/src/com/verictas/pos/simulator/Simulator.java
@@ -64,7 +64,7 @@ public class Simulator {
                 /**
                  * Do the processing on the objects
                  */
-                processor.process(objects);
+                processor.process(objects, t + 1);
 
                 /**
                  * The round has ended
diff --git a/simulator/src/com/verictas/pos/simulator/SimulatorConfig.java b/simulator/src/com/verictas/pos/simulator/SimulatorConfig.java
index d3238fb..e5fd69e 100644
--- a/simulator/src/com/verictas/pos/simulator/SimulatorConfig.java
+++ b/simulator/src/com/verictas/pos/simulator/SimulatorConfig.java
@@ -5,8 +5,8 @@ public class SimulatorConfig {
      * Time settings
      */
 
-    public static int rounds = 526100 * 35 * 60; // Amount of rounds to run the simulator for
-    public static double time = 1; // Time steps in seconds
+    public static int rounds = 526100 * 10; // Amount of rounds to run the simulator for
+    public static double time = 60; // Time steps in seconds
 
     /**
      * Object settings
@@ -19,8 +19,8 @@ public class SimulatorConfig {
      * Ascending & descending node detection
      */
 
-    public static double z = -22439680.6; // Reference z height for the used system in meters
-    public static double zThreshold = 100; // Threshold value to specify the maximum value (in meters) the z difference can be to be considered close to the reference plane (To eliminate all bending points that are to far away from the z-axis to count as nodes)
+    //public static double z = -22439680.6; // Reference z height for the used system in meters
+    //public static double zThreshold = 1000; // Threshold value to specify the maximum value (in meters) the z difference can be to be considered close to the reference plane (To eliminate all bending points that are to far away from the z-axis to count as nodes)
 
     /**
      * Output preferences
@@ -28,6 +28,6 @@ public class SimulatorConfig {
 
     public static String outputUnit = "AU"; // Preferred output unit preference (AU => AU/day, m => m/s)
     public static int outputNumbers = 0; // Preferred way of outputting numbers: (0 => comma for decimals, dot in large numbers OR 1 => comma for large numbers, dot with decimals)
-    public static int skipLines = 2629743; // Set the skipLines integer to skip lines (for example: every 5th line is written) in the output file (for smaller files), if this is set to 1, it has no effect and all lines will be written.
+    public static int skipLines = 1440; // Set the skipLines integer to skip lines (for example: every 5th line is written) in the output file (for smaller files), if this is set to 1, it has no effect and all lines will be written.
     public static boolean skipUnnecessary = true; // Skip the unnecessary objects in the export
 }
diff --git a/simulator/src/com/verictas/pos/simulator/mathUtils/AOP.java b/simulator/src/com/verictas/pos/simulator/mathUtils/AOP.java
index 4b222eb..5ca7164 100644
--- a/simulator/src/com/verictas/pos/simulator/mathUtils/AOP.java
+++ b/simulator/src/com/verictas/pos/simulator/mathUtils/AOP.java
@@ -9,6 +9,11 @@ public class AOP {
     public static double calculate(Vector3d ascendingNode, Vector3d perihelion, Vector3d aphelion) {
         Vector3d eccentricity = new Vector3d(0,0,0);
         eccentricity.sub(perihelion, aphelion);
-        return ascendingNode.angle(eccentricity);
+
+        if (perihelion.getY() > ascendingNode.getY()) {
+            return ascendingNode.angle(eccentricity);
+        } else {
+            return (2 * Math.PI) - ascendingNode.angle(eccentricity);
+        }
     }
 }
diff --git a/simulator/src/com/verictas/pos/simulator/mathUtils/AU.java b/simulator/src/com/verictas/pos/simulator/mathUtils/AU.java
index 33f2dba..917fd5f 100644
--- a/simulator/src/com/verictas/pos/simulator/mathUtils/AU.java
+++ b/simulator/src/com/verictas/pos/simulator/mathUtils/AU.java
@@ -50,6 +50,10 @@ public class AU {
         return output;
     }
 
+    public static double convertFromMeter(double input) {
+        return input * 6.6845871E-12;
+    }
+
     /**
      * Converts m/s to AU/day for data collection
      * @param input Vector3d with values in m/s
diff --git a/simulator/src/com/verictas/pos/simulator/processor/ObjectProcessor.java b/simulator/src/com/verictas/pos/simulator/processor/ObjectProcessor.java
index 422dcf5..04b82e1 100644
--- a/simulator/src/com/verictas/pos/simulator/processor/ObjectProcessor.java
+++ b/simulator/src/com/verictas/pos/simulator/processor/ObjectProcessor.java
@@ -1,10 +1,9 @@
 package com.verictas.pos.simulator.processor;
 
 import com.verictas.pos.simulator.Object;
-import com.verictas.pos.simulator.SimulatorConfig;
-import com.verictas.pos.simulator.mathUtils.AU;
-
 import javax.vecmath.Vector3d;
+import java.util.HashMap;
+import java.util.Map;
 
 public class ObjectProcessor {
     public Vector3d aphelion;
@@ -22,9 +21,12 @@ public class ObjectProcessor {
     public Vector3d ascendingNode;
     public Vector3d descendingNode;
 
-    public double zAxisDistance = -1;
-    public double pastzAxisDistance = -1;
-    public Vector3d lastPos;
+    public Vector3d absoluteMax;
+    public Vector3d absoluteMin;
+
+    public double referenceZ;
+
+    public HashMap<Integer, Vector3d[]> history = new HashMap<>();
 
     public void setStartingPosition(Vector3d position) {
         this.startingPosition = position;
@@ -38,6 +40,14 @@ public class ObjectProcessor {
         this.referenceObject = object;
     }
 
+    /**
+     * Keep an history of the object position and speed (for logging and further processing)
+     */
+
+    public void processHistory(int round) {
+        this.history.put(round, new Vector3d[] {this.thisObject.position, this.thisObject.speed});
+    }
+
     /**
      * Processes the aphelion & perihelion
      */
@@ -71,57 +81,67 @@ public class ObjectProcessor {
         }
     }
 
+
     /**
-     * Get the ascending node
+     * Get the absolute maximum and minimum positions (max z and min z)
      */
 
-    public void processNodes() {
-        double zAxisDistance = Math.abs(this.thisObject.position.getZ() - SimulatorConfig.z);
+    public void calculateTops() {
+        if (this.absoluteMax == null) {
+            this.absoluteMax = this.thisObject.position;
+        }
 
-        if (this.pastzAxisDistance == -1) {
-            this.pastzAxisDistance = zAxisDistance;
+        if (this.absoluteMin == null) {
+            this.absoluteMin = this.thisObject.position;
         }
 
-        if (this.pastzAxisDistance != -1 && this.zAxisDistance == -1) {
-            this.zAxisDistance = zAxisDistance;
+        if (this.thisObject.position.getZ() > this.absoluteMax.getZ()) {
+            this.absoluteMax = this.thisObject.position;
         }
 
-        if (this.zAxisDistance != -1 && this.pastzAxisDistance != 1) {
-            if ((this.pastzAxisDistance > this.zAxisDistance && zAxisDistance > this.zAxisDistance) && (this.zAxisDistance < SimulatorConfig.zThreshold)) {
-                if (SimulatorConfig.outputUnit.equals("AU")) {
-                    System.out.println("INFO:: Found a node within the threshold at " + AU.convertFromMeter(this.lastPos) + " (in AU) for object " + this.thisObject.name + "!");
-                } else {
-                    System.out.println("INFO:: Found a node within the threshold at " + this.lastPos + " (in m) for object " + this.thisObject.name + "!");
-                }
+        if (this.thisObject.position.getZ() < this.absoluteMin.getZ()) {
+            this.absoluteMin = this.thisObject.position;
+        }
+    }
+    /**
+     * Process the nodes
+     */
 
-                if ((this.lastPos.getZ() - this.thisObject.position.getZ()) < 0) {
-                    if (SimulatorConfig.z < 0) {
-                        // The reference plane is in negative z, so you have gone up!
-                        this.ascendingNode = this.lastPos;
-                        System.out.println("INFO:: Detected node as: ASCENDING NODE!");
+    public void processNodes() {
+        this.referenceZ = (this.absoluteMin.getZ() + this.absoluteMax.getZ()) / 2;
+
+        // Loop through the entire history
+        for (Map.Entry<Integer, Vector3d[]> entry : this.history.entrySet()) {
+            Integer round = entry.getKey();
+            Vector3d[] vectorArray = entry.getValue();
+
+            if (this.history.get(round + 1) != null) {
+                // There is a next key!
+                if (vectorArray[0].getZ() < referenceZ && this.history.get(round + 1)[0].getZ() > referenceZ) {
+                    // This point is below the reference height and the next is above. This point is the ascending node (with positive z)
+                    if (referenceZ <= 0) {
+                        // Descending
+                        this.descendingNode = vectorArray[0];
+                        System.out.println("INFO:: Found a descending node at round " + round + " at position: " + vectorArray[0]);
                     } else {
-                        // The reference plane is in positive z, so you have gone down!
-                        this.descendingNode = this.lastPos;
-                        System.out.println("INFO:: Detected node as: DESCENDING NODE!");
+                        // Ascending
+                        this.ascendingNode = vectorArray[0];
+                        System.out.println("INFO:: Found a ascending node at round " + round + " at position: " + vectorArray[0]);
                     }
-                } else {
-                    if (SimulatorConfig.z < 0) {
-                        // The reference plane is in negative z, so you have gone down!
-                        this.descendingNode = this.lastPos;
-                        System.out.println("INFO:: Detected node as: DESCENDING NODE!");
+                } else if (vectorArray[0].getZ() > referenceZ && this.history.get(round + 1)[0].getZ() < referenceZ) {
+                    // This point is above the reference height and the next is below. This point is the descending node (with positive z)
+                    if (referenceZ <= 0) {
+                        // Ascending
+                        this.ascendingNode = vectorArray[0];
+                        System.out.println("INFO:: Found a ascending node at round " + round + " at position: " + vectorArray[0]);
                     } else {
-                        // The reference plane is in positive z, so you have gone up!
-                        this.ascendingNode = this.lastPos;
-                        System.out.println("INFO:: Detected node as: ASCENDING NODE!");
+                        // Descending
+                        this.descendingNode = vectorArray[0];
+                        System.out.println("INFO:: Found a descending node at round " + round + " at position: " + vectorArray[0]);
                     }
                 }
             }
-
-            this.pastzAxisDistance = this.zAxisDistance;
-            this.zAxisDistance = zAxisDistance;
         }
-
-        this.lastPos = this.thisObject.position;
     }
 
     /**
@@ -178,7 +198,9 @@ public class ObjectProcessor {
         perihelion = null;
         ascendingNode = null;
         descendingNode = null;
-        zAxisDistance = -1;
-        lastPos = null;
+        history = new HashMap<>();
+        absoluteMax = null;
+        absoluteMin = null;
+        referenceZ = -1;
     }
 }
diff --git a/simulator/src/com/verictas/pos/simulator/processor/Processor.java b/simulator/src/com/verictas/pos/simulator/processor/Processor.java
index 4464bf0..67d6d01 100644
--- a/simulator/src/com/verictas/pos/simulator/processor/Processor.java
+++ b/simulator/src/com/verictas/pos/simulator/processor/Processor.java
@@ -37,7 +37,7 @@ public class Processor {
         }
     }
 
-    public void process(Object[] objectArray) throws ProcessingException, WritingException {
+    public void process(Object[] objectArray, int rounds) throws ProcessingException, WritingException {
         HashMap<String, Object> objects = objectArrayToHashMap(objectArray);
 
         /**
@@ -48,54 +48,68 @@ public class Processor {
 
             object.setObjectData(objects.get(objectName));
             object.setReferenceObjectData(objects.get(SimulatorConfig.sunName));
+            object.processHistory(rounds);
 
             // Check if the object has gone round last round
 
             boolean round = object.processRoundCheck();
             if (round) {
-                // Object has gone full circle last round!
-                System.out.println("\n\n============== ROTATION DATA: " + objectName.toUpperCase() + " =============");
-                System.out.println("Current position (AU): " + AU.convertFromMeter(objects.get(objectName).position));
-                System.out.println("Current position (m): " + objects.get(objectName).position + "\n");
+                // Process the nodes
+                object.processNodes();
+
+                // ECHO:: Object has gone full circle last round!
+                System.out.println("\n\n============== ROTATION DATA: " + objectName.toUpperCase() + ", ROUND " + (rounds - 1) + " =============");
+
+                if (SimulatorConfig.outputUnit == "AU") {
+                    System.out.println("Current position (AU): " + AU.convertFromMeter(objects.get(objectName).position) + "\n");
+                    System.out.println("Highest point (z-axis graph) (AU): " + AU.convertFromMeter(object.absoluteMax));
+                    System.out.println("Lowest point (z-axis graph) (AU): " + AU.convertFromMeter(object.absoluteMin));
+                    System.out.println("Calculated reference height (AU) : " + AU.convertFromMeter(object.referenceZ) + "\n");
+
+                    if (object.ascendingNode != null) {
+                        System.out.println("Ascending node (AU): " + AU.convertFromMeter(object.ascendingNode));
+                    } else {
+                        System.out.println("WARNING:: Ascending node not found.");
+                    }
 
-                if (object.ascendingNode != null) {
-                    System.out.println("Ascending node (AU): " + AU.convertFromMeter(object.ascendingNode));
-                    System.out.println("Ascending node (m): " + object.ascendingNode + "\n");
-                } else {
                     if (object.descendingNode != null) {
-                        System.out.println("WARNING:: Ascending node not found. Because a descending node was found, you can assume the current position is the ascending node (or it is between the starting position and the current.\n");
+                        System.out.println("Descending node (AU): " + AU.convertFromMeter(object.descendingNode) + "\n");
                     } else {
-                        System.out.println("WARNING:: Ascending node not found. Have you set the reference plane height correctly?\n");
+                        System.out.println("WARNING:: Descending node not found.\n");
                     }
-                }
 
-                if (object.descendingNode != null) {
-                    System.out.println("Descending node (AU): " + AU.convertFromMeter(object.descendingNode));
-                    System.out.println("Descending node (m): " + object.descendingNode + "\n");
+                    System.out.println("Position during apastron (AU): " + AU.convertFromMeter(object.aphelion));
+                    System.out.println("Distance from (the) " + SimulatorConfig.sunName + " during apastron in km: " + object.aphelionDistance / 1000 + "\n");
+                    System.out.println("Position during periastron (AU): " + AU.convertFromMeter(object.perihelion));
+                    System.out.println("Distance from (the) " + SimulatorConfig.sunName + " during periastron in km: " + object.perihelionDistance / 1000 + "\n");
                 } else {
+                    System.out.println("Current position (m): " + objects.get(objectName).position + "\n");
+                    System.out.println("Highest point (z-axis graph) (m): " + object.absoluteMax);
+                    System.out.println("Lowest point (z-axis graph) (m): " + object.absoluteMin);
+                    System.out.println("Calculated reference height (m) : " + object.referenceZ + "\n");
+
                     if (object.ascendingNode != null) {
-                        System.out.println("WARNING:: Descending node not found. Because a ascending node was found, you can assume the current position is the descending node (or it is between the starting position and the current).\n");
+                        System.out.println("Ascending node (m): " + object.ascendingNode);
                     } else {
-                        System.out.println("WARNING:: Descending node not found. Have you set the reference plane height correctly?\n");
+                        System.out.println("WARNING:: Ascending node not found.");
                     }
-                }
 
-                System.out.println("Position during apastron (AU): " + AU.convertFromMeter(object.aphelion));
-                System.out.println("Position during apastron (m): " + object.aphelion);
-                System.out.println("Distance from (the) " + SimulatorConfig.sunName + " during apastron in m: " + object.aphelionDistance + "\n");
-                System.out.println("Position during periastron (AU): " + AU.convertFromMeter(object.perihelion));
-                System.out.println("Position during periastron (m): " + object.perihelion);
-                System.out.println("Distance from (the) " + SimulatorConfig.sunName + " during periastron in m: " + object.perihelionDistance + "\n");
+                    if (object.descendingNode != null) {
+                        System.out.println("Descending node (m): " + object.descendingNode + "\n");
+                    } else {
+                        System.out.println("WARNING:: Descending node not found.\n");
+                    }
+
+                    System.out.println("Position during apastron (m): " + object.aphelion);
+                    System.out.println("Distance from (the) " + SimulatorConfig.sunName + " during apastron in km: " + object.aphelionDistance / 1000 + "\n");
+                    System.out.println("Position during periastron (m): " + object.perihelion);
+                    System.out.println("Distance from (the) " + SimulatorConfig.sunName + " during periastron in km: " + object.perihelionDistance / 1000 + "\n");
+                }
 
                 if (object.ascendingNode != null) {
-                    System.out.println("Argument of periapsis (range: 0 - PI): " + AOP.calculate(object.ascendingNode, object.perihelion, object.aphelion) + " rad");
-                    System.out.println("Argument of periapsis: " + Math.toDegrees(AOP.calculate(object.ascendingNode, object.perihelion, object.aphelion)) + " degrees");
+                    System.out.println("Argument of periapsis (radians): " + AOP.calculate(object.ascendingNode, object.perihelion, object.aphelion));
+                    System.out.println("Argument of periapsis (degrees): " + Math.toDegrees(AOP.calculate(object.ascendingNode, object.perihelion, object.aphelion)));
                 } else {
-                    if (object.descendingNode != null) {
-                        System.out.println("WARNING:: Ascending node not found. The argument is calculated with the current position as ascending node).\n");
-                        System.out.println("Argument of periapsis (range: 0 - PI): " + AOP.calculate(objects.get(objectName).position, object.perihelion, object.aphelion) + " rad");
-                        System.out.println("Argument of periapsis: " + Math.toDegrees(AOP.calculate(objects.get(objectName).position, object.perihelion, object.aphelion)) + " degrees");
-                    }
                     System.out.println("ERROR:: Can't calculate the argument of periapsis because the ascending node is missing.");
                 }
 
@@ -109,7 +123,7 @@ public class Processor {
 
             // Process values for this round
             object.processAphelionAndPerihelion();
-            object.processNodes();
+            object.calculateTops();
 
             this.objects.put(objectName, object);
         }