From e276abd3e4e1060249f6fefd547317c8fe7977e1 Mon Sep 17 00:00:00 2001
From: Christiaan Goossens <contact@verictas.nl>
Date: Thu, 15 Sep 2016 13:37:21 +0200
Subject: [PATCH] Fix

---
 simulator/.idea/workspace.xml                 | 113 ++++++++++++------
 .../com/verictas/pos/simulator/Main.class     | Bin 1713 -> 1252 bytes
 .../verictas/pos/simulator/Simulator.class    | Bin 3924 -> 3816 bytes
 .../pos/simulator/SimulatorConfig.class       | Bin 463 -> 463 bytes
 .../src/com/verictas/pos/simulator/Main.java  |   8 +-
 .../com/verictas/pos/simulator/Simulator.java |   2 +-
 .../pos/simulator/SimulatorConfig.java        |   4 +-
 7 files changed, 83 insertions(+), 44 deletions(-)

diff --git a/simulator/.idea/workspace.xml b/simulator/.idea/workspace.xml
index 9c54a96..c8b3271 100644
--- a/simulator/.idea/workspace.xml
+++ b/simulator/.idea/workspace.xml
@@ -7,18 +7,8 @@
   </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/dataWriter/DataWriter.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/com/verictas/pos/simulator/dataWriter/WritingException.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/com/verictas/pos/simulator/mathUtils/AU.java" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/out/production/simulator/com/verictas/pos/simulator/nBabel.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/src/com/verictas/pos/simulator/nBabel.java" afterPath="" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/simulator/com/verictas/pos/simulator/Main.class" afterPath="$PROJECT_DIR$/out/production/simulator/com/verictas/pos/simulator/Main.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/simulator/com/verictas/pos/simulator/Object.class" afterPath="$PROJECT_DIR$/out/production/simulator/com/verictas/pos/simulator/Object.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/simulator/com/verictas/pos/simulator/Simulator.class" afterPath="$PROJECT_DIR$/out/production/simulator/com/verictas/pos/simulator/Simulator.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/simulator/com/verictas/pos/simulator/SimulatorConfig.class" afterPath="$PROJECT_DIR$/out/production/simulator/com/verictas/pos/simulator/SimulatorConfig.class" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.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/Object.java" afterPath="$PROJECT_DIR$/src/com/verictas/pos/simulator/Object.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/verictas/pos/simulator/Simulator.java" afterPath="$PROJECT_DIR$/src/com/verictas/pos/simulator/Simulator.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/verictas/pos/simulator/SimulatorConfig.java" afterPath="$PROJECT_DIR$/src/com/verictas/pos/simulator/SimulatorConfig.java" />
     </list>
@@ -41,7 +31,42 @@
     <favorites_list name="simulator" />
   </component>
   <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
+    <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="510">
+              <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="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="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>
+      </file>
+      <file leaf-file-name="SimulatorConfig.java" pinned="false" current-in-tab="true">
+        <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" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
@@ -79,10 +104,10 @@
         <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/SimulatorConfig.java" />
         <option value="$PROJECT_DIR$/src/com/verictas/pos/simulator/Simulator.java" />
-        <option value="$PROJECT_DIR$/src/com/verictas/pos/simulator/dataWriter/DataWriter.java" />
       </list>
     </option>
   </component>
@@ -534,7 +559,7 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-1928" y="-8" width="1936" height="1056" extended-state="6" />
-    <editor active="false" />
+    <editor active="true" />
     <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" />
@@ -544,11 +569,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.3668076" 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.3266385" 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="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="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="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" />
@@ -633,6 +658,8 @@
           <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" />
@@ -705,6 +732,8 @@
           <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" />
@@ -750,6 +779,8 @@
           <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" />
@@ -795,6 +826,8 @@
           <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" />
@@ -840,6 +873,8 @@
           <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" />
@@ -875,6 +910,8 @@
           <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" />
@@ -961,28 +998,38 @@
         </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/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">
-          <caret line="6" column="0" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
+          <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">
+    <entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/Simulator.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-65">
-          <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
+        <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/dataWriter/DataWriter.java">
+    <entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/Main.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" />
+        <state relative-caret-position="510">
+          <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>
@@ -991,10 +1038,12 @@
     </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="357">
+        <state relative-caret-position="680">
           <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" />
@@ -1004,20 +1053,10 @@
         </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="-496">
-          <caret line="72" column="159" selection-start-line="72" selection-start-column="159" selection-end-line="72" selection-end-column="159" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/dataWriter/WritingException.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="102">
-          <caret line="6" column="62" selection-start-line="6" selection-start-column="62" selection-end-line="6" selection-end-column="62" />
+        <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" />
           <folding />
         </state>
       </provider>
