From c8430513381970d393544598a1367da430162572 Mon Sep 17 00:00:00 2001
From: Christiaan Goossens <contact@verictas.nl>
Date: Fri, 4 Nov 2016 19:07:47 +0100
Subject: [PATCH] Fixed bugs with the node calculations There's a small bug
 with there possibly being two minima or maxima in one round. The simulator
 can't handle that currently.

---
 simulator/.idea/workspace.xml                 | 247 +++++++++++-------
 .../com/verictas/pos/simulator/Node.class     | Bin 0 -> 848 bytes
 .../verictas/pos/simulator/Simulator.class    | Bin 3327 -> 3468 bytes
 .../pos/simulator/SimulatorConfig.class       | Bin 811 -> 811 bytes
 .../simulator/processor/ObjectProcessor.class | Bin 4933 -> 7194 bytes
 .../pos/simulator/processor/Processor.class   | Bin 7442 -> 7503 bytes
 .../src/com/verictas/pos/simulator/Node.java  |  41 +++
 .../com/verictas/pos/simulator/Simulator.java |  30 ++-
 .../pos/simulator/SimulatorConfig.java        |   2 +-
 .../simulator/processor/ObjectProcessor.java  | 205 +++++++++++----
 .../pos/simulator/processor/Processor.java    |   9 +-
 11 files changed, 380 insertions(+), 154 deletions(-)
 create mode 100644 simulator/out/production/simulator/com/verictas/pos/simulator/Node.class
 create mode 100644 simulator/src/com/verictas/pos/simulator/Node.java

diff --git a/simulator/.idea/workspace.xml b/simulator/.idea/workspace.xml
index dfeffe1..756f4a9 100644
--- a/simulator/.idea/workspace.xml
+++ b/simulator/.idea/workspace.xml
@@ -7,12 +7,10 @@
   </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/Node.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <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/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/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>
@@ -49,38 +47,98 @@
       <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="-3">
-              <caret line="62" column="0" selection-start-line="62" selection-start-column="0" selection-end-line="62" selection-end-column="0" />
+            <state relative-caret-position="136">
+              <caret line="8" column="24" selection-start-line="8" selection-start-column="24" selection-end-line="8" selection-end-column="24" />
               <folding>
                 <element signature="imports" expanded="true" />
+                <element signature="method#run#0;class#Simulator#0" expanded="false" />
                 <element signature="method#accelerate#0;class#Simulator#0" expanded="false" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="ObjectProcessor.java" pinned="false" current-in-tab="false">
+      <file leaf-file-name="Main.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/Main.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="629">
+              <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>
+      </file>
+      <file leaf-file-name="SimulatorConfig.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/SimulatorConfig.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="119">
+              <caret line="7" column="42" selection-start-line="7" selection-start-column="42" selection-end-line="7" selection-end-column="42" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="Node.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/Node.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="544">
+              <caret line="34" column="27" selection-start-line="34" selection-start-column="27" selection-end-line="34" selection-end-column="27" />
+              <folding>
+                <element signature="e#287#288#0" expanded="true" />
+                <element signature="e#319#320#0" expanded="true" />
+                <element signature="e#394#395#0" expanded="true" />
+                <element signature="e#439#440#0" expanded="true" />
+                <element signature="method#empty#0;class#Node#0" expanded="false" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="Object.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/Object.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="1850">
+              <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" />
+                <element signature="method#getSpeed#0;class#Object#0" expanded="false" />
+                <element signature="method#getPosition#0;class#Object#0" expanded="false" />
+                <element signature="method#setAcceleration#1;class#Object#0" expanded="false" />
+                <element signature="method#getAcceleration#0;class#Object#0" expanded="false" />
+                <element signature="method#setOldAcceleration#1;class#Object#0" expanded="false" />
+                <element signature="method#getOldAcceleration#0;class#Object#0" expanded="false" />
+                <element signature="method#toString#0;class#Object#0" expanded="false" />
+                <element signature="method#getForceOnObject#0;class#Object#0" expanded="false" />
+                <element signature="method#getDistance#1;class#Object#0" expanded="false" />
+                <element signature="method#updatePosition#0;class#Object#0" expanded="false" />
+                <element signature="method#updateSpeed#0;class#Object#0" expanded="false" />
+                <element signature="method#enactForceOnObject#0;class#Object#0" expanded="false" />
+              </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">
           <provider selected="true" editor-type-id="text-editor">
-            <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" />
+            <state relative-caret-position="286">
+              <caret line="109" column="72" selection-start-line="109" selection-start-column="72" selection-end-line="109" selection-end-column="72" />
               <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="e#1132#1133#0" expanded="true" />
+                <element signature="e#1172#1173#0" expanded="true" />
                 <element signature="method#processRoundCheck#0;class#ObjectProcessor#0" expanded="false" />
-                <element signature="method#reset#0;class#ObjectProcessor#0" expanded="false" />
+                <element signature="method#cleanHistory#0;class#ObjectProcessor#0" expanded="false" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Processor.java" pinned="false" current-in-tab="true">
+      <file leaf-file-name="Processor.java" pinned="false" current-in-tab="false">
         <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" />
