From 29c14837eb9a0396635658cb8f7bf2e15a1bd7f9 Mon Sep 17 00:00:00 2001
From: Christiaan Goossens <contact@verictas.nl>
Date: Thu, 15 Sep 2016 14:10:06 +0200
Subject: [PATCH] Cleanup and comments

---
 simulator/.idea/workspace.xml                 | 271 +++++++-----------
 .../com/verictas/pos/simulator/Object.class   | Bin 4074 -> 3931 bytes
 .../verictas/pos/simulator/Simulator.class    | Bin 3856 -> 3816 bytes
 .../pos/simulator/SimulatorConfig.class       | Bin 501 -> 501 bytes
 .../pos/simulator/dataWriter/DataWriter.class | Bin 3715 -> 3791 bytes
 .../src/com/verictas/pos/simulator/Main.java  |   2 +-
 .../com/verictas/pos/simulator/Object.java    |   3 -
 .../com/verictas/pos/simulator/Simulator.java |  20 +-
 .../pos/simulator/dataWriter/DataWriter.java  |  47 ++-
 .../verictas/pos/simulator/mathUtils/AU.java  |  21 ++
 10 files changed, 180 insertions(+), 184 deletions(-)

diff --git a/simulator/.idea/workspace.xml b/simulator/.idea/workspace.xml
index 19765a5..476807e 100644
--- a/simulator/.idea/workspace.xml
+++ b/simulator/.idea/workspace.xml
@@ -7,8 +7,11 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="17f368cb-44f8-4101-9a29-49a0f4ff1f92" name="Default" comment="Update workspace">
-      <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/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/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/AU.java" afterPath="$PROJECT_DIR$/src/com/verictas/pos/simulator/mathUtils/AU.java" />
     </list>
     <ignored path="simulator.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -29,75 +32,7 @@
     <favorites_list name="simulator" />
   </component>
   <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <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="362">
-              <caret line="30" column="0" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="Simulator.java" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/Simulator.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="153">
-              <caret line="45" column="0" selection-start-line="45" selection-start-column="0" selection-end-line="45" selection-end-column="0" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </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="153">
-              <caret line="9" column="1" selection-start-line="9" selection-start-column="1" selection-end-line="9" selection-end-column="1" />
-              <folding />
-            </state>
-          </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="1479">
-              <caret line="87" column="5" selection-start-line="87" selection-start-column="5" selection-end-line="87" selection-end-column="5" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="e#3621#3622#0" expanded="true" />
-                <element signature="e#3656#3657#0" expanded="true" />
-              </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="665">
-              <caret line="42" column="16" selection-start-line="42" selection-start-column="16" selection-end-line="42" selection-end-column="16" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="e#1090#1091#0" expanded="true" />
-                <element signature="e#1161#1162#0" 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" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
   </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
@@ -133,12 +68,12 @@
         <option value="$PROJECT_DIR$/src/com/verictas/pos/simulator/WritingException.java" />
         <option value="$PROJECT_DIR$/src/com/verictas/pos/simulator/DataWriter.java" />
         <option value="$PROJECT_DIR$/src/com/verictas/pos/simulator/dataWriter/WritingException.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/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/Main.java" />
         <option value="$PROJECT_DIR$/src/com/verictas/pos/simulator/dataWriter/DataWriter.java" />
-        <option value="$PROJECT_DIR$/src/com/verictas/pos/simulator/SimulatorConfig.java" />
-        <option value="$PROJECT_DIR$/src/com/verictas/pos/simulator/Simulator.java" />
       </list>
     </option>
   </component>
@@ -224,46 +159,6 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="simulator" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="simulator" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="simulator" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="simulator" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="simulator" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="simulator" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="dataWriter" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
         </subPane>
       </pane>
     </panes>
@@ -568,7 +463,7 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-1928" y="-8" width="1936" height="1056" extended-state="6" />
-    <editor active="true" />
+    <editor active="false" />
     <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" />
@@ -578,11 +473,11 @@
       <window_info id="Event Log" 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="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.23890063" sideWeight="0.5" 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="true" show_stripe_button="true" weight="0.71881604" sideWeight="0.5" 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="Project" active="true" 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="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" />
@@ -614,7 +509,7 @@
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="3" />
+      <option name="time" value="7" />
     </breakpoint-manager>
     <watches-manager />
   </component>
