diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..206d825
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+/monte-carlo/out
+/simulator/out
\ No newline at end of file
diff --git a/monte-carlo/.idea/compiler.xml b/monte-carlo/.idea/compiler.xml
new file mode 100644
index 0000000..96cc43e
--- /dev/null
+++ b/monte-carlo/.idea/compiler.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/monte-carlo/.idea/copyright/profiles_settings.xml b/monte-carlo/.idea/copyright/profiles_settings.xml
new file mode 100644
index 0000000..e7bedf3
--- /dev/null
+++ b/monte-carlo/.idea/copyright/profiles_settings.xml
@@ -0,0 +1,3 @@
+
+
+
\ No newline at end of file
diff --git a/monte-carlo/.idea/misc.xml b/monte-carlo/.idea/misc.xml
new file mode 100644
index 0000000..47095a6
--- /dev/null
+++ b/monte-carlo/.idea/misc.xml
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1.8
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/monte-carlo/.idea/modules.xml b/monte-carlo/.idea/modules.xml
new file mode 100644
index 0000000..3c147ab
--- /dev/null
+++ b/monte-carlo/.idea/modules.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/monte-carlo/.idea/workspace.xml b/monte-carlo/.idea/workspace.xml
new file mode 100644
index 0000000..7f1661d
--- /dev/null
+++ b/monte-carlo/.idea/workspace.xml
@@ -0,0 +1,221 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1478875683077
+
+
+ 1478875683077
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/monte-carlo/monte-carlo.iml b/monte-carlo/monte-carlo.iml
new file mode 100644
index 0000000..c90834f
--- /dev/null
+++ b/monte-carlo/monte-carlo.iml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/simulator/.idea/workspace.xml b/simulator/.idea/workspace.xml
index 9c03114..65ba992 100644
--- a/simulator/.idea/workspace.xml
+++ b/simulator/.idea/workspace.xml
@@ -7,9 +7,11 @@
+
+
@@ -32,7 +34,42 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
@@ -130,9 +167,6 @@
-
-
-
@@ -251,6 +285,9 @@
+
+
+
@@ -554,18 +591,16 @@
-
-
+
+
-
-
+
-
@@ -574,13 +609,15 @@
-
+
+
+
@@ -927,17 +964,6 @@
-
-
-
-
-
-
-
-
-
-
-
@@ -952,10 +978,6 @@
-
-
-
-
@@ -967,31 +989,31 @@
-
+
-
-
-
+
+
+
+
+
+
+
-
-
+
+
-
+
-
-
-
-
-
-
-
+
+
+
diff --git a/simulator/out/artifacts/simulator_jar/run.bat b/simulator/out/artifacts/simulator_jar/run.bat
deleted file mode 100644
index 69713b9..0000000
--- a/simulator/out/artifacts/simulator_jar/run.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-java -jar simulator.jar > log.txt
-pause
\ No newline at end of file
diff --git a/simulator/out/artifacts/simulator_jar/simulator.jar b/simulator/out/artifacts/simulator_jar/simulator.jar
deleted file mode 100644
index b728ced..0000000
Binary files a/simulator/out/artifacts/simulator_jar/simulator.jar and /dev/null differ
diff --git a/simulator/out/production/simulator/META-INF/MANIFEST.MF b/simulator/out/production/simulator/META-INF/MANIFEST.MF
deleted file mode 100644
index 3b9e3a9..0000000
--- a/simulator/out/production/simulator/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Main-Class: com.verictas.pos.simulator.Main
-
diff --git a/simulator/out/production/simulator/com/verictas/pos/simulator/Main.class b/simulator/out/production/simulator/com/verictas/pos/simulator/Main.class
deleted file mode 100644
index 971084f..0000000
Binary files a/simulator/out/production/simulator/com/verictas/pos/simulator/Main.class and /dev/null differ
diff --git a/simulator/out/production/simulator/com/verictas/pos/simulator/Node.class b/simulator/out/production/simulator/com/verictas/pos/simulator/Node.class
deleted file mode 100644
index d156f40..0000000
Binary files a/simulator/out/production/simulator/com/verictas/pos/simulator/Node.class and /dev/null differ
diff --git a/simulator/out/production/simulator/com/verictas/pos/simulator/Object.class b/simulator/out/production/simulator/com/verictas/pos/simulator/Object.class
deleted file mode 100644
index 9335055..0000000
Binary files a/simulator/out/production/simulator/com/verictas/pos/simulator/Object.class and /dev/null differ
diff --git a/simulator/out/production/simulator/com/verictas/pos/simulator/Simulator.class b/simulator/out/production/simulator/com/verictas/pos/simulator/Simulator.class
deleted file mode 100644
index 1d0bebc..0000000
Binary files a/simulator/out/production/simulator/com/verictas/pos/simulator/Simulator.class and /dev/null differ
diff --git a/simulator/out/production/simulator/com/verictas/pos/simulator/SimulatorConfig.class b/simulator/out/production/simulator/com/verictas/pos/simulator/SimulatorConfig.class
deleted file mode 100644
index e84cc59..0000000
Binary files a/simulator/out/production/simulator/com/verictas/pos/simulator/SimulatorConfig.class and /dev/null differ
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
deleted file mode 100644
index 0e6da9d..0000000
Binary files a/simulator/out/production/simulator/com/verictas/pos/simulator/dataWriter/DataWriter.class and /dev/null differ
diff --git a/simulator/out/production/simulator/com/verictas/pos/simulator/dataWriter/WritingException.class b/simulator/out/production/simulator/com/verictas/pos/simulator/dataWriter/WritingException.class
deleted file mode 100644
index 63438e4..0000000
Binary files a/simulator/out/production/simulator/com/verictas/pos/simulator/dataWriter/WritingException.class and /dev/null differ
diff --git a/simulator/out/production/simulator/com/verictas/pos/simulator/mathUtils/AOP.class b/simulator/out/production/simulator/com/verictas/pos/simulator/mathUtils/AOP.class
deleted file mode 100644
index a3afb94..0000000
Binary files a/simulator/out/production/simulator/com/verictas/pos/simulator/mathUtils/AOP.class and /dev/null differ
diff --git a/simulator/out/production/simulator/com/verictas/pos/simulator/mathUtils/AU.class b/simulator/out/production/simulator/com/verictas/pos/simulator/mathUtils/AU.class
deleted file mode 100644
index 45881e8..0000000
Binary files a/simulator/out/production/simulator/com/verictas/pos/simulator/mathUtils/AU.class and /dev/null differ
diff --git a/simulator/out/production/simulator/com/verictas/pos/simulator/mathUtils/Vector3dMatrix.class b/simulator/out/production/simulator/com/verictas/pos/simulator/mathUtils/Vector3dMatrix.class
deleted file mode 100644
index 503b6d3..0000000
Binary files a/simulator/out/production/simulator/com/verictas/pos/simulator/mathUtils/Vector3dMatrix.class and /dev/null differ
diff --git a/simulator/out/production/simulator/com/verictas/pos/simulator/processor/ObjectProcessor.class b/simulator/out/production/simulator/com/verictas/pos/simulator/processor/ObjectProcessor.class
deleted file mode 100644
index c5892b7..0000000
Binary files a/simulator/out/production/simulator/com/verictas/pos/simulator/processor/ObjectProcessor.class and /dev/null differ
diff --git a/simulator/out/production/simulator/com/verictas/pos/simulator/processor/ProcessingException.class b/simulator/out/production/simulator/com/verictas/pos/simulator/processor/ProcessingException.class
deleted file mode 100644
index 753356b..0000000
Binary files a/simulator/out/production/simulator/com/verictas/pos/simulator/processor/ProcessingException.class and /dev/null differ
diff --git a/simulator/out/production/simulator/com/verictas/pos/simulator/processor/Processor.class b/simulator/out/production/simulator/com/verictas/pos/simulator/processor/Processor.class
deleted file mode 100644
index 54e4553..0000000
Binary files a/simulator/out/production/simulator/com/verictas/pos/simulator/processor/Processor.class and /dev/null differ
diff --git a/simulator/src/com/verictas/pos/simulator/Main.java b/simulator/src/com/verictas/pos/simulator/Main.java
index 933662b..e484401 100644
--- a/simulator/src/com/verictas/pos/simulator/Main.java
+++ b/simulator/src/com/verictas/pos/simulator/Main.java
@@ -42,12 +42,24 @@ public class Main {
Object saturn = new Object("Saturn", 5.68319E26, AU.convertToMeter(new Vector3d(-3.710637850378867E+00,-9.289569433157130E+00,3.091990731378936E-01)), AU.convertToMetersPerSecond(new Vector3d(4.874750391005278E-03,-2.086615906689840E-03,-1.574898601194673E-04)));
Object venus = new Object("Venus", 48.685E23, AU.convertToMeter(new Vector3d(-7.130901319004951E-01,-5.719763212192740E-02,4.040076577877051E-02)), AU.convertToMetersPerSecond(new Vector3d(1.525993024372452E-03,-2.024175581604569E-02,-3.656582385749146E-04)));
Object mars = new Object("Mars", 6.4185E23, AU.convertToMeter(new Vector3d(-1.644664047074283E+00,1.714211195991345E-01,4.385749324150048E-02)), AU.convertFromMetersPerSecond(new Vector3d(-9.128062787682906E-04, -1.271783289037382E-02, -2.442517367300464E-04)));
+ Object pluto = new Object("Pluto", 1.307E22, AU.convertToMeter(new Vector3d(8.535178336776600E+00,-3.187687983153820E+01,9.421570822362236E-01)), AU.convertFromMetersPerSecond(new Vector3d(3.105916866228581E-03, 1.759704223757070E-04, -9.146208184741589E-04)));
+ Object neptune = new Object("Neptune", 102.41E24, AU.convertToMeter(new Vector3d(2.795458622849629E+01,-1.077602237438394E+01,-4.223299945454949E-01)), AU.convertFromMetersPerSecond(new Vector3d(1.108107308612818E-03, 2.948021656576779E-03, -8.584675894389943E-05)));
+ Object uranus = new Object("Uranus", 86.8103E24, AU.convertToMeter(new Vector3d(1.887206485673029E+01,6.554830107743496E+00,-2.201473388797619E-01)), AU.convertFromMetersPerSecond(new Vector3d(-1.319173006464416E-03, 3.532006412470987E-03, 3.002475806591822E-05)));
+ Object charon = new Object("Charon", 1.53E21, AU.convertToMeter(new Vector3d(8.535206843097511E+00,-3.187692375327401E+01,9.420370068039806E-01)), AU.convertFromMetersPerSecond(new Vector3d(3.015458707073605E-03, 8.495285732817140E-05, -9.028237165874783E-04)));
+
+ // PWS Objects
+ Object object1 = new Object("Sedna", 4E21, AU.convertToMeter(new Vector3d(4.831201219703945E+01, 6.863113643822504E+01, -1.773001247239095E+01)), AU.convertToMetersPerSecond(new Vector3d(-2.401309021644802E-03, 7.269559406640982E-04, 1.704114106899654E-04)));
+ Object object2 = new Object("2012 VP113", 2.7E18, AU.convertToMeter(new Vector3d(5.074554081273273E+01, 6.194684521116067E+01, -2.303377758579428E+01)), AU.convertToMetersPerSecond(new Vector3d(-1.390042223661063E-03, 1.919356165611094E-03, 6.083057470436023E-04)));
+ Object object3 = new Object("2004 VN112", 0, AU.convertToMeter(new Vector3d(3.338469440683407E+01, 3.296760926256486E+01, -8.176834813898699E+00)), AU.convertToMetersPerSecond(new Vector3d(-1.830443771273609E-03, 2.551493797427650E-03, 1.295080364913495E-03)));
+ Object object4 = new Object("2007 TG442", 0, AU.convertToMeter(new Vector3d(-2.216102118938070E+00, -5.957656766688118E-01, -9.228532887388547E-03)), AU.convertToMetersPerSecond(new Vector3d(1.973707536998759E-03, -1.106231446142322E-02, -1.188438173809993E-04)));
+ Object object5 = new Object("2013 RF98", 0, AU.convertToMeter(new Vector3d(2.809064890818173E+01, 2.117251775628629E+01, -1.015547278525787E+01)), AU.convertToMetersPerSecond(new Vector3d(-1.408524658517317E-03, 3.354634129283988E-03, 1.461376116722572E-03)));
+ Object object6 = new Object("2010 GB174", 0, AU.convertToMeter(new Vector3d(-6.661904379651325E+01, -8.411238128232725E+00, 2.212233193483758E+01)), AU.convertFromMetersPerSecond(new Vector3d(-9.610782795963537E-04, -2.406268777135870E-03, 9.081217152229448E-04)));
/**
* Object listing
*/
- Object[] objects = {sun, earth, moon, jupiter, saturn};
+ Object[] objects = {sun, jupiter, object1, object2};
/**
diff --git a/simulator/src/com/verictas/pos/simulator/SimulatorConfig.java b/simulator/src/com/verictas/pos/simulator/SimulatorConfig.java
index e72e480..fd050ca 100644
--- a/simulator/src/com/verictas/pos/simulator/SimulatorConfig.java
+++ b/simulator/src/com/verictas/pos/simulator/SimulatorConfig.java
@@ -5,15 +5,15 @@ public class SimulatorConfig {
* Time settings
*/
- 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 int rounds = 3000000; // Amount of rounds to run the simulator for // 3000000 = 250.000 jaar
+ public static double time = 2592000; // Time steps in seconds // 259200 = 1 month
/**
* Object settings
*/
public static String sunName = "Sun"; // The name of the sun to calculate values TO
- public static String[] objectNames = { "Earth" }; // The name of the object(s) your want to calculate the values OF
+ public static String[] objectNames = { "Sedna", "2012 VP113" }; // The name of the object(s) your want to calculate the values OF
/**
* Output preferences
@@ -21,7 +21,7 @@ public class SimulatorConfig {
public static String outputUnit = "AU"; // Preferred output unit preference (AU => AU/day, m => m/s)
public static int outputNumbers = 0; // Preferred way of outputting numbers: (0 => comma for decimals, dot in large numbers OR 1 => comma for large numbers, dot with decimals)
- public static int skipLines = 1440; // 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 = 2400; // 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 boolean skipUnnecessary = true; // Skip the unnecessary objects in the export
/**
diff --git a/simulator/src/com/verictas/pos/simulator/processor/Processor.java b/simulator/src/com/verictas/pos/simulator/processor/Processor.java
index c3a1881..ab8e2fd 100644
--- a/simulator/src/com/verictas/pos/simulator/processor/Processor.java
+++ b/simulator/src/com/verictas/pos/simulator/processor/Processor.java
@@ -82,9 +82,9 @@ public class Processor {
}
//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("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 {
//System.out.println("Current position (m): " + objects.get(objectName).position + "\n");
//System.out.println("Highest point (z-axis graph) (m): " + object.absoluteMax);
@@ -104,9 +104,9 @@ public class Processor {
}
//System.out.println("Position during apastron (m): " + object.aphelion);
- ///System.out.println("Distance from (the) " + SimulatorConfig.sunName + " during apastron in km: " + object.aphelionDistance / 1000);
+ 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("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) {
@@ -173,7 +173,7 @@ public class Processor {
try {
this.writer.save();
- System.out.println("RESULTS: " + arguments);
+ System.out.println("TOTAL RESULTS: " + arguments);
for(String objectName : SimulatorConfig.objectNames) {
ArrayList arguments = this.arguments.get(objectName);
@@ -184,7 +184,7 @@ public class Processor {
score = score + Math.abs(arguments.get(i-1) - arguments.get(i));
}
- System.out.println("SCORE: " + score);
+ System.out.println("SCORE (" + objectName + "): " + score);
// CALCULATE AVERAGE
double sum = 0;
@@ -194,7 +194,7 @@ public class Processor {
// calculate average
double average = sum / arguments.size();
- System.out.println("AVERAGE (degrees): " + Math.toDegrees(average));
+ System.out.println("AVERAGE (" + objectName + ") (degrees): " + Math.toDegrees(average));
}
} catch(WritingException e) {
throw new ProcessingException("An error occurred during creation of the file writer: " + e.toString());