diff --git a/simulator/out/production/simulator/com/verictas/pos/simulator/Main.class b/simulator/out/production/simulator/com/verictas/pos/simulator/Main.class
index e20a5ce885aa5c45338632baed193a0802e6749e..17c7a7269b042c3e52578091039d5cfd41dba25b 100644
GIT binary patch
delta 364
zcmX9)%Su8~6kYdR&pmp*IVcb+L4+``uO3!r5AET#m)b)bILkrOKq4xtQ9*womuS!j
zG)<aBpwYBJIcQdssIO=c?NbNN+H3E%*z0f_9bc}%)6abizz8;UgfJ;E<;1j>OLcF$
zv%yP&bUomYXLQV9R%<oI)!RjTS4+QtKOgx%JX*T)`Es7DT}ypV2gAG*+4@b!t;0f2
zU_oHfK2=`%c4hx?$KGRk)kN5SU{=V)lEAWo732*RB$y~F;Ffd>tQuIux&ps_#(HnJ
z)S}YWPY;xbK_PFLFk(MCyoo5yH0l6>7@_gUIpP?g&V@k?NiXp>JaAAwv2|Xp@g`VV
zjg-ocXsH;xL$E;-gIwnYC+tB2K2*_%0}4E*NVz`zzXHRgg04lMH%b9jbYhGcBR5A9
M<4|duA`ipFFZfbDmjD0&

delta 858
zcmYk3Ye-XJ7{~wb+@5n>)56|_WjfTFn1zL1)NH46vx{A<)of*#SzDIVYHoJ5*)oly
z4@=4-=u4VJpCm#p?1XfIAnQXPiVBnp0wEk!RABVFNp?Ow_uv1V=Q*F^yAsl$|GEDV
zzyh4rV+*P!cxBX3Nr7?8B&)eiLTxzR6g;TMAsnWMebV)JmtWPA<^Au0`WZusWO03b
z8CvY^9P9h^(4bC+pKMc7o^?L{!AN~m)L1mL{{yKX+j{4fXBLohA^agr_c=mJ*f->T
zS<^vkv%Ivo?!|RdH?_38?51WJ0kTc)Z!fW3o=nOJOMM$|m=}~$Pu9WFt;OXxT1Xjg
zFTIdi22vwuvU=|=N+b2woh6|s1>Z?&x!L5+w~mt1WbXWOH&RL}S2me1O35;gknQTZ
z%8svBT=ZyK|6p^)tnZ`_gq{us-p7-odi=Lv4SypgSKaYcpEFEqLv_wTO_`P~zuKlm
zB7wC(^*D-S5{^qa5$<`NR`0G2)G_GXE}y@OL0jYUiBvieIJDpI_O*uD+BgTwTL+nK
zxdSI9G#GFSK?54cj02|y>KK=>jZ3VHNvw%UNC+8l22Bj6OU!iFt69S;HjCdh_GrL_
zM!B$CMV2c(6J9sF8>}nZb_z?;qJ(WCHpB+79Tg&r#}4ci6#=sjBtjBCvo%TU2|j?v
znPle3dH`~AWOL+j%<V=(4-#XgT#or1dC}6eZX~adA`3Yd#rpXig&alyBNmQj94r1I
zh1w`%<*>z=l^m-%O1lx9c+WbH4ICRMAf4PNJ}xfD?$pk)J9TsIPBLokPRXdV7m|^B
zV4qk$1F~3iI`WVL4`$#RQt<+5jA15AMK;U8?C4om#a72I>=yHRC?0_emEtlU^kI*P
lGy*-3y&{Se0uH!Eq!lt5Vxkf{Ax7ATs_3ov3keMl`~{aZ+Zq4>

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 ae345700e489d3262630342d3054760ceb68dc9c..fee996d92a53ee491ac1fd4b20c5356f6b7df01e 100644
GIT binary patch
delta 1001
zcmXYvTX2n66vuz-T)uCgFP}um7)dyB8@E!7&~`}8oH#T{TvCLz6)i!ONJQfrC#_Je
zYi##x=p{9tOj>68z(Zy_h8bQw_05|%eI$ce`<#3a|Fym~|Fzcs|Mz}Y@*<ge^zNVg
zz)X4rKA|qbI=)HpE$a;%0_xcq=+7pf%>h0QK3f73j`kf}9c**Z=wQ2pCI`)qvLoPQ
zT6}f}457~Oy^F05b{TfNxX10v><zSIpM(7l+Fb7eL&nhVNIw{U^f?$XmJXjo0pmFA
zct1Hf;?DH5;TOYE!!gG{?mhTl<>=?ACk!W@h*OT(X*lh=tj`&rvw~OF(AfFzrrFuB
ztzM9HPjO_D1XZe4W$IE}6>XJ5TaqZYz0n!@=R%fH?sGom0vGK^@gh4SHZ=cI$YrjC
zT;-ZjYMW)ay%sGrA)j(xn4T@1h~(L>SU9CC<OVlGex)|#HwV8v_`^Xr>5xCU6;i`$
zVVG?<!|co0gy=ldwkZBmF83t7Sz@ot1p8d3_ssPRqCun^qe_uVTNAX%Rr@$tIY0H`
z(8P>F|1Qa*xJ&;cFBigG7?cb7xloV`gYWV|M?$*$?{|2L>up=!yn>XZ)%YlL)X%+?
z*r$0*Gm9ibg&0aDpK2Mx7c!hxGKv~WQLFsbvVb+Rm@g^Ic7;sREJZn<dX&s&33{17
zkX@n?m8cigNS9U}Z@kW2z~{tu?r17lh^JHIEMjp+gUY3nDjgq_3U?_8gQbk6N{o<{
zX)I$oF{+i3BIwr>c)lJq=Ci_Qr9dBZ-eBY{Q=`(y2$#Pm-ABBiStu>XMSNCy`XKd2
zbj564{9jMgprmB#)b@G`*~BP)QRCRkM7C2(lUmiRl~!8V#Xfd(TRC^A;~s51-~j*9
z&J#L##vxvDn10$N&XKHH6>37M_N<{+PhZS=HL+ankMMWatcZ3^<|}H)Xz?MR4HOY?
Vzz&x==|Z)gS}@Z8S`CP>_C423xEKHc

delta 1101
zcmXYvU2Icz7{-5ZPup{PdfGAxaYbilfW?6!hC0Q9Bm;zLCj({RbVGC-Fa~ovoG2d!
zoG|<V#t|kceoO_7-sof)FC>wK7)`w5PH#!LQt#BJGT(PyFP=U<eg6OVd7k&&ths(y
z@#kCL{{Y<2Ri6jhl3**_67;a$qt|B#JAM7p=kkJ&OTWvDJ_(b(#DKvrgO?2k4PG(W
zZIV}g9^f^XJw7wp;<4Ah_ZjT>DBAY{n^ipM>xn}KuNw^6**826dmJ&*u*XrCH+|;t
zmdo2d^LWQ}#|(~}rxP9{9w$9Q)4v<P@|VWZk4aB?oVF07CVbE1jGa2`^1jOlLVRgY
z-^i`8@MgR&T<6>orrrAzvQmid>e<;neo^YhZ`I(MSsjGGMFzti&Z6|WfDJ5n`7q!k
zJ`TTf7N$Q57~|7`&-h%(g;h>27O<G}VQsXb{zAYCRt7x6s({r7O$Lt|JVqhlB3}eN
z%jR%@w9#p%5dIkbQ^v->i8aXhGB@M+&P+V2K)S+>{(xKxfAL#8+UCznEUI=Vs4?;_
z$-G}7K|Wa_seDi&>3pg}GWm3c%y=l1jb;68G8<%5*>rVgf~ui}T$nsR6jv;S-N_Z1
zHfh(^9hPXBCz%^wPPP;a{7y4Bc$`02!{4+Btd#`M$ZVRVmYmelDGTV599v~E+oX+N
zy{AVuv0XZK6-)KD32viaStHAdbB>xRme9MGSy#Hc8#Gv9Bz4Zc)*69Mn^UyzNa@ho
zRv>8|U1cqj;VK=|*PP|Bnk?wb`}j_++K@Umw1yU9YU*y*vW~b~itz+bDr&W?r&X;*
zWwWgpVTP<{qv|5m$ZDRVjVR4etE3TsQtiiGO&xV<cj-_=C6<)&<UbZVQsPeI|I%I}
zHmOlmR?#9Zo8tP4>%Pa!!8|GU>uv|BW;eC$)mL^O_i%t52etP@^m2p&hS|eWzEsWE
z^mCbGT;Vv^7~xk=ah=or!zh!CNQ^U64L51{oa&#`lA>DHD9>vsN5fp2Dk-9;7SPG6
sCVlu54^KZt;?q4Cv&@1;uEs4BkutYSs>HCSDr-L_9VK+>{}H<X2cM44SO5S3

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 6530133b40021b288ababea7fbfc3b63f59131c8..3a0a16f2b2b324d0b08f5c990cb065a516068188 100644
GIT binary patch
delta 43
wcmX@le4bh9)W2Q(7#J8#7-YB@I2gp4893NFI2qU(B-kAMfZ{-~QE4qB0Oz9!RsaA1

delta 43
xcmX@le4bh9)W2Q(7#J8#7-YB@I2gp48F=*>I2qU(B-reC&IEy38<o~F0ssK63;h59

diff --git a/simulator/src/com/verictas/pos/simulator/Main.java b/simulator/src/com/verictas/pos/simulator/Main.java
index ed906c7..81e3964 100644
--- a/simulator/src/com/verictas/pos/simulator/Main.java
+++ b/simulator/src/com/verictas/pos/simulator/Main.java
@@ -24,16 +24,16 @@ public class Main {
          * Object definitions (in 1990)
          */
         Object sun = new Object("Sun", 1.988544E30, AU.convertToMeter(new Vector3d(3.621484938699030E-03,3.203347049968909E-03,-1.609087138389905E-04)), AU.convertToMetersPerSecond(new Vector3d(-1.730306264794065E-06,6.909301960615850E-06,3.332250766613383E-08)));
-        Object venus = new Object("Venus", 48.685E23, AU.convertToMeter(new Vector3d(-3.786926829662159E-01,-6.122709221027441E-01,1.346180701578967E-02)), AU.convertToMetersPerSecond(new Vector3d(1.703979708314098E-02,-1.075790617185284E-02,-1.130972411646143E-03)));
+        //Object venus = new Object("Venus", 48.685E23, AU.convertToMeter(new Vector3d(-3.786926829662159E-01,-6.122709221027441E-01,1.346180701578967E-02)), AU.convertToMetersPerSecond(new Vector3d(1.703979708314098E-02,-1.075790617185284E-02,-1.130972411646143E-03)));
         Object earth = new Object("Earth", 5.97219E24, AU.convertToMeter(new Vector3d(1.000272608326749E+00,-1.305632418724720E-01,-1.614384880329670E-04)), AU.convertToMetersPerSecond(new Vector3d(2.003180730888720E-03,1.698793770993201E-02,5.869001824818362E-08)));
-        Object mars = new Object("Mars", 6.4185E23, AU.convertToMeter(new Vector3d(8.638055532014732E-01,-1.094520306989018E+00,-4.427515002554464E-02)), AU.convertToMetersPerSecond(new Vector3d(1.154235320339802E-02,9.839355267552327E-03,-7.723750026136471E-05)));
-        Object jupiter = new Object("Jupiter", 1898.13E24, AU.convertToMeter(new Vector3d(-5.440309619306835E+00,-2.383659935837559E-01,1.226571001615609E-01)), AU.convertToMetersPerSecond(new Vector3d(2.422143907277735E-04,-7.182284468246539E-03,2.440789748210396E-05)));
+        //Object mars = new Object("Mars", 6.4185E23, AU.convertToMeter(new Vector3d(8.638055532014732E-01,-1.094520306989018E+00,-4.427515002554464E-02)), AU.convertToMetersPerSecond(new Vector3d(1.154235320339802E-02,9.839355267552327E-03,-7.723750026136471E-05)));
+        //Object jupiter = new Object("Jupiter", 1898.13E24, AU.convertToMeter(new Vector3d(-5.440309619306835E+00,-2.383659935837559E-01,1.226571001615609E-01)), AU.convertToMetersPerSecond(new Vector3d(2.422143907277735E-04,-7.182284468246539E-03,2.440789748210396E-05)));
 
         /**
          * Object listing
          */
 
-        Object[] objects = {sun, venus, earth, mars, jupiter};
+        Object[] objects = {sun, earth};
 
         /**
          * Run the simulator for the specified objects
diff --git a/simulator/src/com/verictas/pos/simulator/Simulator.java b/simulator/src/com/verictas/pos/simulator/Simulator.java
index e964af5..373ef73 100644
--- a/simulator/src/com/verictas/pos/simulator/Simulator.java
+++ b/simulator/src/com/verictas/pos/simulator/Simulator.java
@@ -3,7 +3,6 @@ import javax.vecmath.*;
 
 import com.verictas.pos.simulator.dataWriter.DataWriter;
 import com.verictas.pos.simulator.dataWriter.WritingException;
-import com.verictas.pos.simulator.mathUtils.AU;
 import com.verictas.pos.simulator.mathUtils.Vector3dMatrix;
 
 public class Simulator {
@@ -70,6 +69,7 @@ public class Simulator {
                  */
 
                 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);
                 }
 
diff --git a/simulator/src/com/verictas/pos/simulator/SimulatorConfig.java b/simulator/src/com/verictas/pos/simulator/SimulatorConfig.java
index 8790757..c312933 100644
--- a/simulator/src/com/verictas/pos/simulator/SimulatorConfig.java
+++ b/simulator/src/com/verictas/pos/simulator/SimulatorConfig.java
@@ -1,6 +1,6 @@
 package com.verictas.pos.simulator;
 
 public class SimulatorConfig {
-    public static int rounds = 60 * 60 * 24 * 10;
-    public static double time = 0.1; // in seconds
+    public static int rounds = 525960;
+    public static double time = 60; // in seconds
 }