From 1d995869947577afea5cf91be39721ef59f09d77 Mon Sep 17 00:00:00 2001
From: Christiaan Goossens <contact@verictas.nl>
Date: Thu, 15 Sep 2016 14:01:03 +0200
Subject: [PATCH] Improvements to the data writer

---
 simulator/.idea/workspace.xml                 | 127 ++++++++++--------
 .../verictas/pos/simulator/Simulator.class    | Bin 3816 -> 3856 bytes
 .../pos/simulator/SimulatorConfig.class       | Bin 463 -> 501 bytes
 .../pos/simulator/dataWriter/DataWriter.class | Bin 3446 -> 3715 bytes
 .../pos/simulator/SimulatorConfig.java        |   4 +
 .../pos/simulator/dataWriter/DataWriter.java  |  29 +++-
 6 files changed, 95 insertions(+), 65 deletions(-)

diff --git a/simulator/.idea/workspace.xml b/simulator/.idea/workspace.xml
index c8b3271..19765a5 100644
--- a/simulator/.idea/workspace.xml
+++ b/simulator/.idea/workspace.xml
@@ -7,10 +7,8 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="17f368cb-44f8-4101-9a29-49a0f4ff1f92" name="Default" comment="Update workspace">
-      <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/dataWriter/DataWriter.java" afterPath="$PROJECT_DIR$/src/com/verictas/pos/simulator/dataWriter/DataWriter.java" />
     </list>
     <ignored path="simulator.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -35,7 +33,7 @@
       <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="510">
+            <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" />
@@ -44,11 +42,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Simulator.java" pinned="false" current-in-tab="false">
+      <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="136">
-              <caret line="8" column="46" selection-start-line="8" selection-start-column="46" selection-end-line="8" selection-end-column="46" />
+            <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>
@@ -56,16 +54,49 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="SimulatorConfig.java" pinned="false" current-in-tab="true">
+      <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="34">
-              <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+            <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>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -104,8 +135,8 @@
         <option value="$PROJECT_DIR$/src/com/verictas/pos/simulator/dataWriter/WritingException.java" />
         <option value="$PROJECT_DIR$/src/com/verictas/pos/simulator/Object.java" />
         <option value="$PROJECT_DIR$/src/com/verictas/pos/simulator/mathUtils/AU.java" />
-        <option value="$PROJECT_DIR$/src/com/verictas/pos/simulator/dataWriter/DataWriter.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>
@@ -211,28 +242,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_ELEMENT>
-              <option name="myItemId" value="mathUtils" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="simulator" />
@@ -569,7 +578,7 @@
       <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.3266385" 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.23890063" 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" />
@@ -998,16 +1007,6 @@
         </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="612">
-          <caret line="36" column="73" selection-start-line="36" selection-start-column="73" selection-end-line="36" selection-end-column="73" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </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">
@@ -1016,19 +1015,9 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/Simulator.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="136">
-          <caret line="8" column="46" selection-start-line="8" selection-start-column="46" selection-end-line="8" selection-end-column="46" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/Main.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="510">
+        <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" />
@@ -1038,7 +1027,7 @@
     </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="680">
+        <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" />
@@ -1053,14 +1042,36 @@
         </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="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>
     <entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/SimulatorConfig.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="34">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        <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>