@@ -667,13 +562,18 @@
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding>
             <element signature="imports" expanded="true" />
-            <element signature="e#1090#1091#0" expanded="true" />
-            <element signature="e#1161#1162#0" 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#0;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>
@@ -741,13 +641,18 @@
           <caret line="40" column="21" selection-start-line="40" selection-start-column="21" selection-end-line="40" selection-end-column="21" />
           <folding>
             <element signature="imports" expanded="true" />
-            <element signature="e#1090#1091#0" expanded="true" />
-            <element signature="e#1161#1162#0" 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#0;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>
@@ -788,13 +693,18 @@
           <caret line="40" column="21" selection-start-line="40" selection-start-column="21" selection-end-line="40" selection-end-column="21" />
           <folding>
             <element signature="imports" expanded="true" />
-            <element signature="e#1090#1091#0" expanded="true" />
-            <element signature="e#1161#1162#0" 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#0;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>
@@ -835,13 +745,18 @@
           <caret line="40" column="21" selection-start-line="40" selection-start-column="21" selection-end-line="40" selection-end-column="21" />
           <folding>
             <element signature="imports" expanded="true" />
-            <element signature="e#1090#1091#0" expanded="true" />
-            <element signature="e#1161#1162#0" 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#0;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>
@@ -882,13 +797,18 @@
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding>
             <element signature="imports" expanded="true" />
-            <element signature="e#1090#1091#0" expanded="true" />
-            <element signature="e#1161#1162#0" 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#0;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>
@@ -919,13 +839,18 @@
           <caret line="15" column="0" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
           <folding>
             <element signature="imports" expanded="true" />
-            <element signature="e#1090#1091#0" expanded="true" />
-            <element signature="e#1161#1162#0" 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#0;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>
@@ -983,14 +908,6 @@
         </state>
       </provider>
     </entry>
-    <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="681">
-          <caret line="116" column="5" selection-start-line="116" selection-start-column="5" selection-end-line="116" selection-end-column="5" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://C:/Program Files/Java/jdk1.8.0_91/src.zip!/java/lang/Exception.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="238">
@@ -999,26 +916,10 @@
         </state>
       </provider>
     </entry>
-    <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="357">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="26" selection-end-line="21" selection-end-column="26" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/dataWriter/WritingException.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="102">
-          <caret line="6" column="62" selection-start-line="6" selection-start-column="62" selection-end-line="6" selection-end-column="62" />
-          <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="362">
-          <caret line="30" column="0" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" />
+        <state relative-caret-position="331">
+          <caret line="20" column="0" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
@@ -1027,29 +928,32 @@
     </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="665">
-          <caret line="42" column="16" selection-start-line="42" selection-start-column="16" selection-end-line="42" selection-end-column="16" />
+        <state relative-caret-position="430">
+          <caret line="162" column="0" selection-start-line="162" selection-start-column="0" selection-end-line="162" selection-end-column="0" />
           <folding>
             <element signature="imports" expanded="true" />
-            <element signature="e#1090#1091#0" expanded="true" />
-            <element signature="e#1161#1162#0" 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#0;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/dataWriter/DataWriter.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="1479">
-          <caret line="87" column="5" selection-start-line="87" selection-start-column="5" selection-end-line="87" selection-end-column="5" />
+        <state relative-caret-position="187">
+          <caret line="11" column="23" selection-start-line="11" selection-start-column="23" selection-end-line="11" selection-end-column="23" />
           <folding>
             <element signature="imports" expanded="true" />
-            <element signature="e#3621#3622#0" expanded="true" />
-            <element signature="e#3656#3657#0" expanded="true" />
           </folding>
         </state>
       </provider>
@@ -1062,12 +966,45 @@
         </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/mathUtils/AU.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="153">