+            <state relative-caret-position="544">
+              <caret line="63" column="62" selection-start-line="63" selection-start-column="16" selection-end-line="63" selection-end-column="62" />
               <folding>
                 <element signature="imports" expanded="true" />
                 <element signature="method#objectArrayToHashMap#0;class#Processor#0" expanded="false" />
@@ -131,12 +189,13 @@
         <option value="$PROJECT_DIR$/src/com/verictas/pos/simulator/Object.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/Simulator.java" />
         <option value="$PROJECT_DIR$/src/com/verictas/pos/simulator/processor/Processor.java" />
+        <option value="$PROJECT_DIR$/src/com/verictas/pos/simulator/Node.java" />
+        <option value="$PROJECT_DIR$/src/com/verictas/pos/simulator/SimulatorConfig.java" />
+        <option value="$PROJECT_DIR$/src/com/verictas/pos/simulator/processor/ObjectProcessor.java" />
       </list>
     </option>
   </component>
@@ -187,6 +246,8 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="Scratches" />
       <pane id="ProjectPane">
         <subPane>
@@ -284,8 +345,6 @@
           </PATH>
         </subPane>
       </pane>
-      <pane id="Scope" />
-      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -295,6 +354,7 @@
     <property name="project.structure.last.edited" value="Artifacts" />
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.2" />
+    <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file://D:/Projecten/PWS/simulator/src/com/verictas/pos/simulator/Node.java" />
   </component>
   <component name="RecentsManager">
     <key name="MoveFile.RECENT_KEYS">
@@ -593,18 +653,17 @@
     <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="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.2653277" sideWeight="0.48541668" 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.30866808" sideWeight="0.42083332" 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.20084566" sideWeight="0.4328125" 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="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.20084566" sideWeight="0.5671875" 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" />
@@ -616,6 +675,7 @@
       <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="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="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">
@@ -635,7 +695,7 @@
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="36" />
+      <option name="time" value="46" />
     </breakpoint-manager>
     <watches-manager />
   </component>
@@ -644,13 +704,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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">
-          <caret line="116" column="5" selection-start-line="116" selection-start-column="5" selection-end-line="116" selection-end-column="5" />
-        </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="0">
@@ -664,6 +717,7 @@
           <caret line="4" column="24" selection-start-line="4" selection-start-column="24" selection-end-line="4" selection-end-column="24" />
           <folding>
             <element signature="imports" expanded="true" />
+            <element signature="method#run#0;class#Simulator#0" expanded="false" />
             <element signature="method#accelerate#0;class#Simulator#0" expanded="false" />
           </folding>
         </state>
@@ -682,6 +736,7 @@
           <caret line="55" column="39" selection-start-line="55" selection-start-column="39" selection-end-line="55" selection-end-column="39" />
           <folding>
             <element signature="imports" expanded="true" />
+            <element signature="method#run#0;class#Simulator#0" expanded="false" />
             <element signature="method#accelerate#0;class#Simulator#0" expanded="false" />
           </folding>
         </state>
@@ -729,6 +784,7 @@
           <caret line="55" column="39" selection-start-line="55" selection-start-column="39" selection-end-line="55" selection-end-column="39" />
           <folding>
             <element signature="imports" expanded="true" />
+            <element signature="method#run#0;class#Simulator#0" expanded="false" />
             <element signature="method#accelerate#0;class#Simulator#0" expanded="false" />
           </folding>
         </state>
@@ -776,6 +832,7 @@
           <caret line="55" column="39" selection-start-line="55" selection-start-column="39" selection-end-line="55" selection-end-column="39" />
           <folding>
             <element signature="imports" expanded="true" />
+            <element signature="method#run#0;class#Simulator#0" expanded="false" />
             <element signature="method#accelerate#0;class#Simulator#0" expanded="false" />
           </folding>
         </state>
@@ -823,6 +880,7 @@
           <caret line="35" column="30" selection-start-line="35" selection-start-column="30" selection-end-line="35" selection-end-column="30" />
           <folding>
             <element signature="imports" expanded="true" />
+            <element signature="method#run#0;class#Simulator#0" expanded="false" />
             <element signature="method#accelerate#0;class#Simulator#0" expanded="false" />
           </folding>
         </state>
@@ -954,36 +1012,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/ObjectStore.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <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="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" />
-            <element signature="method#getSpeed#0;class#Object#0" expanded="false" />
-            <element signature="method#getPosition#0;class#Object#0" expanded="false" />
-            <element signature="method#setAcceleration#1;class#Object#0" expanded="false" />
-            <element signature="method#getAcceleration#0;class#Object#0" expanded="false" />
-            <element signature="method#setOldAcceleration#1;class#Object#0" expanded="false" />
-            <element signature="method#getOldAcceleration#0;class#Object#0" expanded="false" />
-            <element signature="method#toString#0;class#Object#0" expanded="false" />
-            <element signature="method#getForceOnObject#0;class#Object#0" expanded="false" />
-            <element signature="method#getDistance#1;class#Object#0" expanded="false" />
-            <element signature="method#updatePosition#0;class#Object#0" expanded="false" />
-            <element signature="method#updateSpeed#0;class#Object#0" expanded="false" />
-            <element signature="method#enactForceOnObject#0;class#Object#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/ObjectStore.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="577">
@@ -1000,70 +1029,106 @@
         <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="e#1368#1369#0" expanded="true" />