+    <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>
   </component>
   <component name="masterDetails">
     <states>
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 fee996d92a53ee491ac1fd4b20c5356f6b7df01e..2e53d9ec01732073423466765343286449e06a50 100644
GIT binary patch
delta 1647
zcmZXUTU1n47{`Bm&Y5%09FC+Y!pIB`rNl)nK`_QN@0lr?m53Jvb?hRd0$%bqnPjGB
z=2({9%q~<?3FP1<vD<RBe5f8=ty;bGSWo$wEQ-E8Sj*}>{Li<~{=WbIF8_Ug2_MRh
zU;gu44=|puT<)MQKs_r0tYno#%w;tXyRvx1=1~`$$86TP1hiWNYc(`#Sf^pVh7B5;
zv`e$g1X>InYp-5zwAtj6Nu9%H{obPCafkR;ZEVxWZg(YihlZUR;to$Z?9$s$I_$P-
zbs5D|HhWz1d0M*&a|6%l#P&JtcR1kitoA=>UA!ta$)jDLb2y|cd0smnc1Y-`BQ`JC
zyr?>^{h-_`DNibsBN9LPdWKdKwK?i>AJc7K@_3nJiFRXb`YRr<@|wr%yrC#d3^B_5
z9+ezVM9lKBZ+e{IEswWZ;_;4#cQv$Wc#oML@AHAjB5FKN5>4zh^Gn+K(4(D?6oE){
zOMO#IY*n7e$DHz*p(8rz^ynh$@d=%hK``-~S!lF#I+5d_VkCv7)}OPml5USPob@=z
zd5=%Ips;4GYg!qLD9p&ZMtK>Ll88R4$KxWM3gzljKJ)mTFBIuh8yX_3bwsmv_xO^t
zUElhzD!<uWzbTfuV0ZgN1#=4LCU%)wT}Pc&YUl*fihc}~bRa4?F_G>LFS}E|S+W9$
zNrGO=_A{BgWEEfvQ?)PnE{lf?YDJ>jZLaRhv@(XSKgN)tKgqE31Zui*qyA2e^JI!W
zJR>VfcBW<4B?)GX5Iadu5^)Gs+D1hnGf>oXf?!c*pfuY~64pkN+(cSht{RyrN{hzl
zrI>{<BO-BUuqIeHu;&Tma4Ql^a&yKl|FE~|9CY014#_&Ks?}nVpn<M(4|#$&VKPjr
z%wjMh!i*HXjpla2<?@bE!Wv3xp*+rZD%d4=VxKhTq_p7_(`8~aq}emMEcSQI=6kC6
zS#<X+^HnxgDwk3<ibblB8a0lks)A*znmS3NRxM?@s+Vh{+q_j$D3r9O36CX`38$<8
zKMJ@079f6#My)Ej0*xe@m2%7%(!1qYzYynf4|A}D*3Z4n6_nX9PZ9!C)#}S2Js7MO
zFkk$9(v6wi&jP9c0r8kdTEApq**vIBn}=)`iU@j{*oUKX{-9utp?V4F)iq}H;_s&%
zaUAeQ*;HGSrCbj!kHdq4@%)<f^z?3SO;TV?4(sV235SkjwQ-;*R9Y04@fJqS;-DD{
zCn>sNl*KZ>(11?Hh#4L*OT-MCNyZN7CTI@hwj|>uJ{<ageAtYqgr*6ubNz>))lhBy
z4Xr-GDlIBWN2^s1FEb{Ebh^=EAs(+c|CVt1zuAQGdNxv!EGklLmpY`K263&ih4L>$
zROE<?vRO-n4Wg<h3fM>)o8%sCmYwZ1vx9By6j`m6pGJ&scFR3)<&voM8xh<U_VYUj
z=x2}eb1)^D*`kCpwy>BbGQ$xZWvNWqkjb9bl35_e6^dCV+Xi1th}Mx$L}6VQg|@T+
gR7wEZ*nRj^A6aTpFMDOeeIk}#(WIhQitw@gF9l;li~s-t

delta 1617
zcmZXUYfx2H6vu!2KF-V29Rq=T^<KP|qC%mGg5V?Z6+SB}6|>M3%_LAkG)=D$G<#bo
zvn<QZqBKiD52OW^Gfvq|GmU+zPkn6q)Q3J4J!tKFsj)g|=D*k8XZ_b+Yp?%4hw^_&
zq^|sVp$C}AC5JL<ZC0|%<^fh)tZ}Ggts|3lCJ#E8tT%bc!PagYsMqkYh6W9d8a8U!
zq+K>Ul+t9<?2t{Z#TGrbXxM78O^=W0y;9p9VeHWGsD_=IyUQYFv0FRsvDj;}&*4T|
zP4+vC;(+#hOv6E))8iITSUhR*l=gqx=>18`kw?2eWAUsm;*fTH&f<B^@=RVZIjk_I
zu5aiJs;kObB=t#YvXS?FpeK7W<t8t>EM}(35to;E*=r9LM~=F@!mBRFcui5_U2hEY
zP6wiv%Vb_xj889ot8$7>j=Q|U370on?s8JYTN>Wh(8g?+cX-!jDa#aj-X1$|y25m-
z8@Dv9NxGckw1)Q-cCx8?)#m29H6vWk@V?6|&HaG0F71@NbZD!Sa>*{{{Tvz_JjFRL
z8J=OBr(BWieQoCs(b@SfU39yA$OV^+eB>PpN5`GwW0xMzDwLxO>vj2rPZg2M`ugPB
z#?7ninv#tTlFw&!D@ICnBRhW!f1$iD&GX?<)2f!b&Ry1CwW3sXqn{v3wkj8_kl8pH
zm5kxSE>yc10j3BV=|!8VV!Ig!rZHV+Hn%cER)idA!;=1?7J4h3rpjX-1TT_Z)5Vai
z9G~1ABec>dFDojxPs}IW!O(IuSZe3kg*_*T73SCzqNdL<ZTQ5!f<gHz;msLTky;%K
z`{YZ&tl`4z#watciJp{*xkj?iXGGQw|3q)YsR(P{$acvup(@pEkz+7j&vx=9_rZk7
zk$R$HCFD&~An$laQ!8T~#Ui^Bnkh?hSZGJ3<dahL87cXk*cX^7M_<Ji=5dwzDnOO8
zC{YorRW^62VJuNema0mY%ht=(Tx!$;?oA)!cG-5USd|jP5M?IPmdz#R3|L2L(7KTu
z&_L?AENjOC2|AbC2ut7*vh_R+2^(fU3k2olS;!)(ETpRRHITXotEt>BegQdwaooY3
zQggL<RO0kY28Jn#hD`1@xkvim$CTf()E^WFRUdI}|H|yXS%mwUg!pBgQ6@_a>AhTq
zOz+iqGSe9t!D(^b&5pwOgo})-i9{k@6!?tx7G4)kjj0F~#X|9f&)94FS13J;XT(t?
zW+G$WBxWq+b8|*4vCt5TeZ~tv5&u7bfTZ~Yq5i{f4XU<Oe|>8}we>I7O1dSjz@RWD
z4CGu<B!Nrx$G>$u@!#Pjm4R%eI<Y3Dqg~ebB%`Y(q9;T>mZ&GnI#JXH`JdG@hDK4+
z#+0aNlPtB+#8!5&jnm@PE`%<2(#tL`vzxDI<s0_%3kT?Dw+eGGt(hv(LWyu{ST0Q*
y$`R4hOxZZV`Lt#N!YX2gd=2us=u>Mepj$E^3Y2Z66`-j0evAw^?~_~u-2WGSxibm?

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 3a0a16f2b2b324d0b08f5c990cb065a516068188..753140b8ac392a5d52cb0b81e41fadcb762a3d02 100644
GIT binary patch
delta 269
zcmX|*F-ikL7=^#tNp@#<Co#q(YD`RFAuI$%Jb;azcngalh>!!=+E^@JAr}Z+2o@e7
zji<2<c{4(0;JtbOy!n`4`)6-9+wULXmRUj0sl}!5IgW99_o%s6NM}JN8PkmOdOj}l
z<@4h8Ve#^`tnXLD1A3l<(&OoPx|D{h{-{1L%;?Pt09L9-#HkcrJ$Zsb0O_I9mE6eN
z)fZ+Rulv$84lPGI`~Lz1hDwgn{_(Y7VfFe+gB{RnNH1MO7C?po>gp%ZqODy<?6Gpf
F$qwC87&ZU^

delta 247
zcmX|)Jx&5a7>1v3XLoji;YS2lzylZ>8xKGN6gHHcKnn{nQK)TciC6Ffgu=wa1K4;P
zTH?D)!Z*o$@87(0aDQ(4d;I<Z?zyRwkvlTKsgQE*M>FY~g7s4RDFeg5zO0vzZ-zY>
z@#=Z;Bskg5KkIcGLD_1cM)(Leeos{hkwnR5k(^R7l*VX^-D#V4GW^1JrQOo)OVM#5
p98Lk+T#99M&W~?ZUrcC6dt8Tjk1slm7CHL0uwxP(qbnS7^$#l@6`TM7

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 5a68c96f459552197624beb1b5b77759cbb5a4a7..291bae48f6b88739d8b59789e0b578f758286df8 100644
GIT binary patch
literal 3715
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