-          <caret line="45" column="0" selection-start-line="45" selection-start-column="0" selection-end-line="45" selection-end-column="0" />
+        <state relative-caret-position="578">
+          <caret line="56" column="7" selection-start-line="56" selection-start-column="7" selection-end-line="56" selection-end-column="7" />
+          <folding>
+            <element signature="method#convertToMeter#0;class#AU#0" expanded="false" />
+            <element signature="method#convertToMetersPerSecond#0;class#AU#0" expanded="false" />
+            <element signature="method#convertFromMeter#0;class#AU#0" expanded="false" />
+            <element signature="method#convertFromMetersPerSecond#0;class#AU#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <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="1887">
+          <caret line="116" column="5" selection-start-line="116" selection-start-column="5" selection-end-line="116" selection-end-column="5" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/dataWriter/WritingException.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="102">
+          <caret line="6" column="62" selection-start-line="6" selection-start-column="62" selection-end-line="6" selection-end-column="62" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <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="1054">
+          <caret line="132" column="21" selection-start-line="132" selection-start-column="21" selection-end-line="132" selection-end-column="21" />
           <folding>
             <element signature="imports" expanded="true" />
+            <element signature="method#DataWriter#0;class#DataWriter#0" expanded="false" />
+            <element signature="method#write#0;class#DataWriter#0" expanded="false" />
+            <element signature="method#write#1;class#DataWriter#0" expanded="false" />
+            <element signature="method#save#0;class#DataWriter#0" expanded="false" />
           </folding>
         </state>
       </provider>