-            <element signature="e#1412#1413#0" expanded="true" />
+            <element signature="e#1368#1369#0" expanded="false" />
+            <element signature="e#1412#1413#0" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/Main.java">
+    <entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/Simulator.java">
       <provider selected="true" editor-type-id="text-editor">
-        <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" />
+        <state relative-caret-position="136">
+          <caret line="8" column="24" selection-start-line="8" selection-start-column="24" selection-end-line="8" selection-end-column="24" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#run#0;class#Simulator#0" expanded="false" />
+            <element signature="method#accelerate#0;class#Simulator#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <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="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/SimulatorConfig.java">
+    <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="102">
-          <caret line="6" column="0" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
+        <state relative-caret-position="544">
+          <caret line="63" column="62" selection-start-line="63" selection-start-column="16" selection-end-line="63" selection-end-column="62" />
+          <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>
+    <entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/Main.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="629">
+          <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/mathUtils/AOP.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="204">
-          <caret line="12" column="52" selection-start-line="12" selection-start-column="52" selection-end-line="12" selection-end-column="52" />
+        <state relative-caret-position="119">
+          <caret line="7" column="42" selection-start-line="7" selection-start-column="42" selection-end-line="7" selection-end-column="42" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/processor/ObjectProcessor.java">
+    <entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/Node.java">
       <provider selected="true" editor-type-id="text-editor">
-        <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" />
+        <state relative-caret-position="544">
+          <caret line="34" column="27" selection-start-line="34" selection-start-column="27" selection-end-line="34" selection-end-column="27" />
           <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" />
+            <element signature="e#287#288#0" expanded="true" />
+            <element signature="e#319#320#0" expanded="true" />
+            <element signature="e#394#395#0" expanded="true" />
+            <element signature="e#439#440#0" expanded="true" />
+            <element signature="method#empty#0;class#Node#0" expanded="false" />
           </folding>
         </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/Object.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" />
+        <state relative-caret-position="1850">
+          <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" />
-            <element signature="method#accelerate#0;class#Simulator#0" expanded="false" />
+            <element signature="method#getSpeed#0;class#Object#0" expanded="false" />
+            <element signature="method#getPosition#0;class#Object#0" expanded="false" />
+            <element signature="method#setAcceleration#1;class#Object#0" expanded="false" />
+            <element signature="method#getAcceleration#0;class#Object#0" expanded="false" />
+            <element signature="method#setOldAcceleration#1;class#Object#0" expanded="false" />
+            <element signature="method#getOldAcceleration#0;class#Object#0" expanded="false" />
+            <element signature="method#toString#0;class#Object#0" expanded="false" />
+            <element signature="method#getForceOnObject#0;class#Object#0" expanded="false" />
+            <element signature="method#getDistance#1;class#Object#0" expanded="false" />
+            <element signature="method#updatePosition#0;class#Object#0" expanded="false" />
+            <element signature="method#updateSpeed#0;class#Object#0" expanded="false" />
+            <element signature="method#enactForceOnObject#0;class#Object#0" expanded="false" />
           </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/processor/ObjectProcessor.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" />
+        <state relative-caret-position="286">
+          <caret line="109" column="72" selection-start-line="109" selection-start-column="72" selection-end-line="109" selection-end-column="72" />
           <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" />
+            <element signature="e#1132#1133#0" expanded="true" />
+            <element signature="e#1172#1173#0" expanded="true" />
+            <element signature="method#processRoundCheck#0;class#ObjectProcessor#0" expanded="false" />
+            <element signature="method#cleanHistory#0;class#ObjectProcessor#0" expanded="false" />
           </folding>
         </state>
       </provider>