delta 1704
zcmZvcTU1nK6vuyunc<u{92Ag1NDx5<hMSgI(oGRH5EL{cv@}XgOalRp=rW~tAqlg|
zN{Z=XMz@EQ8d$NGJ+@Z8_gwG2^iprx|2qRTt;IU)?6dc`_xbj>|NFncvqgUuMt}b2
zha12KzHzyYLt*lG%%;mFz#)gnU7p~uF}lNKaKzzBV;r^Vab+KK75<dN@vy>9I6Upr
zOP}$aG@{>Tz$KSsHiHhQjC$JU8Ji)8XI%>A=wR64Ifv(s^96?&9ilETan$8y&KPml
z<s7d#yy{ZKYbNY<BSswFusQEA>QZeoyy;TMA!Cf$T)6n#!B~s+XXc>ITRN<tb$F^d
zE#Hdu2U?s>)O*~{hS)EGiq?xBZxi!)hf5ysve6=Ipy$M?<6VQj{o986diw_lJl^9G
z3-4Ih>8`q--n#8Q$Gbf?vD@Q-aRh4zhXy^~=W=XwFfVJ|;{)USkO_}C6R{(~W@~@!
zS}>AP8Q$C1-F>*EV#~hRAHnj#E_TQALN`Jt{YSCiLn|sjw)w>4Q?7V?#uc64<0_w9
zSgyyUIrkSvd`W$5ZTf-0SA0EnF1^5-`qgf-qIv2eYEYUfPFf*%un~(prKeFU`>qtb
zoRECNLcY7f8YZX*u12P@BG&h$%@XLGCYTeNAw7Y89Y-=JERn!%nI)sMY8tO~F03lL
z5EDs|X+oDILw8+g>HJ<<TB=DdC&;c&kTZ^>&$5olEV-RE)7+xWk?%;$$xpC+k^&_v
z?991!niW4L)ncPw)2YLpXN&^>dzqrBO20=1G>|2^OvPl%l}9=GtW#LK;T$VCDJq?&
zgfpzt25YrNDHkZ?GOHP9jc_mLUhQxn>Cz7CYd~D5Uf<7VrEM2vTeKF?U#_xkm3LfP
zw1GycLXd52*LR2Ba)LLNEok$AO_NQtB;3@IEG-$aQ%fx_tqKn6_d>m*MY1VeQkH-`
zl?IWY$n>#TX#g+_RS8NuCRw5u2%_k!Brq1)+NDTO5|3hR?GTZylBZU__43tGtePrB
z6;o@8VvGH18kJf3=1MSHn_s^v#vzcsbCJ`w`=^a!HK>HJ0^^Gwcb+JQ8l@6yd)b0M
z!|D`M6j^Z9%&;cKEC{9=q5q7iy*zz}wPwe132`(DPj0<aAm&#1Af;e5!sr4<rK%0p
zX=_-r)!z|yeN<yHCPu}C(1bc~aN47|F_x<9js73;1)SnU_xM1mdiL_54`ZBt(o6&6
zJS5G`SDX%MAzyo#PLa$&tBW=JZ-xbK*8ixme||o7Lzu~i+C{NVP#HCj1Q8J;IVhS=
zGbn}+E5-4GIX)z7-Kts}<=Me<@o*(O715+AXr@L7Ftz3>UD*P|l{kggh6!!rZYpp0
zS>`%aI^8CMFCYzaXQ}SY(OB2cQm5NwU4r%BYCX*#)pS3m%}?hg<L8oCJnBas{1;ND
B8r}c^

diff --git a/simulator/src/com/verictas/pos/simulator/SimulatorConfig.java b/simulator/src/com/verictas/pos/simulator/SimulatorConfig.java
index c312933..dae1dd5 100644
--- a/simulator/src/com/verictas/pos/simulator/SimulatorConfig.java
+++ b/simulator/src/com/verictas/pos/simulator/SimulatorConfig.java
@@ -1,6 +1,10 @@
 package com.verictas.pos.simulator;
 
 public class SimulatorConfig {
+    // The amount of rounds and the time step
     public static int rounds = 525960;
     public static double time = 60; // in seconds
+
+    // Set the skipLines integer to skip lines (for example: every 5th line is written) in the output file (for smaller files), if this is set to 1, it has no effect and all lines will be written.
+    public static int skipLines = 5;
 }
diff --git a/simulator/src/com/verictas/pos/simulator/dataWriter/DataWriter.java b/simulator/src/com/verictas/pos/simulator/dataWriter/DataWriter.java
index 07b352d..f1798dd 100644
--- a/simulator/src/com/verictas/pos/simulator/dataWriter/DataWriter.java
+++ b/simulator/src/com/verictas/pos/simulator/dataWriter/DataWriter.java
@@ -1,5 +1,6 @@
 package com.verictas.pos.simulator.dataWriter;
 
+import com.verictas.pos.simulator.SimulatorConfig;
 import com.verictas.pos.simulator.mathUtils.AU;
 
 import javax.vecmath.Vector3d;
@@ -16,6 +17,8 @@ public class DataWriter {
     private static final String DELIMITER = "\t";
     private static final String NEW_LINE = "\n";
 
+    private int counter = 0;
+
     public DataWriter() throws WritingException {
         try {
             // Define the save path
@@ -30,11 +33,12 @@ public class DataWriter {
             }
 
             this.writer = new FileWriter(path);
-            this.writer.write("Object" + DELIMITER + "Position (m)" + DELIMITER + "Position (AU)" + DELIMITER + "Speed (m)" + DELIMITER + "Speed (AU)" + DELIMITER + "Old Acceleration" + DELIMITER + "Acceleration" + DELIMITER + "Mass" + NEW_LINE);
+            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++;
         } catch(IOException e) {
-            throw new WritingException("Whoop! Creation error!");
+            throw new WritingException("The destination file couldn't be created.");
         } catch(Exception e) {
-            throw new WritingException("Whoop! Unknown creation error!");
+            throw new WritingException("Some unknown error occurred while writing to the file!");
         }
     }
 
@@ -43,9 +47,13 @@ public class DataWriter {
             throw new WritingException("The writer isn't defined yet");
         } else {
             try {
-                this.writer.append(string);
+                if (this.counter % SimulatorConfig.skipLines == 0) {
+                    this.writer.append(string);
+                }
+                this.counter++;
             } catch (Exception e) {
-                throw new WritingException("Whoop! Write error!");
+                e.printStackTrace();
+                throw new WritingException("An error occurred while writing to the file!");
             }
         }
     }
@@ -55,10 +63,13 @@ public class DataWriter {
             throw new WritingException("The writer isn't defined yet");
         } else {
             try {
-                this.writer.append(id + DELIMITER + position.toString() + DELIMITER + AU.convertFromMeter(position).toString() + DELIMITER + speed.toString() + DELIMITER + AU.convertFromMetersPerSecond(speed).toString() + DELIMITER + oldAcceleration.toString() + DELIMITER + acceleration.toString() + DELIMITER + String.valueOf(mass) + NEW_LINE);
+                if (this.counter % SimulatorConfig.skipLines == 0) {
+                    this.writer.append(id + DELIMITER + position.toString() + DELIMITER + AU.convertFromMeter(position).toString() + DELIMITER + speed.toString() + DELIMITER + AU.convertFromMetersPerSecond(speed).toString() + DELIMITER + oldAcceleration.toString() + DELIMITER + acceleration.toString() + DELIMITER + String.valueOf(mass) + NEW_LINE);
+                }
+                this.counter++;
             } catch (Exception e) {
                 e.printStackTrace();
-                throw new WritingException("Whoop! Write error!");
+                throw new WritingException("An error occurred while writing to the file!");
             }
         }
     }
@@ -76,6 +87,10 @@ public class DataWriter {
         }
     }
 
+    public int getLines() {
+        return this.counter;
+    }
+
     public String getCurrentTimeStamp() {
         return new SimpleDateFormat("yyyy-MM-dd_HH-mm-ss").format(new Date());
     }