mirror of
https://github.com/christiaangoossens/Planetary-Orbit-Simulator
synced 2024-11-22 03:04:10 +00:00
Added some processing
This commit is contained in:
Christiaan Goossens
parent
f9c758de99
commit
89d1159710
@ -7,13 +7,10 @@
|
|||||||
</component>
|
</component>
|
||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" id="17f368cb-44f8-4101-9a29-49a0f4ff1f92" name="Default" comment="Update workspace">
|
<list default="true" id="17f368cb-44f8-4101-9a29-49a0f4ff1f92" name="Default" comment="Update workspace">
|
||||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/simulator/com/verictas/pos/simulator/processor/ObjectProcessor.class" afterPath="$PROJECT_DIR$/out/production/simulator/com/verictas/pos/simulator/processor/ObjectProcessor.class" />
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/simulator/com/verictas/pos/simulator/SimulatorConfig.class" afterPath="$PROJECT_DIR$/out/production/simulator/com/verictas/pos/simulator/SimulatorConfig.class" />
|
||||||
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/simulator/com/verictas/pos/simulator/processor/Processor.class" afterPath="$PROJECT_DIR$/out/production/simulator/com/verictas/pos/simulator/processor/Processor.class" />
|
||||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
|
<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/SimulatorConfig.java" afterPath="$PROJECT_DIR$/src/com/verictas/pos/simulator/SimulatorConfig.java" />
|
||||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/verictas/pos/simulator/mathUtils/AOP.java" afterPath="$PROJECT_DIR$/src/com/verictas/pos/simulator/mathUtils/AOP.java" />
|
|
||||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/verictas/pos/simulator/processor/ObjectProcessor.java" afterPath="$PROJECT_DIR$/src/com/verictas/pos/simulator/processor/ObjectProcessor.java" />
|
|
||||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/verictas/pos/simulator/processor/Processor.java" afterPath="$PROJECT_DIR$/src/com/verictas/pos/simulator/processor/Processor.java" />
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/verictas/pos/simulator/processor/Processor.java" afterPath="$PROJECT_DIR$/src/com/verictas/pos/simulator/processor/Processor.java" />
|
||||||
</list>
|
</list>
|
||||||
<ignored path="simulator.iws" />
|
<ignored path="simulator.iws" />
|
||||||
@ -35,40 +32,7 @@
|
|||||||
<favorites_list name="simulator" />
|
<favorites_list name="simulator" />
|
||||||
</component>
|
</component>
|
||||||
<component name="FileEditorManager">
|
<component name="FileEditorManager">
|
||||||
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
|
||||||
<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="867">
|
|
||||||
<caret line="56" column="40" selection-start-line="56" selection-start-column="40" selection-end-line="56" selection-end-column="40" />
|
|
||||||
<folding>
|
|
||||||
<element signature="method#accelerate#0;class#Simulator#0" expanded="false" />
|
|
||||||
</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="16">
|
|
||||||
<caret line="14" column="51" selection-start-line="14" selection-start-column="51" selection-end-line="14" selection-end-column="51" />
|
|
||||||
<folding />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
</file>
|
|
||||||
<file leaf-file-name="Main.java" pinned="false" current-in-tab="true">
|
|
||||||
<entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/Main.java">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="404">
|
|
||||||
<caret line="45" column="11" selection-start-line="45" selection-start-column="11" selection-end-line="45" selection-end-column="11" />
|
|
||||||
<folding />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
</file>
|
|
||||||
</leaf>
|
|
||||||
</component>
|
</component>
|
||||||
<component name="FileTemplateManagerImpl">
|
<component name="FileTemplateManagerImpl">
|
||||||
<option name="RECENT_TEMPLATES">
|
<option name="RECENT_TEMPLATES">
|
||||||
@ -110,20 +74,20 @@
|
|||||||
<option value="$PROJECT_DIR$/src/com/verictas/pos/simulator/dataWriter/DataWriter.java" />
|
<option value="$PROJECT_DIR$/src/com/verictas/pos/simulator/dataWriter/DataWriter.java" />
|
||||||
<option value="$PROJECT_DIR$/src/com/verictas/pos/simulator/mathUtils/AU.java" />
|
<option value="$PROJECT_DIR$/src/com/verictas/pos/simulator/mathUtils/AU.java" />
|
||||||
<option value="$PROJECT_DIR$/src/com/verictas/pos/simulator/Node.java" />
|
<option value="$PROJECT_DIR$/src/com/verictas/pos/simulator/Node.java" />
|
||||||
<option value="$PROJECT_DIR$/src/com/verictas/pos/simulator/Main.java" />
|
|
||||||
<option value="$PROJECT_DIR$/src/com/verictas/pos/simulator/Simulator.java" />
|
<option value="$PROJECT_DIR$/src/com/verictas/pos/simulator/Simulator.java" />
|
||||||
<option value="$PROJECT_DIR$/src/com/verictas/pos/simulator/processor/Processor.java" />
|
|
||||||
<option value="$PROJECT_DIR$/src/com/verictas/pos/simulator/processor/ObjectProcessor.java" />
|
<option value="$PROJECT_DIR$/src/com/verictas/pos/simulator/processor/ObjectProcessor.java" />
|
||||||
<option value="$PROJECT_DIR$/src/com/verictas/pos/simulator/mathUtils/AOP.java" />
|
<option value="$PROJECT_DIR$/src/com/verictas/pos/simulator/mathUtils/AOP.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/SimulatorConfig.java" />
|
||||||
|
<option value="$PROJECT_DIR$/src/com/verictas/pos/simulator/processor/Processor.java" />
|
||||||
</list>
|
</list>
|
||||||
</option>
|
</option>
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectFrameBounds">
|
<component name="ProjectFrameBounds">
|
||||||
<option name="x" value="-1928" />
|
<option name="x" value="-9" />
|
||||||
<option name="y" value="-8" />
|
<option name="y" value="-9" />
|
||||||
<option name="width" value="1936" />
|
<option name="width" value="1938" />
|
||||||
<option name="height" value="1056" />
|
<option name="height" value="1051" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectInspectionProfilesVisibleTreeState">
|
<component name="ProjectInspectionProfilesVisibleTreeState">
|
||||||
<entry key="Project Default">
|
<entry key="Project Default">
|
||||||
@ -167,6 +131,8 @@
|
|||||||
</navigator>
|
</navigator>
|
||||||
<panes>
|
<panes>
|
||||||
<pane id="Scratches" />
|
<pane id="Scratches" />
|
||||||
|
<pane id="PackagesPane" />
|
||||||
|
<pane id="Scope" />
|
||||||
<pane id="ProjectPane">
|
<pane id="ProjectPane">
|
||||||
<subPane>
|
<subPane>
|
||||||
<PATH>
|
<PATH>
|
||||||
@ -285,8 +251,6 @@
|
|||||||
</PATH>
|
</PATH>
|
||||||
</subPane>
|
</subPane>
|
||||||
</pane>
|
</pane>
|
||||||
<pane id="PackagesPane" />
|
|
||||||
<pane id="Scope" />
|
|
||||||
</panes>
|
</panes>
|
||||||
</component>
|
</component>
|
||||||
<component name="PropertiesComponent">
|
<component name="PropertiesComponent">
|
||||||
@ -590,18 +554,18 @@
|
|||||||
<servers />
|
<servers />
|
||||||
</component>
|
</component>
|
||||||
<component name="ToolWindowManager">
|
<component name="ToolWindowManager">
|
||||||
<frame x="-1928" y="-8" width="1936" height="1056" extended-state="6" />
|
<frame x="-9" y="-9" width="1938" height="1051" extended-state="6" />
|
||||||
<editor active="true" />
|
<editor active="false" />
|
||||||
<layout>
|
<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="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.2653277" sideWeight="0.48541668" order="10" side_tool="false" content_ui="tabs" />
|
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.26451612" sideWeight="0.48333332" order="10" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Palette	" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
<window_info id="Palette	" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
<window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.50739956" sideWeight="0.3453125" order="7" side_tool="true" content_ui="tabs" />
|
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.6602151" sideWeight="0.35572916" 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="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="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.50739956" sideWeight="0.6546875" order="2" side_tool="false" content_ui="tabs" />
|
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.6602151" sideWeight="0.64427084" 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="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="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="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" />
|
||||||
@ -657,10 +621,7 @@
|
|||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="66">
|
<state relative-caret-position="66">
|
||||||
<caret line="4" column="24" selection-start-line="4" selection-start-column="24" selection-end-line="4" selection-end-column="24" />
|
<caret line="4" column="24" selection-start-line="4" selection-start-column="24" selection-end-line="4" selection-end-column="24" />
|
||||||
<folding>
|
<folding />
|
||||||
<element signature="method#run#0;class#Simulator#0" expanded="false" />
|
|
||||||
<element signature="method#accelerate#0;class#Simulator#0" expanded="false" />
|
|
||||||
</folding>
|
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
@ -675,10 +636,7 @@
|
|||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="1188">
|
<state relative-caret-position="1188">
|
||||||
<caret line="55" column="39" selection-start-line="55" selection-start-column="39" selection-end-line="55" selection-end-column="39" />
|
<caret line="55" column="39" selection-start-line="55" selection-start-column="39" selection-end-line="55" selection-end-column="39" />
|
||||||
<folding>
|
<folding />
|
||||||
<element signature="method#run#0;class#Simulator#0" expanded="false" />
|
|
||||||
<element signature="method#accelerate#0;class#Simulator#0" expanded="false" />
|
|
||||||
</folding>
|
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
@ -687,16 +645,7 @@
|
|||||||
<state relative-caret-position="770">
|
<state relative-caret-position="770">
|
||||||
<caret line="40" column="21" selection-start-line="40" selection-start-column="21" selection-end-line="40" selection-end-column="21" />
|
<caret line="40" column="21" selection-start-line="40" selection-start-column="21" selection-end-line="40" selection-end-column="21" />
|
||||||
<folding>
|
<folding>
|
||||||
<element signature="imports" expanded="false" />
|
|
||||||
<element signature="e#976#977#0" expanded="false" />
|
|
||||||
<element signature="e#1010#1011#0" expanded="false" />
|
|
||||||
<element signature="e#1053#1054#0" expanded="false" />
|
|
||||||
<element signature="e#1124#1125#0" expanded="false" />
|
|
||||||
<element signature="method#getSpeed#0;class#Object#0" expanded="false" />
|
<element signature="method#getSpeed#0;class#Object#0" expanded="false" />
|
||||||
<element signature="e#1484#1485#0" expanded="false" />
|
|
||||||
<element signature="e#1524#1525#0" expanded="false" />
|
|
||||||
<element signature="e#1573#1574#0" expanded="false" />
|
|
||||||
<element signature="e#1656#1657#0" expanded="false" />
|
|
||||||
<element signature="method#getPosition#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#setAcceleration#1;class#Object#0" expanded="false" />
|
||||||
<element signature="method#getAcceleration#0;class#Object#0" expanded="false" />
|
<element signature="method#getAcceleration#0;class#Object#0" expanded="false" />
|
||||||
@ -707,8 +656,6 @@
|
|||||||
<element signature="method#getDistance#1;class#Object#0" expanded="false" />
|
<element signature="method#getDistance#1;class#Object#0" expanded="false" />
|
||||||
<element signature="method#updatePosition#0;class#Object#0" expanded="false" />
|
<element signature="method#updatePosition#0;class#Object#0" expanded="false" />
|
||||||
<element signature="method#updateSpeed#0;class#Object#0" expanded="false" />
|
<element signature="method#updateSpeed#0;class#Object#0" expanded="false" />
|
||||||
<element signature="e#5778#5779#0" expanded="false" />
|
|
||||||
<element signature="e#5834#5835#0" expanded="false" />
|
|
||||||
<element signature="method#enactForceOnObject#0;class#Object#0" expanded="false" />
|
<element signature="method#enactForceOnObject#0;class#Object#0" expanded="false" />
|
||||||
</folding>
|
</folding>
|
||||||
</state>
|
</state>
|
||||||
@ -732,10 +679,7 @@
|
|||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="1188">
|
<state relative-caret-position="1188">
|
||||||
<caret line="55" column="39" selection-start-line="55" selection-start-column="39" selection-end-line="55" selection-end-column="39" />
|
<caret line="55" column="39" selection-start-line="55" selection-start-column="39" selection-end-line="55" selection-end-column="39" />
|
||||||
<folding>
|
<folding />
|
||||||
<element signature="method#run#0;class#Simulator#0" expanded="false" />
|
|
||||||
<element signature="method#accelerate#0;class#Simulator#0" expanded="false" />
|
|
||||||
</folding>
|
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
@ -744,16 +688,7 @@
|
|||||||
<state relative-caret-position="770">
|
<state relative-caret-position="770">
|
||||||
<caret line="40" column="21" selection-start-line="40" selection-start-column="21" selection-end-line="40" selection-end-column="21" />
|
<caret line="40" column="21" selection-start-line="40" selection-start-column="21" selection-end-line="40" selection-end-column="21" />
|
||||||
<folding>
|
<folding>
|
||||||
<element signature="imports" expanded="false" />
|
|
||||||
<element signature="e#976#977#0" expanded="false" />
|
|
||||||
<element signature="e#1010#1011#0" expanded="false" />
|
|
||||||
<element signature="e#1053#1054#0" expanded="false" />
|
|
||||||
<element signature="e#1124#1125#0" expanded="false" />
|
|
||||||
<element signature="method#getSpeed#0;class#Object#0" expanded="false" />
|
<element signature="method#getSpeed#0;class#Object#0" expanded="false" />
|
||||||
<element signature="e#1484#1485#0" expanded="false" />
|
|
||||||
<element signature="e#1524#1525#0" expanded="false" />
|
|
||||||
<element signature="e#1573#1574#0" expanded="false" />
|
|
||||||
<element signature="e#1656#1657#0" expanded="false" />
|
|
||||||
<element signature="method#getPosition#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#setAcceleration#1;class#Object#0" expanded="false" />
|
||||||
<element signature="method#getAcceleration#0;class#Object#0" expanded="false" />
|
<element signature="method#getAcceleration#0;class#Object#0" expanded="false" />
|
||||||
@ -764,8 +699,6 @@
|
|||||||
<element signature="method#getDistance#1;class#Object#0" expanded="false" />
|
<element signature="method#getDistance#1;class#Object#0" expanded="false" />
|
||||||
<element signature="method#updatePosition#0;class#Object#0" expanded="false" />
|
<element signature="method#updatePosition#0;class#Object#0" expanded="false" />
|
||||||
<element signature="method#updateSpeed#0;class#Object#0" expanded="false" />
|
<element signature="method#updateSpeed#0;class#Object#0" expanded="false" />
|
||||||
<element signature="e#5778#5779#0" expanded="false" />
|
|
||||||
<element signature="e#5834#5835#0" expanded="false" />
|
|
||||||
<element signature="method#enactForceOnObject#0;class#Object#0" expanded="false" />
|
<element signature="method#enactForceOnObject#0;class#Object#0" expanded="false" />
|
||||||
</folding>
|
</folding>
|
||||||
</state>
|
</state>
|
||||||
@ -789,10 +722,7 @@
|
|||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="1188">
|
<state relative-caret-position="1188">
|
||||||
<caret line="55" column="39" selection-start-line="55" selection-start-column="39" selection-end-line="55" selection-end-column="39" />
|
<caret line="55" column="39" selection-start-line="55" selection-start-column="39" selection-end-line="55" selection-end-column="39" />
|
||||||
<folding>
|
<folding />
|
||||||
<element signature="method#run#0;class#Simulator#0" expanded="false" />
|
|
||||||
<element signature="method#accelerate#0;class#Simulator#0" expanded="false" />
|
|
||||||
</folding>
|
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
@ -801,16 +731,7 @@
|
|||||||
<state relative-caret-position="770">
|
<state relative-caret-position="770">
|
||||||
<caret line="40" column="21" selection-start-line="40" selection-start-column="21" selection-end-line="40" selection-end-column="21" />
|
<caret line="40" column="21" selection-start-line="40" selection-start-column="21" selection-end-line="40" selection-end-column="21" />
|
||||||
<folding>
|
<folding>
|
||||||
<element signature="imports" expanded="false" />
|
|
||||||
<element signature="e#976#977#0" expanded="false" />
|
|
||||||
<element signature="e#1010#1011#0" expanded="false" />
|
|
||||||
<element signature="e#1053#1054#0" expanded="false" />
|
|
||||||
<element signature="e#1124#1125#0" expanded="false" />
|
|
||||||
<element signature="method#getSpeed#0;class#Object#0" expanded="false" />
|
<element signature="method#getSpeed#0;class#Object#0" expanded="false" />
|
||||||
<element signature="e#1484#1485#0" expanded="false" />
|
|
||||||
<element signature="e#1524#1525#0" expanded="false" />
|
|
||||||
<element signature="e#1573#1574#0" expanded="false" />
|
|
||||||
<element signature="e#1656#1657#0" expanded="false" />
|
|
||||||
<element signature="method#getPosition#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#setAcceleration#1;class#Object#0" expanded="false" />
|
||||||
<element signature="method#getAcceleration#0;class#Object#0" expanded="false" />
|
<element signature="method#getAcceleration#0;class#Object#0" expanded="false" />
|
||||||
@ -821,8 +742,6 @@
|
|||||||
<element signature="method#getDistance#1;class#Object#0" expanded="false" />
|
<element signature="method#getDistance#1;class#Object#0" expanded="false" />
|
||||||
<element signature="method#updatePosition#0;class#Object#0" expanded="false" />
|
<element signature="method#updatePosition#0;class#Object#0" expanded="false" />
|
||||||
<element signature="method#updateSpeed#0;class#Object#0" expanded="false" />
|
<element signature="method#updateSpeed#0;class#Object#0" expanded="false" />
|
||||||
<element signature="e#5778#5779#0" expanded="false" />
|
|
||||||
<element signature="e#5834#5835#0" expanded="false" />
|
|
||||||
<element signature="method#enactForceOnObject#0;class#Object#0" expanded="false" />
|
<element signature="method#enactForceOnObject#0;class#Object#0" expanded="false" />
|
||||||
</folding>
|
</folding>
|
||||||
</state>
|
</state>
|
||||||
@ -846,10 +765,7 @@
|
|||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="578">
|
<state relative-caret-position="578">
|
||||||
<caret line="35" column="30" selection-start-line="35" selection-start-column="30" selection-end-line="35" selection-end-column="30" />
|
<caret line="35" column="30" selection-start-line="35" selection-start-column="30" selection-end-line="35" selection-end-column="30" />
|
||||||
<folding>
|
<folding />
|
||||||
<element signature="method#run#0;class#Simulator#0" expanded="false" />
|
|
||||||
<element signature="method#accelerate#0;class#Simulator#0" expanded="false" />
|
|
||||||
</folding>
|
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
@ -858,16 +774,7 @@
|
|||||||
<state relative-caret-position="0">
|
<state relative-caret-position="0">
|
||||||
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
||||||
<folding>
|
<folding>
|
||||||
<element signature="imports" expanded="false" />
|
|
||||||
<element signature="e#976#977#0" expanded="false" />
|
|
||||||
<element signature="e#1010#1011#0" expanded="false" />
|
|
||||||
<element signature="e#1053#1054#0" expanded="false" />
|
|
||||||
<element signature="e#1124#1125#0" expanded="false" />
|
|
||||||
<element signature="method#getSpeed#0;class#Object#0" expanded="false" />
|
<element signature="method#getSpeed#0;class#Object#0" expanded="false" />
|
||||||
<element signature="e#1484#1485#0" expanded="false" />
|
|
||||||
<element signature="e#1524#1525#0" expanded="false" />
|
|
||||||
<element signature="e#1573#1574#0" expanded="false" />
|
|
||||||
<element signature="e#1656#1657#0" expanded="false" />
|
|
||||||
<element signature="method#getPosition#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#setAcceleration#1;class#Object#0" expanded="false" />
|
||||||
<element signature="method#getAcceleration#0;class#Object#0" expanded="false" />
|
<element signature="method#getAcceleration#0;class#Object#0" expanded="false" />
|
||||||
@ -878,8 +785,6 @@
|
|||||||
<element signature="method#getDistance#1;class#Object#0" expanded="false" />
|
<element signature="method#getDistance#1;class#Object#0" expanded="false" />
|
||||||
<element signature="method#updatePosition#0;class#Object#0" expanded="false" />
|
<element signature="method#updatePosition#0;class#Object#0" expanded="false" />
|
||||||
<element signature="method#updateSpeed#0;class#Object#0" expanded="false" />
|
<element signature="method#updateSpeed#0;class#Object#0" expanded="false" />
|
||||||
<element signature="e#5778#5779#0" expanded="false" />
|
|
||||||
<element signature="e#5834#5835#0" expanded="false" />
|
|
||||||
<element signature="method#enactForceOnObject#0;class#Object#0" expanded="false" />
|
<element signature="method#enactForceOnObject#0;class#Object#0" expanded="false" />
|
||||||
</folding>
|
</folding>
|
||||||
</state>
|
</state>
|
||||||
@ -904,16 +809,7 @@
|
|||||||
<state relative-caret-position="238">
|
<state relative-caret-position="238">
|
||||||
<caret line="15" column="0" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
|
<caret line="15" column="0" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
|
||||||
<folding>
|
<folding>
|
||||||
<element signature="imports" expanded="false" />
|
|
||||||
<element signature="e#976#977#0" expanded="false" />
|
|
||||||
<element signature="e#1010#1011#0" expanded="false" />
|
|
||||||
<element signature="e#1053#1054#0" expanded="false" />
|
|
||||||
<element signature="e#1124#1125#0" expanded="false" />
|
|
||||||
<element signature="method#getSpeed#0;class#Object#0" expanded="false" />
|
<element signature="method#getSpeed#0;class#Object#0" expanded="false" />
|
||||||
<element signature="e#1484#1485#0" expanded="false" />
|
|
||||||
<element signature="e#1524#1525#0" expanded="false" />
|
|
||||||
<element signature="e#1573#1574#0" expanded="false" />
|
|
||||||
<element signature="e#1656#1657#0" expanded="false" />
|
|
||||||
<element signature="method#getPosition#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#setAcceleration#1;class#Object#0" expanded="false" />
|
||||||
<element signature="method#getAcceleration#0;class#Object#0" expanded="false" />
|
<element signature="method#getAcceleration#0;class#Object#0" expanded="false" />
|
||||||
@ -924,8 +820,6 @@
|
|||||||
<element signature="method#getDistance#1;class#Object#0" expanded="false" />
|
<element signature="method#getDistance#1;class#Object#0" expanded="false" />
|
||||||
<element signature="method#updatePosition#0;class#Object#0" expanded="false" />
|
<element signature="method#updatePosition#0;class#Object#0" expanded="false" />
|
||||||
<element signature="method#updateSpeed#0;class#Object#0" expanded="false" />
|
<element signature="method#updateSpeed#0;class#Object#0" expanded="false" />
|
||||||
<element signature="e#5778#5779#0" expanded="false" />
|
|
||||||
<element signature="e#5834#5835#0" expanded="false" />
|
|
||||||
<element signature="method#enactForceOnObject#0;class#Object#0" expanded="false" />
|
<element signature="method#enactForceOnObject#0;class#Object#0" expanded="false" />
|
||||||
</folding>
|
</folding>
|
||||||
</state>
|
</state>
|
||||||
@ -997,10 +891,6 @@
|
|||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="408">
|
<state relative-caret-position="408">
|
||||||
<caret line="52" column="41" selection-start-line="52" selection-start-column="25" selection-end-line="52" selection-end-column="41" />
|
<caret line="52" column="41" selection-start-line="52" selection-start-column="25" selection-end-line="52" selection-end-column="41" />
|
||||||
<folding>
|
|
||||||
<element signature="e#1368#1369#0" expanded="false" />
|
|
||||||
<element signature="e#1412#1413#0" expanded="false" />
|
|
||||||
</folding>
|
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
@ -1008,20 +898,10 @@
|
|||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="119">
|
<state relative-caret-position="119">
|
||||||
<caret line="7" column="1" selection-start-line="7" selection-start-column="1" selection-end-line="7" selection-end-column="1" />
|
<caret line="7" column="1" selection-start-line="7" selection-start-column="1" selection-end-line="7" selection-end-column="1" />
|
||||||
<folding />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/Node.java">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="476">
|
|
||||||
<caret line="34" column="27" selection-start-line="34" selection-start-column="27" selection-end-line="34" selection-end-column="27" />
|
|
||||||
<folding>
|
|
||||||
<element signature="method#empty#0;class#Node#0" expanded="false" />
|
|
||||||
</folding>
|
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/Node.java" />
|
||||||
<entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/Object.java">
|
<entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/Object.java">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="1241">
|
<state relative-caret-position="1241">
|
||||||
@ -1043,20 +923,6 @@
|
|||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/processor/Processor.java">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="238">
|
|
||||||
<caret line="141" column="0" selection-start-line="141" selection-start-column="0" selection-end-line="141" selection-end-column="0" />
|
|
||||||
<folding>
|
|
||||||
<element signature="method#Processor#0;class#Processor#0" expanded="false" />
|
|
||||||
<element signature="method#process#0;class#Processor#0" expanded="false" />
|
|
||||||
<element signature="method#write#0;class#Processor#0" expanded="false" />
|
|
||||||
<element signature="method#objectArrayToHashMap#0;class#Processor#0" expanded="false" />
|
|
||||||
<element signature="method#close#0;class#Processor#0" expanded="false" />
|
|
||||||
</folding>
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/processor/ObjectProcessor.java">
|
<entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/processor/ObjectProcessor.java">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="255">
|
<state relative-caret-position="255">
|
||||||
@ -1079,7 +945,6 @@
|
|||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="17">
|
<state relative-caret-position="17">
|
||||||
<caret line="8" column="36" selection-start-line="8" selection-start-column="36" selection-end-line="8" selection-end-column="36" />
|
<caret line="8" column="36" selection-start-line="8" selection-start-column="36" selection-end-line="8" selection-end-column="36" />
|
||||||
<folding />
|
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
@ -1096,30 +961,40 @@
|
|||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/Simulator.java">
|
<entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/Simulator.java">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="867">
|
<state relative-caret-position="1071">
|
||||||
<caret line="56" column="40" selection-start-line="56" selection-start-column="40" selection-end-line="56" selection-end-column="40" />
|
<caret line="68" column="0" selection-start-line="68" selection-start-column="0" selection-end-line="68" selection-end-column="0" />
|
||||||
<folding>
|
|
||||||
<element signature="method#accelerate#0;class#Simulator#0" expanded="false" />
|
|
||||||
</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="16">
|
|
||||||
<caret line="14" column="51" selection-start-line="14" selection-start-column="51" selection-end-line="14" selection-end-column="51" />
|
|
||||||
<folding />
|
<folding />
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/Main.java">
|
<entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/Main.java">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="404">
|
<state relative-caret-position="437">
|
||||||
<caret line="45" column="11" selection-start-line="45" selection-start-column="11" selection-end-line="45" selection-end-column="11" />
|
<caret line="46" column="11" selection-start-line="46" selection-start-column="11" selection-end-line="46" selection-end-column="11" />
|
||||||
<folding />
|
<folding />
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</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="119">
|
||||||
|
<caret line="7" column="44" selection-start-line="7" selection-start-column="44" selection-end-line="7" selection-end-column="44" />
|
||||||
|
<folding />
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/processor/Processor.java">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="136">
|
||||||
|
<caret line="17" column="74" selection-start-line="17" selection-start-column="74" selection-end-line="17" selection-end-column="74" />
|
||||||
|
<folding>
|
||||||
|
<element signature="method#Processor#0;class#Processor#0" expanded="false" />
|
||||||
|
<element signature="method#write#0;class#Processor#0" expanded="false" />
|
||||||
|
<element signature="method#objectArrayToHashMap#0;class#Processor#0" expanded="false" />
|
||||||
|
</folding>
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
</component>
|
</component>
|
||||||
<component name="masterDetails">
|
<component name="masterDetails">
|
||||||
<states>
|
<states>
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
@ -5,7 +5,7 @@ public class SimulatorConfig {
|
|||||||
* Time settings
|
* Time settings
|
||||||
*/
|
*/
|
||||||
|
|
||||||
public static int rounds = 526100 * 250; // Amount of rounds to run the simulator for
|
public static int rounds = 526100 * 1000; // Amount of rounds to run the simulator for
|
||||||
public static double time = 60; // Time steps in seconds
|
public static double time = 60; // Time steps in seconds
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -15,8 +15,7 @@ public class Processor {
|
|||||||
private DataWriter writer;
|
private DataWriter writer;
|
||||||
public HashMap<String, Object> initialObjectValues = new HashMap<>();
|
public HashMap<String, Object> initialObjectValues = new HashMap<>();
|
||||||
public HashMap<String, ObjectProcessor> objects = new HashMap<>();
|
public HashMap<String, ObjectProcessor> objects = new HashMap<>();
|
||||||
|
public HashMap<String, ArrayList<Double>> arguments = new HashMap<>();
|
||||||
public ArrayList<Double> arguments = new ArrayList<>();
|
|
||||||
|
|
||||||
public Processor(Object[] objects) throws ProcessingException, WritingException {
|
public Processor(Object[] objects) throws ProcessingException, WritingException {
|
||||||
/**
|
/**
|
||||||
@ -83,9 +82,9 @@ public class Processor {
|
|||||||
}
|
}
|
||||||
|
|
||||||
//System.out.println("Position during apastron (AU): " + AU.convertFromMeter(object.aphelion));
|
//System.out.println("Position during apastron (AU): " + AU.convertFromMeter(object.aphelion));
|
||||||
System.out.println("Distance from (the) " + SimulatorConfig.sunName + " during apastron in km: " + object.aphelionDistance / 1000 + "\n");
|
//System.out.println("Distance from (the) " + SimulatorConfig.sunName + " during apastron in km: " + object.aphelionDistance / 1000 + "\n");
|
||||||
//System.out.println("Position during periastron (AU): " + AU.convertFromMeter(object.perihelion));
|
//System.out.println("Position during periastron (AU): " + AU.convertFromMeter(object.perihelion));
|
||||||
System.out.println("Distance from (the) " + SimulatorConfig.sunName + " during periastron in km: " + object.perihelionDistance / 1000 + "\n");
|
//System.out.println("Distance from (the) " + SimulatorConfig.sunName + " during periastron in km: " + object.perihelionDistance / 1000 + "\n");
|
||||||
} else {
|
} else {
|
||||||
//System.out.println("Current position (m): " + objects.get(objectName).position + "\n");
|
//System.out.println("Current position (m): " + objects.get(objectName).position + "\n");
|
||||||
//System.out.println("Highest point (z-axis graph) (m): " + object.absoluteMax);
|
//System.out.println("Highest point (z-axis graph) (m): " + object.absoluteMax);
|
||||||
@ -105,17 +104,24 @@ public class Processor {
|
|||||||
}
|
}
|
||||||
|
|
||||||
//System.out.println("Position during apastron (m): " + object.aphelion);
|
//System.out.println("Position during apastron (m): " + object.aphelion);
|
||||||
System.out.println("Distance from (the) " + SimulatorConfig.sunName + " during apastron in km: " + object.aphelionDistance / 1000 + "\n");
|
///System.out.println("Distance from (the) " + SimulatorConfig.sunName + " during apastron in km: " + object.aphelionDistance / 1000);
|
||||||
//System.out.println("Position during periastron (m): " + object.perihelion);
|
//System.out.println("Position during periastron (m): " + object.perihelion);
|
||||||
System.out.println("Distance from (the) " + SimulatorConfig.sunName + " during periastron in km: " + object.perihelionDistance / 1000 + "\n");
|
//System.out.println("Distance from (the) " + SimulatorConfig.sunName + " during periastron in km: " + object.perihelionDistance / 1000 + "\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (object.ascendingNode != null) {
|
if (object.ascendingNode != null) {
|
||||||
System.out.println("Argument of periapsis (radians): " + AOP.calculate(object.ascendingNode, object.perihelion, object.aphelion));
|
System.out.println("Argument of periapsis (radians): " + AOP.calculate(object.ascendingNode, object.perihelion, object.aphelion));
|
||||||
System.out.println("Argument of periapsis (degrees): " + Math.toDegrees(AOP.calculate(object.ascendingNode, object.perihelion, object.aphelion)));
|
//System.out.println("Argument of periapsis (degrees): " + Math.toDegrees(AOP.calculate(object.ascendingNode, object.perihelion, object.aphelion)));
|
||||||
|
|
||||||
if (object.checkNodes()) {
|
if (object.checkNodes()) {
|
||||||
arguments.add(Math.toDegrees(AOP.calculate(object.ascendingNode, object.perihelion, object.aphelion)));
|
// Add the node to the list
|
||||||
|
if (arguments.get(objectName) == null) {
|
||||||
|
// If not defined
|
||||||
|
ArrayList<Double> agmnts = new ArrayList<>();
|
||||||
|
arguments.put(objectName, agmnts);
|
||||||
|
}
|
||||||
|
|
||||||
|
arguments.get(objectName).add(AOP.calculate(object.ascendingNode, object.perihelion, object.aphelion));
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
@ -166,18 +172,30 @@ public class Processor {
|
|||||||
public void close() throws ProcessingException {
|
public void close() throws ProcessingException {
|
||||||
try {
|
try {
|
||||||
this.writer.save();
|
this.writer.save();
|
||||||
|
|
||||||
System.out.println("RESULTS: " + arguments);
|
System.out.println("RESULTS: " + arguments);
|
||||||
|
|
||||||
// CALCULATE AVERAGE
|
for(String objectName : SimulatorConfig.objectNames) {
|
||||||
|
ArrayList<Double> arguments = this.arguments.get(objectName);
|
||||||
|
double score = 0;
|
||||||
|
|
||||||
double sum = 0;
|
// Calculate score
|
||||||
for (int i = 0; i < arguments.size(); i++){
|
for(int i = 1; i < arguments.size() - 1; i++) {
|
||||||
sum = sum + arguments.get(i);
|
score = score + Math.abs(arguments.get(i-1) - arguments.get(i));
|
||||||
|
}
|
||||||
|
|
||||||
|
System.out.println("SCORE: " + score);
|
||||||
|
|
||||||
|
// CALCULATE AVERAGE
|
||||||
|
double sum = 0;
|
||||||
|
for (int i = 0; i < arguments.size(); i++){
|
||||||
|
sum = sum + arguments.get(i);
|
||||||
|
}
|
||||||
|
// calculate average
|
||||||
|
double average = sum / arguments.size();
|
||||||
|
|
||||||
|
System.out.println("AVERAGE (degrees): " + Math.toDegrees(average));
|
||||||
}
|
}
|
||||||
// calculate average
|
|
||||||
double average = sum / arguments.size();
|
|
||||||
|
|
||||||
System.out.println("AVERAGE: " + average);
|
|
||||||
} catch(WritingException e) {
|
} catch(WritingException e) {
|
||||||
throw new ProcessingException("An error occurred during creation of the file writer: " + e.toString());
|
throw new ProcessingException("An error occurred during creation of the file writer: " + e.toString());
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user