diff --git a/simulator/out/production/simulator/com/verictas/pos/simulator/Node.class b/simulator/out/production/simulator/com/verictas/pos/simulator/Node.class
new file mode 100644
index 0000000000000000000000000000000000000000..d156f40acb909494413f52ab2d7ee809589594a1
GIT binary patch
literal 848
zcmah`O-~b16g{u=Q92G&1ud0YOBJLHY8Sf0u(6VmR2D)S=x&%!WVF+1=7Z=jG4VIB
zaUmp{_yhb=#`9h$LJY=Ca_64+?mhS1^M3yN_5;9kJh7mmX`zDqWwaz%sSvc~$paZ4
z%CK6-nt+kS`D7#@b_L8A;Uvtq1sa|HJMYx{&^-<O$jeT;gTT+?<k@IzV<4cvj7Nb$
zwI5D`y*xS&k^}E}%#($F?0e&ZmxK}*hkAArrULE0A4lX%LO=7;?lexjX&B{WkG$PI
z5^ixm#}NwD|21Af>qrT6X^_2{3D-Nj^27+DY4%aw4+ZA;GtYnj+M5<4to=Ao{9q@P
zGAnZ2Q@NlG8+U9x!n#21`i*5t$A*O)Ha6he*p%ThT!GeqHli5H6j=V-&4YY84hl2P
zPOsNfuD%VjL#4k*iwTZqzaiRuER7G#N0K_2>C9}*Gde^&DDeX<_X5J*JV)sZQ3+K>
zM|D=&ag!{!7=hZXnrMNDeOSb8#ZEU0&R47!yjxV9-=Q5jj&lM18uA*+mq=At<o2ws
zAg8Uoo5|cRWSVZ{D~wBtmXfmqgNt6uGyljl)zWhLI_?%+LuCQba?fEppFU%WNm(Wi
mlR23f`k8jd4YVshtfGN6G_ig~YO5HutZGG*6B<lQxc3{-Ly%7Z

literal 0
HcmV?d00001

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 10d69852128c3dddad4484006ef07b12d0cb650b..02424080a7b2a041ad2e82dc0c9aa35f079455db 100644
GIT binary patch
delta 1536
zcmYjR`%_e97=FGzXZKt<Y_f7&cehqVLO{ypVy%jVP+F!!p%F<S7u`b0WznQ`EjKfS
z%nseNh$!slq|6+foS}ZLp+BIR#vhz<oN1=ZIL$aYPV{_>G3^iU_kQnrFVFY9@4IvU
zkwEgtf4-doP>HWh+=W&HPhh7MZ3do1yN(VMyU=O!(xsu>gpM8!yG@wbW1<`}gW@R-
zPn+<fRY$Kp_e#;HqhFrSnAnH76a!KuWayw2`*j@9JMgS@I;dkv!*e>GH*q@-X*jGS
zX=15VkC-UL3o`aaDUM1EDbII*5;cGF<4e+XOn!V>!*LC-2)N_@gMD2BV$-P~Ca3p_
zev#Qg{DjUjOmF|@8aMQ{oxQQXSfa*0p@j1zsL(KM;eM>L@BlVyIALJ~qxP)ow|`M`
zysug~iPtQg!s`MRc9sa(HA=p2Ap%>VJZ(5F7W<?jYM}{_ShyRj1oG@lo;-U*&8Ql~
z8y3d!rhpM1NOZ&#-Cav9yoI+lykp^Ayl3HkR9HAIwGU*L4_Rqety9J@ZfCh`iv$8@
zLsQe%rf4+0E#BYRJundK+a2!di1l`Nm0S1-6#~_1EMZq*nLv2KeMdZ&kiLoja1Xuz
zi?L6-1BDSxSoj!|7CynJ7N&5<!e<i1=lH_HmzWeNWYWUvYwoYb^iNu?2$XYP0KP;%
zlA21L98y-=VI#MqiZ%~#phq>OmDb%@jeF9zdl8ksfGa^ilc_X2W<=}vpGT(JK8?)t
zP%pyUasjvb7CFdDn;rOki+OR7?ZBf{8#zYF%mngFa*Rl^gB*D}$h9vSp=4gl5L0u%
z`?V4W`6-?HuwQfFXI|eDMt=iswf?^%0p`usbJcDKL0@R0$P@~rnvA)FF)~4T3ch(u
z!7a<Ob8w*mmvM#DE6?j3-J}9Z!7-{pF6qhRlm@Yg_Z$?_Z3W6mVT2T{Awe4`yRi=a
zsKEiO$6@Lz)L|I)oR|jAMLj0)5YEv5ESfQm?YM|me9vXQj82x`iK}SCA6(VHc)y-R
zJN`z85ZEO==t}osh+Wu25Np^m1ET~ouT|k7*3zaElEcC^(3rS@FluSLicH)`C>rxg
zZ38uSi+~#VG*u{aXV^;}b8>OWMGmf^Z4-l4Cb@zKiQ9wCbY2f*j<jeR9u|tKVT*>X
z9Fd!dh#Lspgw7-T1~TRd*S+8*i*0Mv(CFoyaIfUt*fSaaWMPZf>%D;G4vLhTker0d
zP;eZcDU_82BPAiu!ktmI)UO8F&tkutjTH_`c@G77Pbr*<*_4a&tg<dB!*fgdp==9-
zS2|dk{`BiP;-2qi9lHnY<wFOMk3l5E<ZU^IP>e&I{KI7PDA`Hzxr1n=;|?5WJ4V>p
zQS?%e^B+X+!bUP!!4!|Okt&vOC$^J8h0HalJK|!5#^`3+THwEB1Ix~HE;W)WS8lWY
kvlXh;@!0(8F?onq`Ex5=A_-ok2XTHEP2O5)bK&uS0eaIPEdT%j

delta 1387
zcmYk6TWl0%6vuzlneNOE(^5*iblWbLVofh}tCUhKH$g=Tf+A9=B4wpTM4-}^ilDAY
z@kSM4yrH59Xrm@5HV#G-d^bM$=93BVV$u+zJ`!U6e_KMFWY0O@`Of`+z8$U@PiBAl
z_os`%9KQ6KMMs?VY%ruV&SO08vC-!VHu*Yqxor0F$hbV|<Fm!5fo_)`p8`5Owi^DF
zA=^BjHhjC!Gwd*Ary;wHSFa(@dhGV-lg$eHJqBF%_@o$gdCuoH!}t2k;CbV<&yf8l
z@e8q^|5B;?%;k$l^^&>Fy1eXi;OM0@R{Q7ytIsM}qEc0*!Ybl1`(*fyJ-w`vw96|2
zOKA<bm-}1}1`Kg1ylkfnUk!MT*8|?*O^fDmQ(i?l&nb^Ja@ZoBJAP+PEeL3&C15oV
zSxgHv?zHe*XHv^BZv_nVwne<Ee<0I0(9=C5;0W)y91S=|81OFXfcK2_J|6^psF;`S
zWa#DBO&aF7Mc&SSi+MNmObNH;2VTHOq%G#=lt1LB+7jC{gPFZegFRbzW(Kx3b@Xf*
z=<RFnHZ^@5@ChdZKIOB3lYAa<%H%rDnSd`iG1?US-Lh)KBD=<Juj?3fyrtIE2ElDU
z8%q(=qD^5Yo@l;Px|mK7=PuD8C+9Pp=A3R0Eyfn|*2>P8?w|1Mc-#El-{V}Mpz}P1
z#gik7N<C+D#FXM<$q`c{V)op4X}td8Daz_g<FjicN(_%E4Qu^WHZc^pM#irt-TDd7
zX+xgQN0M$tnL-yQ72!wRR_}j#$`w1|C7hm!isH&!iAE@CbB*Kl5&Q|M>Ku7g^9Pr-
zXNHey&umPy`<O18Ey7`nRw_Xe6_ipXvzeMvojOl5U)^t1=UbV}E?U_mc|UC&U;&3&
zNGN_>TXkBtU$Kg_T9SyhT;Ne9>r~oxT%m(MC6DQOU1bA*>rt5r@6(LCvQ#Q`tA;+L
z<P%a01I&}oQyJ&DTj^W{tX44#q`N}C5-*bOYED`#NnmgfOT-<nnN1f|o)T)^)qkl<
zxnI7HV*JK39uR=bWxJU8_%b!*y0lxi<FdkKr8eLOb=Gw%Zs3WPTxasQ3d_G`gyr&J
zyUVJWs@9t@YY|oj$?S~I!otGyR7cFT7o`m1b5fNjiH$I;zH)YbN|@i?<}@Uo%2Y&6
z(kbDNh+3Uf!mwt@7Vf_e<%yoP7giegM1wBsR?E3DqCR&uc20#)0Jv0$!6r4@O_>nN
zR<WHL{V~)Es%CmMuRWT;AS-pbMuzLj(#1h~IK&RgeR}%_h~=7KvqC&9D~EDT?-BiM
qO>SKdkvw_00(Fgaog{DSp#SE~jijkM8pQH&enBd334J{j*8K<nrv7*U

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 2b2f31fcb5412b0d23f981bfa542ae7612f211dd..3f080bfccc7d349a41baaab8e9a73e46fa56dc32 100644
GIT binary patch
delta 29
lcmZ3@wwg`k)W2Q(7#J8#7%aIMgc!7#8702&*(f5;3;>B%2p9kW

delta 29
lcmZ3@wwg`k)W2Q(7#J8#7%aIMgc!7#83No+Y!ne^1^|Za2dV%7

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 b7d618aef93a982a492f29551e5c042ab04ec7a5..ad97fde55eb11257e1605a5b2962016cd18d37af 100644
GIT binary patch
literal 7194
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

literal 4933
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
aa7&kSvJxUutRBE#wsM`%Wz_a~OaBK%th5dQ

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 234d65fdb6b136cf143a68625f322e0e3b28cb73..2c58e041a8ee36f25c437b1fd374b04ef62d9adf 100644
GIT binary patch
delta 3217
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

delta 3195
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
IyMjmm2kUgCApigX

diff --git a/simulator/src/com/verictas/pos/simulator/Node.java b/simulator/src/com/verictas/pos/simulator/Node.java
new file mode 100644
index 0000000..933a3a0
--- /dev/null
+++ b/simulator/src/com/verictas/pos/simulator/Node.java
@@ -0,0 +1,41 @@
+package com.verictas.pos.simulator;
+
+import javax.vecmath.Vector3d;
+
+/**
+ * Storage object for storing nodes on the graph
+ */
+public class Node extends Vector3d {
+    public int round;
+
+    /**
+     * Constructor for casting
+     * @param vector
+     */
+    public Node(Vector3d vector) {
+        this.set(vector);
+    }
+
+    /**
+     * Constructor for empty creation
+     */
+    public Node() {
+        this.set(new Vector3d(0,0,0));
+    }
+
+    /**
+     * Sets the stored round associated with this node
+     * (It will most likely be the round when this node is reached)
+     * @param round
+     */
+    public void setRound(int round) {
+        this.round = round;
+    }
+
+    public boolean empty() {
+        if (this.getX() == 0 && this.getY() == 0 && this.getZ() == 0) {
+            return true;
+        }
+        return false;
+    }
+}
diff --git a/simulator/src/com/verictas/pos/simulator/Simulator.java b/simulator/src/com/verictas/pos/simulator/Simulator.java
index e894b66..3b784a4 100644
--- a/simulator/src/com/verictas/pos/simulator/Simulator.java
+++ b/simulator/src/com/verictas/pos/simulator/Simulator.java
@@ -7,6 +7,12 @@ import com.verictas.pos.simulator.processor.ProcessingException;
 import com.verictas.pos.simulator.processor.Processor;
 
 public class Simulator {
+    public static int round = 0; // Stores an global integer value with the current round (as a timestamp)
+
+    /**
+     * Run method for the Simulator
+     * @param objects
+     */
     public static void run(Object[] objects) {
 
         /**
@@ -44,11 +50,13 @@ public class Simulator {
              * Start the rounds loop
              */
             for(int t = 0; t != rounds; t++) {
+                // Set round
+                Simulator.round++;
+
                 /**
                  * The round has started
                  */
-                //System.out.println("\nRound " + (t + 1) + " started!");
-                System.out.println("Round " + (t + 1) + " started!");
+                System.out.println("Round " + (Simulator.round + 1) + " started!");
 
                 for(int i = 0; i < objects.length; i++) {
                     objects[i].updatePosition(time);
@@ -64,7 +72,7 @@ public class Simulator {
                 /**
                  * Do the processing on the objects
                  */
-                processor.process(objects, t + 1);
+                processor.process(objects);
 
                 /**
                  * The round has ended
@@ -83,13 +91,20 @@ public class Simulator {
             long stopTime = System.currentTimeMillis();
             System.out.println("Simulation took: " + (stopTime - startTime) + "ms");
         } catch(ProcessingException e) {
+            System.out.println("\nERROR:: Processing failed.");
             e.printStackTrace();
         } catch(WritingException e) {
+            System.out.println("\nERROR:: Writing to file failed.");
             e.printStackTrace();
         }
     }
 
-    public static void accelerate(Object[] objects, Vector3dMatrix matrix) {
+    /**
+     * Accelerates the given objects, puts the results in the given matrix and enacts forces
+     * @param objects
+     * @param matrix
+     */
+    private static void accelerate(Object[] objects, Vector3dMatrix matrix) {
         // Loop
         for(int i = 0; i < objects.length; i++) {
             /**
@@ -109,27 +124,20 @@ public class Simulator {
 
                 Vector3d force = objects[i].getForceOnObject(objects[o]);
                 matrix.setPosition(force, i, o);
-                //System.out.println("Force " + (i + 1) + " on " + (o + 1) + " - " + force);
 
                 /**
                  * Also put in the opposite force
                  */
                 force.scale(-1);
                 matrix.setPosition(force, o, i);
-                //System.out.println("Force " + (o + 1) + " on " + (i + 1) + " - " + force);
             }
         }
 
-
-        //System.out.println("\n");
-        //System.out.println(matrix);
-
         for(int i = 0; i < objects.length; i++) {
             /**
              * Progress forces on the object
              */
             Vector3d forceOnI = matrix.getColumnTotal(i);
-            //System.out.println("All forces on " + (i + 1) + " - " + forceOnI);
             objects[i].enactForceOnObject(forceOnI);
         }
     }
diff --git a/simulator/src/com/verictas/pos/simulator/SimulatorConfig.java b/simulator/src/com/verictas/pos/simulator/SimulatorConfig.java
index e5fd69e..f24b667 100644
--- a/simulator/src/com/verictas/pos/simulator/SimulatorConfig.java
+++ b/simulator/src/com/verictas/pos/simulator/SimulatorConfig.java
@@ -5,7 +5,7 @@ public class SimulatorConfig {
      * Time settings
      */
 
-    public static int rounds = 526100 * 10; // Amount of rounds to run the simulator for
+    public static int rounds = 526100 * 35; // Amount of rounds to run the simulator for
     public static double time = 60; // Time steps in seconds
 
     /**
diff --git a/simulator/src/com/verictas/pos/simulator/processor/ObjectProcessor.java b/simulator/src/com/verictas/pos/simulator/processor/ObjectProcessor.java
index 04b82e1..bb88fd3 100644
--- a/simulator/src/com/verictas/pos/simulator/processor/ObjectProcessor.java
+++ b/simulator/src/com/verictas/pos/simulator/processor/ObjectProcessor.java
@@ -1,13 +1,18 @@
 package com.verictas.pos.simulator.processor;
 
+import com.verictas.pos.simulator.Node;
 import com.verictas.pos.simulator.Object;
+import com.verictas.pos.simulator.Simulator;
+import com.verictas.pos.simulator.SimulatorConfig;
+
 import javax.vecmath.Vector3d;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.Map;
 
 public class ObjectProcessor {
-    public Vector3d aphelion;
-    public Vector3d perihelion;
+    public Node aphelion;
+    public Node perihelion;
     public double aphelionDistance = -1;
     public double perihelionDistance = -1;
 
@@ -18,11 +23,14 @@ public class ObjectProcessor {
     public double lastStartDistance = -1;
     public double beforeLastStartDistance = -1;
 
-    public Vector3d ascendingNode;
-    public Vector3d descendingNode;
+    public Node ascendingNode;
+    public Node descendingNode;
+
+    public Node absoluteMax;
+    public Node absoluteMin;
 
-    public Vector3d absoluteMax;
-    public Vector3d absoluteMin;
+    public Node carryOverNode;
+    public int carryOverBit;
 
     public double referenceZ;
 
@@ -44,8 +52,8 @@ public class ObjectProcessor {
      * 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});
+    public void processHistory() {
+        this.history.put(Simulator.round, new Vector3d[] {this.thisObject.position, this.thisObject.speed});
     }
 
     /**
@@ -71,12 +79,14 @@ public class ObjectProcessor {
          */
 
         if (sunDistance > aphelionDistance) {
-            this.aphelion = this.thisObject.position;
+            this.aphelion = new Node(this.thisObject.position);
+            this.aphelion.setRound(Simulator.round);
             this.aphelionDistance = sunDistance;
         }
 
         if (sunDistance < perihelionDistance) {
-            this.perihelion = this.thisObject.position;
+            this.perihelion = new Node(this.thisObject.position);
+            this.perihelion.setRound(Simulator.round);
             this.perihelionDistance = sunDistance;
         }
     }
@@ -87,20 +97,36 @@ public class ObjectProcessor {
      */
 
     public void calculateTops() {
-        if (this.absoluteMax == null) {
-            this.absoluteMax = this.thisObject.position;
+        if (this.absoluteMax == null || this.absoluteMax.empty()) {
+            this.absoluteMax = new Node(this.thisObject.position);
+            this.absoluteMax.setRound(Simulator.round);
         }
 
-        if (this.absoluteMin == null) {
-            this.absoluteMin = this.thisObject.position;
+        if (this.absoluteMin == null || this.absoluteMin.empty()) {
+            this.absoluteMin = new Node(this.thisObject.position);
+            this.absoluteMin.setRound(Simulator.round);
         }
 
         if (this.thisObject.position.getZ() > this.absoluteMax.getZ()) {
-            this.absoluteMax = this.thisObject.position;
+            /**
+             * If the next maximum is more than 50 timesteps removed from the last, we've a problem
+             */
+            if (Simulator.round > this.absoluteMax.round + (SimulatorConfig.time * 500)) {
+                System.out.println("ERROR: I already have a maximum (" + this.absoluteMax + "), but a new one (" + this.thisObject.position + ") has presented itself.");
+            }
+            this.absoluteMax = new Node(this.thisObject.position);
+            this.absoluteMax.setRound(Simulator.round);
         }
 
         if (this.thisObject.position.getZ() < this.absoluteMin.getZ()) {
-            this.absoluteMin = this.thisObject.position;
+            /**
+             * If the next minimum is more than 50 timesteps removed from the last, we've a problem
+             */
+            if (Simulator.round > this.absoluteMin.round + (SimulatorConfig.time * 500)) {
+                System.out.println("ERROR: I already have a minimum (" + this.absoluteMin + "), but a new one (" + this.thisObject.position + ") has presented itself.");
+            }
+            this.absoluteMin = new Node(this.thisObject.position);
+            this.absoluteMin.setRound(Simulator.round);
         }
     }
     /**
@@ -108,40 +134,113 @@ public class ObjectProcessor {
      */
 
     public void processNodes() {
-        this.referenceZ = (this.absoluteMin.getZ() + this.absoluteMax.getZ()) / 2;
+        /**
+         * Determine how the starting positions are
+         */
+
+        /**
+         * Carry out carry over checking
+         */
+
+        if (this.carryOverNode != null) {
+            // There is a node present in memory from last round. We should check what the carryOverBit is, to see if it's a maximum or a minimum
+            if (this.carryOverBit == 1) {
+                // Last rounds node is a maximum, we're searching for a descending node
+                Node result = this.findNode(this.absoluteMin, this.carryOverNode);
+
+                if (!result.empty()) {
+                    System.out.println("INFO:: Found descending node in round " + result.round + "\n");
+                    this.descendingNode = result;
+                }
+            } else {
+                // Last rounds node is a minimum, we're searching for an ascending node
+                Node result = this.findNode(this.carryOverNode, this.absoluteMax);
+
+                if (!result.empty()) {
+                    System.out.println("INFO:: Found ascending node in round " + result.round + "\n");
+                    this.ascendingNode = result;
+                }
+            }
+
+            // Cleaning up
+            this.carryOverNode = null;
+            this.carryOverBit = -1;
+        }
+
+        /**
+         * Carry out the normal checking
+         */
+
+        double minRound = this.absoluteMin.round;
+        double maxRound = this.absoluteMax.round;
+
+        if (minRound < maxRound) {
+            // The minimum came before the maximum node, we're expecting to find the ascending node between the two
+            // The maximum node should remain in memory to find the descending node next round
+
+            Node result = this.findNode(this.absoluteMin, this.absoluteMax);
+
+            if (!result.empty()) {
+                System.out.println("INFO:: Found ascending node in round " + result.round + "\n");
+                this.ascendingNode = result;
+            }
+
+            this.carryOverNode = this.absoluteMax;
+            this.carryOverBit = 1;
+            this.cleanHistory(this.absoluteMax.round);
+        } else {
+            // The maximum came before the minimum node, we're expecting to find the descending node between the two
+            // The minimum node should remain in memory to find the ascending node next round
+
+            Node result = this.findNode(this.absoluteMin, this.absoluteMax);
+
+            if (!result.empty()) {
+                System.out.println("INFO:: Found descending node in round " + result.round + "\n");
+                this.descendingNode = result;
+            }
+
+            this.carryOverNode = this.absoluteMin;
+            this.carryOverBit = 0;
+            this.cleanHistory(this.absoluteMin.round);
+        }
+
+    }
+
+    private Node findNode(Node min, Node max) {
+        this.referenceZ = (min.getZ() + max.getZ()) / 2;
+        System.out.println("INFO:: Called node finder with min: " + min + " (round " + min.round + ") and max: " + max + " (round " + max.round + ") and a reference height of " + referenceZ);
+        Node returnNode = new Node();
 
-        // 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!
+            boolean roundCheck;
+
+            if (min.round < max.round) {
+                roundCheck = min.round < round && round < max.round;
+            } else {
+                roundCheck = max.round < round && round < min.round;
+            }
+
+            if ((this.history.get(round + 1) != null) && roundCheck) {
+                // There is a next key and this key is within logical bounds
+
                 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 {
-                        // Ascending
-                        this.ascendingNode = vectorArray[0];
-                        System.out.println("INFO:: Found a ascending node at round " + round + " at position: " + vectorArray[0]);
-                    }
+                    returnNode = new Node(vectorArray[0]);
+                    returnNode.setRound(round);
                 } 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 {
-                        // Descending
-                        this.descendingNode = vectorArray[0];
-                        System.out.println("INFO:: Found a descending node at round " + round + " at position: " + vectorArray[0]);
-                    }
+                    returnNode = new Node(vectorArray[0]);
+                    returnNode.setRound(round);
                 }
             }
         }
+
+        if (!returnNode.empty()) {
+            return returnNode;
+        } else {
+            return new Node();
+        }
     }
 
     /**
@@ -194,13 +293,25 @@ public class ObjectProcessor {
         perihelionDistance = -1;
         lastStartDistance = -1;
         beforeLastStartDistance = -1;
-        aphelion = null;
-        perihelion = null;
-        ascendingNode = null;
-        descendingNode = null;
-        history = new HashMap<>();
-        absoluteMax = null;
-        absoluteMin = null;
+        aphelion = new Node();
+        perihelion = new Node();
+        ascendingNode = new Node();
+        descendingNode = new Node();
+        absoluteMax = new Node();
+        absoluteMin = new Node();
         referenceZ = -1;
     }
+
+    /**
+     * Clears all entries from history before the given key
+     * @param key
+     */
+    public void cleanHistory(int key) {
+        for(Iterator<Map.Entry<Integer, Vector3d[]>> it = this.history.entrySet().iterator(); it.hasNext(); ) {
+            Map.Entry<Integer, Vector3d[]> entry = it.next();
+            if(entry.getKey() < key) {
+                it.remove();
+            }
+        }
+    }
 }
diff --git a/simulator/src/com/verictas/pos/simulator/processor/Processor.java b/simulator/src/com/verictas/pos/simulator/processor/Processor.java
index 67d6d01..a0ace51 100644
--- a/simulator/src/com/verictas/pos/simulator/processor/Processor.java
+++ b/simulator/src/com/verictas/pos/simulator/processor/Processor.java
@@ -1,6 +1,7 @@
 package com.verictas.pos.simulator.processor;
 
 import com.verictas.pos.simulator.Object;
+import com.verictas.pos.simulator.Simulator;
 import com.verictas.pos.simulator.SimulatorConfig;
 import com.verictas.pos.simulator.dataWriter.DataWriter;
 import com.verictas.pos.simulator.dataWriter.WritingException;
@@ -37,7 +38,7 @@ public class Processor {
         }
     }
 
-    public void process(Object[] objectArray, int rounds) throws ProcessingException, WritingException {
+    public void process(Object[] objectArray) throws ProcessingException, WritingException {
         HashMap<String, Object> objects = objectArrayToHashMap(objectArray);
 
         /**
@@ -48,7 +49,7 @@ public class Processor {
 
             object.setObjectData(objects.get(objectName));
             object.setReferenceObjectData(objects.get(SimulatorConfig.sunName));
-            object.processHistory(rounds);
+            object.processHistory();
 
             // Check if the object has gone round last round
 
@@ -58,9 +59,9 @@ public class Processor {
                 object.processNodes();
 
                 // ECHO:: Object has gone full circle last round!
-                System.out.println("\n\n============== ROTATION DATA: " + objectName.toUpperCase() + ", ROUND " + (rounds - 1) + " =============");
+                System.out.println("\n\n============== ROTATION DATA: " + objectName.toUpperCase() + ", ROUND " + (Simulator.round - 1) + " =============");
 
-                if (SimulatorConfig.outputUnit == "AU") {
+                if (SimulatorConfig.outputUnit.equals("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));