diff --git a/simulator/out/production/simulator/com/verictas/pos/simulator/Object.class b/simulator/out/production/simulator/com/verictas/pos/simulator/Object.class
index b695225af7f32045b6c077ef63e8959c7eb7024a..4cebda66660ce5529260adf0b576bb36a4576114 100644
GIT binary patch
literal 3931
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
F{{iv@q%r^i

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

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 2e53d9ec01732073423466765343286449e06a50..62132d5112b86f5de1f226f723bb566a4a0a4fb2 100644
GIT binary patch
delta 1578
zcmZXUS#T6p6o$V$J=5LOv{RapWynkz6c7>(m_Q(5k-@OZq67tlkwp>|hzSxl!!iOv
z+(lbNQ4|r4f+$Hy2NO+Hswl-Os}x`K$w$j4AAC?;;<+=?LhXmY|9kuV=bm%VKXb6~
zhj{AZpFMrR1kO85Vr7_BtPXQ8Yi#Nq>RIc^;y#P}9W2&atak|Ounjb5ctAs=h9(Ug
zH9V+8HaV2jY_ZuPo0T?O^n0s@Z8qEW`yqW+s>Kn-4h=gs?9$rZHYuBjb<iH0y%zf%
zuA|jrzr!dV(QyYfJgRGY%;s^MCv2Y7@lTokKS?|C=+LKap3zMl)Pc|1Jf~Hj#q$=2
z6z0@*jh%+Nq@0D)pR^_idEW>6vL{nv@q)`DW?CF}d6AdAcB3S6#N}mPaXHGXiZbsS
zv%otQ$hTc4^O|COdgEJ_Q(|$<<#mp`yuosp6B^#s@Ro))s$AaY9hYU?rO5O4g!85=
zET_6@OJiNa<s_#xysHQ&nm4cBw7I@+gv)8(bGb!p-{*`=I~6V+nsrhk)kVFZgJX@8
zob?i+8D<w1id^rjaPClDo$u1kIhPOUap~nl?_el@+(|xi>Enz-Il8famyh{G5lJ>Q
zB-S=<T2tSgXlj&tKINQZq;xm3^S99F%KO6V3I&^2Z>{g#ZSPgJ<>DLt7$`ZaLa<U+
z<K(U69V+TZwF?O_MbJ!d+DsMhW&)VTbXkSDnHjPp;y@d=%n!A|t96=_M>{Zj$*$>U
zXjYC-ZjKpT<&&3{FWe{U6Y5}Cg=Lh7bHYV^$B7o@giG@+p8`#MV&3Q>g(~jN8dAAr
zO*G_FC<(KMi|!oeB=d^w3CWmiChC1gWL^7D_BNc#kk*ZCm-^x=sj9?|M!KIC3cas~
z6sO8LB$XeLzD`I#r=_E_!h1-{ozCGRbGgJk6=06CDOC{`t8A)O0e7kdOI4B@$+=9;
z7DLQudHQx*<bK8qOEOb#?I`gy3v-@XgX{>6+7M#x#uUe7TL+Goq_gG7kR%=<$Iio)
zv>|R~zMxzw3s@-E9aM9*zont8)l_bixPY`aj@wyGkZOrY;tWUyro|E!w7A2PV&O7V
ze#cgSP-3Xd#5Dhvs;bL`2AGJ%Wr9%_OHCQ7csw&y^_{GA1*S1ArpMG#6f5mzR81rj
z>1MRg_1=Q3@>63fgT>KcEbcS*ioq1gFk+dh7YmJN=nX=nL7y8lE{Fz)QsOgS^zqpL
z^@Ad<A58TheXF6`QUeXG0o69JNL%Elw6zRTln&NhSuBam^vAyqIpN>wq?EyGq&r~~
z)7dWQA3(-1OUV(wLJVF<K5I#^UjC>yFh+)1MpH^$wNaK^Xl5%r*v2UdY8OE_JLzW^
z7fA6X`}l@deqlcYq*RClY0u0RFO;#J8u3t&VI1ae8L=Uw?MizlAgW?&<*UJG;#2Ld
afF8-9DNtcE?Epo!_hV$Zb&u2<V8vg89WcxQ

delta 1608
zcmZXUS#T6p6o$V$-P7IEX;KmhWXMdMD8wuV3qpb!1ldJ|h@gb9gajB|2mul{*~Umj
z1Vp4!6gR{rDp5%y6BY?>MOi$k50s_li;wywkCKYUb0=t__QT)j_C4o6=iKw({v~=S
zFM0XTb3MQ~zH+&fx)AlO2(gk?4hfglJnYKi5t~O{Y#y^&;}X(t4XoABs9~Lk^%^#4
zXwojtF5}r~;8=V0a+A$wmu%`Bw&?d(4Uan{w`pU$PP@aE*qs`7X-GOe;n1SDpLE!5
z)9Nykr)>7P6!5fm5#|P-(S_}E*za(_;aTl}(7Je4dXh)GKId>qck;Y;JnZ1>s3SHn
z*u1DZuKl3gDrrwTlNA0>fu13i#BGjx+|M+dmpoqPnBQ)U&V0q=RbKOWoi`L^{$Qgl
z=uydWKW3JXe$(RwZ+X1U5|4K@ysM#2!+Xr|c%KhE7E$AIlDNOiEGTW~LyvYoQiNj7
z8|#}kCRXKpe9S42={ll=PLD3)9-q)D6@>lY%p#+m(|&GnvXK&&+F<U&O1eGHaMt4-
z=RH2<g2I})u4!c=rZ8jc8s%lgN@F@zkH<wi70T7EeCF{vUnnxCG&ICk>xgFU?(rpO
zyS@!xRY9}4esjXVV0Q;2g|mz1_$}t}uA|N>HDtVKMLz~gP9QEg!OwJumE9%ZELnlW
zL_sfY2bsj(vI;SoDcTnTm&L;cwZgA<o2$FBt*jyIk1;qLOfmF4p_*>oc(4=WJlSFo
z%Nm{{C)+aXQiQWch@B!gg*ZeiZKEQT9V+fQLAW?OG&aXh5!FVDJU=5NPu=VnXT%rG
zO*0E&R!ri~V2!tKV9yuEVOA`W;+Cvi|6y;_HR!le9a42vRjb7!K?B|89`gO}jFMzI
zJE)*V#J*2DJ}Ld3Vw#L%x}4$+E{pvgv-qAWeilLf$~=`rmC9qR8p$G6M2#B5QdPk+
zRZX4n*Q%u~SM_oq^!aU*6D*Q^Q-#M8Ekx5+h#!Spe+wlgU89zZXuFXVGt-U*LVAy+
z4GM8S_c9wxXoK9x96>pB=1M_es#>jbY3?R9pLyaJkTz%V0P`_fARbf6=$8sCn+KI?
z^N`I#nQku=`fyb4ACwjvs+WjfU1NGL!G6jS#{qAYO|>O+7v1Z*A08A=7Sv>BW_EL1
zib7*jRFCaQG;$oPjRVDzvBgoDTT$FB37e5<isBn)R3dYU3<%(MF{1-!shD9i#pnS+
zgw3Jckz$O*M<f4_kDAG}f;7Q(uKy6U8mg_op*0{_rPU(kXc<cKGGk&ymm4n;;&FQO
zZ*7+Un@t$6S0fF{q9V<9sY8y_AgRT(P<~R7kSnl;9M%$J1EXl7kWG}aSuV&H+1Wue
zJK4@Ik=0uH8zksvw_M;>E{XiU5y4$yKfiN;e)gy!2h)<7B}yn`D~nkoGaSKDmdb<;
zne1sTnfYQ|p@e0!ZSb{(XdMMa6xMZ7XiEz~r3H|K-A6$6F<cGmWv@)QPsGwInpD(E
I69Jb01!@97X8-^I

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 753140b8ac392a5d52cb0b81e41fadcb762a3d02..8bfdb3e415a07b3bc54b14244ff8010a38b910ab 100644
GIT binary patch
delta 27
icmey${FQmbBSv9X237_(25tsU21W*P1_lNu1_=OK3Ipu`

delta 27
hcmey${FQmbBSv8s238>CW?*ArWDsXyU|?d9003FX1Lyz%

diff --git a/simulator/out/production/simulator/com/verictas/pos/simulator/dataWriter/DataWriter.class b/simulator/out/production/simulator/com/verictas/pos/simulator/dataWriter/DataWriter.class
index 291bae48f6b88739d8b59789e0b578f758286df8..34305e7c13bc15d78725c56b7b056d95c3b11b3a 100644
GIT binary patch
delta 641
zcma)2O=}ZT6g^Xu&SWyiCW=Oz(Wf=mhNhy$*eX<7(b}fgVxlNQYn*x7p>al@6S8yT
z!f!1;5xOae8^Mp7RzjdI#I;oX11|j?-U$k`l*@bf9NxX>-t+F6Kg`8fOvi5A*YH5Y
zLmiLc>3EDM!Sz(fGd$NC%|;~GSDxq0=68I@t@w`TvKvm7Gs~-0ZMWBF*9i+=@wq)9
z??%&wLdm<uS<PK=y}HY|5T0P3Wz~e>HmlDEy>;P`*iGhp%qQ(YPkxT(%Ld+IL_z=P
z|M%@xpu|+XSMkBXN30n5gcTJ_1{zqUH+?PB`CIAQa$7jAU-B!~LRnNS{zCgMe`#~c
zEOy~IhM-^=KnHSb)3L8gY#o~@fHAove%MHz>u;iG9o<(_`{hi0`?VZ&dK`d?LrCHX
zG8jY_M~Mv+D-b(IF@#Z^paU=x8$<$UaF%9}EG95XIY8z1^djLHBFU{&DrOS$TYPFZ
z+k{4Q4^T?AaSOd6nh)a^4u<H?NSH)JB;DCUUm%#1Rl`*Od0I3w*%5MclH81un^Sm+
z(^#f0U(?QSFpjsh`6`O?r?Fv9Q{{Q8ynr-H*n>;hM=pAB5qVseUpCJwS7mpiXwJ30
R8}zrpw!e-QSj0MD{{cVMl0^Uj

delta 575
zcmY+ATWb?h6otQ2lg_1MG_9o3cH+cdv|<!2XjNLY-g^<XEkPfGAqEYFnKA_Z0X}%Y
z9ua&I#1}!Wj)55PL4Se%0l_zahdVJ3BL~jj>+E&bS?m0CZ@EuicqX?^?%3QVu(`+m
z_V&Q$A&*QR+vK8Vlo-quuLr?e-a8&v%k^5|d(|)u!n}T(%;s|4*^0mF2RD7M@*hY4
zP8N<R2D+qTSgTjNw-w4VcxUk5;REXqA6Yke>F|k2X12p;W*S#||0tEwk(tqf+1R{k
zEv)(VrFyxtx*V1(Rqa{j^eEdn%oK`4Ko1j*XV!ORHP|2vX7pZXNZ;to<Wq}Z8M@Rz
z@&)%>B=j`<*iTMaM};?zrK7&V*(o_Yz$6Em7TIGm@q{sn%_+`^yeM*(IjQY#x%2S6
z^cIQqz=FYfTc@0b(r6QNPm?hz{hhwWcnlWeeT$tjxHS<6$r#A?w%FAcoX{=DHFp1t
zqklQWW78PoCM|x4ndLbrcqMLMbCNgW`z@#CJLj~!@rS!8%yYuLK$eSaXN4UsF(OF{
d6t$TusmuCWYThk%vODrmu%(+=Q4!R`)xQP;dSw6r

diff --git a/simulator/src/com/verictas/pos/simulator/Main.java b/simulator/src/com/verictas/pos/simulator/Main.java
index 81e3964..d5c96c3 100644
--- a/simulator/src/com/verictas/pos/simulator/Main.java
+++ b/simulator/src/com/verictas/pos/simulator/Main.java
@@ -16,7 +16,7 @@ public class Main {
      * The MIT License (MIT)
      * Copyright (c) 2016 Christiaan Goossens (Verictas) & Daniel Boutros
      *
-     * The full license is included in the git respository as LICENSE.md
+     * The full license is included in the git repository as LICENSE.md
      */
 
     public static void main(String[] args) {
diff --git a/simulator/src/com/verictas/pos/simulator/Object.java b/simulator/src/com/verictas/pos/simulator/Object.java
index a495488..a4ef64d 100644
--- a/simulator/src/com/verictas/pos/simulator/Object.java
+++ b/simulator/src/com/verictas/pos/simulator/Object.java
@@ -25,9 +25,6 @@ public class Object {
         this.mass = mass;
         this.position = position;
         this.speed = speed;
-
-        System.out.println(speed);
-
         this.oldAcceleration = new Vector3d(0,0,0);
         this.acceleration = new Vector3d(0,0,0);
     }
diff --git a/simulator/src/com/verictas/pos/simulator/Simulator.java b/simulator/src/com/verictas/pos/simulator/Simulator.java
index 373ef73..5213405 100644
--- a/simulator/src/com/verictas/pos/simulator/Simulator.java
+++ b/simulator/src/com/verictas/pos/simulator/Simulator.java
@@ -13,13 +13,16 @@ public class Simulator {
          */
 
         int rounds = SimulatorConfig.rounds;
+        double time = SimulatorConfig.time;
 
         /**
          * Log a debug message to the console to signal the simulation has started
          */
         System.out.println("========== Simulation Started ==========\n");
 
-        // Create a timer
+        /**
+         * Create a time to measure runtime
+         */
         long startTime = System.currentTimeMillis();
 
         /**
@@ -52,10 +55,6 @@ public class Simulator {
                  * The round has started
                  */
                 System.out.println("\nRound " + (t + 1) + " started!");
-                /**
-                 * Define the initial values
-                 */
-                double time = SimulatorConfig.time;
 
                 for(int i = 0; i < objects.length; i++) {
                     objects[i].updatePosition(time);
@@ -64,15 +63,14 @@ public class Simulator {
 
                 accelerate(objects, matrix);
 
-                /**
-                 * Print the matrix for this round
-                 */
-
                 for(int i = 0; i < objects.length; i++) {
                     objects[i].updateSpeed(time);
                     writer.write(objects[i].name, objects[i].position, objects[i].speed, objects[i].oldAcceleration, objects[i].acceleration, objects[i].mass);
                 }
 
+                /**
+                 * The round has ended
+                 */
             }
 
             /**
@@ -81,7 +79,9 @@ public class Simulator {
             writer.save();
             System.out.println("========== Simulation Finished ==========");
 
-            // Display time info
+            /**
+             * Display information about the program runtime
+             */
             long stopTime = System.currentTimeMillis();
             System.out.println("Simulation took: " + (stopTime - startTime) + "ms");
         } catch(WritingException e) {
diff --git a/simulator/src/com/verictas/pos/simulator/dataWriter/DataWriter.java b/simulator/src/com/verictas/pos/simulator/dataWriter/DataWriter.java
index f1798dd..1ba69f9 100644
--- a/simulator/src/com/verictas/pos/simulator/dataWriter/DataWriter.java
+++ b/simulator/src/com/verictas/pos/simulator/dataWriter/DataWriter.java
@@ -13,25 +13,39 @@ import java.util.Date;
 public class DataWriter {
     private FileWriter writer = null;
 
-    // Delimiter used in text file (for import in Excel)
+    /**
+     * Set global variables, such as the delimiter and the new line character
+     */
     private static final String DELIMITER = "\t";
     private static final String NEW_LINE = "\n";
 
     private int counter = 0;
 
+    /**
+     * Constructor
+     * @throws WritingException
+     */
     public DataWriter() throws WritingException {
         try {
-            // Define the save path
+            /**
+             * Define the save path
+             */
             String directory =  System.getProperty("user.home") + File.separator + "simulatorExports";
             File directoryPath = new File(directory);
 
             String path = directory + File.separator + getCurrentTimeStamp() + ".txt";
             System.out.println("WRITING DATA TO: " + path);
 
+            /**
+             * Check if the saving directory exists to prevent IOException
+             */
             if (!directoryPath.exists()) {
                 directoryPath.mkdirs();
             }
 
+            /**
+             * Open a file to write to and write the header
+             */
             this.writer = new FileWriter(path);
             this.writer.write("Object" + DELIMITER + "Position (m)" + DELIMITER + "Position (AU)" + DELIMITER + "Speed (m/s)" + DELIMITER + "Speed (AU/day)" + DELIMITER + "Old Acceleration" + DELIMITER + "Acceleration" + DELIMITER + "Mass" + NEW_LINE);
             this.counter++;
@@ -42,6 +56,11 @@ public class DataWriter {
         }
     }
 
+    /**
+     * Writes a string to the file
+     * @param string
+     * @throws WritingException
+     */
     public void write(String string) throws WritingException {
         if (this.writer == null) {
             throw new WritingException("The writer isn't defined yet");
@@ -58,6 +77,16 @@ public class DataWriter {
         }
     }
 
+    /**
+     * Writes some data about the current object to the file
+     * @param id String
+     * @param position Vector3d
+     * @param speed Vector3d
+     * @param oldAcceleration Vector3d
+     * @param acceleration Vector3d
+     * @param mass double
+     * @throws WritingException
+     */
     public void write(String id, Vector3d position, Vector3d speed, Vector3d oldAcceleration, Vector3d acceleration, double mass) throws WritingException {
         if (this.writer == null) {
             throw new WritingException("The writer isn't defined yet");
@@ -74,6 +103,10 @@ public class DataWriter {
         }
     }
 
+    /**
+     * Saves the file to disk
+     * @throws WritingException
+     */
     public void save() throws WritingException {
         if (this.writer == null) {
             throw new WritingException("The writer isn't defined yet");
@@ -87,11 +120,19 @@ public class DataWriter {
         }
     }
 
+    /**
+     * Gets the current line count
+     * @return int
+     */
     public int getLines() {
         return this.counter;
     }
 
-    public String getCurrentTimeStamp() {
+    /**
+     * Gets the current filestamp for file naming
+     * @return String
+     */
+    private String getCurrentTimeStamp() {
         return new SimpleDateFormat("yyyy-MM-dd_HH-mm-ss").format(new Date());
     }
 }
diff --git a/simulator/src/com/verictas/pos/simulator/mathUtils/AU.java b/simulator/src/com/verictas/pos/simulator/mathUtils/AU.java
index 5c8463e..acf2ace 100644
--- a/simulator/src/com/verictas/pos/simulator/mathUtils/AU.java
+++ b/simulator/src/com/verictas/pos/simulator/mathUtils/AU.java
@@ -6,6 +6,12 @@ public  class AU {
     /**
      * Helper class for working with astronomical units
      */
+
+    /**
+     * Converts AU to meters
+     * @param input Vector3d with values in AU
+     * @return Vector3d with values in meter
+     */
     public static Vector3d convertToMeter(Vector3d input) {
         Vector3d output = new Vector3d(input);
 
@@ -16,6 +22,11 @@ public  class AU {
         return output;
     }
 
+    /**
+     * Converts AU/day to m/s
+     * @param input Vector3d with values in AU/day
+     * @return Vector3d with values in m/s
+     */
     public static Vector3d convertToMetersPerSecond(Vector3d input) {
         Vector3d output = new Vector3d(input);
 
@@ -25,6 +36,11 @@ public  class AU {
         return output;
     }
 
+    /**
+     * Converts meters to AU for data collection
+     * @param input Vector3d with values in meters
+     * @return Vector3d with values in AU
+     */
     public static Vector3d convertFromMeter(Vector3d input) {
         Vector3d output = new Vector3d(input);
 
@@ -34,6 +50,11 @@ public  class AU {
         return output;
     }
 
+    /**
+     * Converts m/s to AU/day for data collection
+     * @param input Vector3d with values in m/s
+     * @return Vector3d with values in AU/day
+     */
     public static Vector3d convertFromMetersPerSecond(Vector3d input) {
         Vector3d output = new Vector3d(input);