1
0
mirror of https://github.com/christiaangoossens/Planetary-Orbit-Simulator synced 2024-12-22 15:55:41 +00:00

Added license in code + main commenting

This commit is contained in:
Christiaan Goossens 2016-07-07 08:44:08 +02:00
parent 215455f768
commit 44b6f8c40d
2 changed files with 53 additions and 53 deletions

View File

@ -27,11 +27,11 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="Main.java" pinned="false" current-in-tab="false">
<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="102">
<caret line="6" column="44" selection-start-line="6" selection-start-column="44" selection-end-line="6" selection-end-column="44" />
<state relative-caret-position="153">
<caret line="9" column="25" selection-start-line="9" selection-start-column="25" selection-end-line="9" selection-end-column="25" />
<folding />
</state>
</provider>
@ -49,11 +49,11 @@
</provider>
</entry>
</file>
<file leaf-file-name="Object.java" pinned="false" current-in-tab="true">
<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="518">
<caret line="61" column="23" selection-start-line="61" selection-start-column="23" selection-end-line="61" selection-end-column="23" />
<state relative-caret-position="161">
<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" />
</folding>
@ -64,7 +64,7 @@
<file leaf-file-name="Vector3dMatrix.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/mathUtils/Vector3dMatrix.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-323">
<state relative-caret-position="-1692">
<caret line="5" column="45" selection-start-line="5" selection-start-column="45" selection-end-line="5" selection-end-column="45" />
<folding>
<element signature="imports" expanded="true" />
@ -97,10 +97,10 @@
<option value="$PROJECT_DIR$/src/com/verictas/pos/simulator/Vector3fMatrix.java" />
<option value="$PROJECT_DIR$/src/com/verictas/pos/simulator/mathUtils/MatrixPosition.java" />
<option value="$PROJECT_DIR$/src/com/verictas/pos/simulator/mathUtils/Vector3fMatrix.java" />
<option value="$PROJECT_DIR$/src/com/verictas/pos/simulator/Main.java" />
<option value="$PROJECT_DIR$/src/com/verictas/pos/simulator/Object.java" />
<option value="$PROJECT_DIR$/src/com/verictas/pos/simulator/Simulator.java" />
<option value="$PROJECT_DIR$/src/com/verictas/pos/simulator/mathUtils/Vector3dMatrix.java" />
<option value="$PROJECT_DIR$/src/com/verictas/pos/simulator/Main.java" />
</list>
</option>
</component>
@ -207,28 +207,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>
</subPane>
</pane>
<pane id="PackagesPane" />
@ -636,11 +614,23 @@
</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/mathUtils/Vector3dMatrix.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
<caret line="6" column="44" selection-start-line="6" selection-start-column="44" selection-end-line="6" selection-end-column="44" />
<folding />
<state relative-caret-position="-1692">
<caret line="5" column="45" selection-start-line="5" selection-start-column="45" selection-end-line="5" selection-end-column="45" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/Object.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="161">
<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" />
</folding>
</state>
</provider>
</entry>
@ -654,23 +644,11 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/mathUtils/Vector3dMatrix.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="-323">
<caret line="5" column="45" selection-start-line="5" selection-start-column="45" selection-end-line="5" selection-end-column="45" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/com/verictas/pos/simulator/Object.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="518">
<caret line="61" column="23" selection-start-line="61" selection-start-column="23" selection-end-line="61" selection-end-column="23" />
<folding>
<element signature="imports" expanded="true" />
</folding>
<state relative-caret-position="153">
<caret line="9" column="25" selection-start-line="9" selection-start-column="25" selection-end-line="9" selection-end-column="25" />
<folding />
</state>
</provider>
</entry>

View File

@ -3,17 +3,39 @@ package com.verictas.pos.simulator;
import javax.vecmath.*;
public class Main {
/**
* PLANETARY ORBIT SIMULATOR
* Data Simulation Tool
*
* Programmed for the PWS "Planeet Negen" for the Stedelijk Gymnasium Nijmegen, the Netherlands.
*
* ==================================
*
* The MIT License (MIT)
* Copyright (c) 2016 Christiaan Goossens (Verictas) & Daniel Boutros
*
* The full license is included in the git respository as LICENSE.md
*/
public static void main(String[] args) {
/**
* Object definitions
*/
Object object1 = new Object(1000, new Vector3d(1,2,3), new Vector3d(0,4,3));
Object object2 = new Object(200, new Vector3d(2,38,2), new Vector3d(3,4,5));
Object object3 = new Object(200, new Vector3d(2,-20,2), new Vector3d(3,4,5));
Object object4 = new Object(200, new Vector3d(2,4,2), new Vector3d(3,4,5));
// Make a list of all the objects
/**
* Object listing
*/
Object[] objects = {object1, object2, object3, object4};
// Start the simulation
Simulator.run(2, objects);
/**
* Run the simulator for the specified amount of rounds
*/
int rounds = 2;
Simulator.run(rounds, objects);
}
}