Skip to content

New data #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: unga-forskare
Choose a base branch
from
Open

New data #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
091e37d
New data
AlbinSjoegren Mar 9, 2022
1464fc5
Updated a star system and fixed collision reporting
AlbinSjoegren Mar 9, 2022
0158233
stability testing with changes in initial velocity and position (no PID)
AlbinSjoegren Mar 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions app/simulation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import os
import numpy as np
from libs.vectors import mag3d, sqrMag3d, unitVec3d, unitVecFastSqr3d, distance3d
import libs.physics as phy
Expand Down Expand Up @@ -37,6 +38,7 @@ def rebasePosition(self, anchorBody):
anchorBody.vel = np.zeros(3)

def collisionHandler(self, body1, body2):
os.makedirs(self.collisionLogPath, exist_ok=True)
now = datetime.now()
filename = f"{self.collisionLogPath}collisions_{now.year}-{now.month}-{now.day}T{now.hour}-{now.minute}-{now.second}.txt"
with open(filename, "w+") as f:
Expand Down Expand Up @@ -160,6 +162,7 @@ def setupOrbits(self, iterations, Kp, Ki, Kd, lowestErrorDamp, errorDampSharpnes
print(f"bodyVelocity: {mag3d(body.vel)}")
# Use PID controller to arrive at optimal initial velocities
if(not doPID): return
return
lastErrors = [0] * n
integrals = [0] * n
for j in range(iterations):
Expand Down
14 changes: 14 additions & 0 deletions ...e data/2 Cam position and velocity change/2 Camelopardalis -1000km & -10000m per s/A.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"name": "A",
"mass": 3.8576318e+30,
"radius": 847380000,
"refBodies": "A",
"ecc": 0,
"semiLatRect": 0,
"x_pos": 0.0,
"y_pos": 0.0,
"z_pos": 0.0,
"x_vel": 0.0,
"y_vel": 0.0,
"z_vel": 0.0
}
14 changes: 14 additions & 0 deletions ...e data/2 Cam position and velocity change/2 Camelopardalis -1000km & -10000m per s/B.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"name": "B",
"mass": 2.8832815e+30,
"radius": 597933600,
"refBodies": "A",
"ecc": 0.846,
"semiLatRect": 5.649400300536e+11,
"x_pos": -3125187914560.047,
"y_pos": 1013098667635.3763,
"z_pos": -1483084842703.4502,
"x_vel": -9553.595530545,
"y_vel": -6336.296861602,
"z_vel": 6912.00792086
}
14 changes: 14 additions & 0 deletions ...e data/2 Cam position and velocity change/2 Camelopardalis -1000km & -10000m per s/C.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"name": "C",
"mass": 2.982705e+30,
"radius": 107323200,
"refBodies": "A,B",
"ecc": 0.405,
"semiLatRect": 1.602602738995e+13,
"x_pos": -7409283968633.752,
"y_pos": -2436383295686.0146,
"z_pos": 8506551370117.136,
"x_vel": 7878.752717209,
"y_vel": -1454.784432962,
"z_vel": 9621.295465212
}
14 changes: 14 additions & 0 deletions ...ple data/2 Cam position and velocity change/2 Camelopardalis -100km & -1000m per s/A.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"name": "A",
"mass": 3.8576318e+30,
"radius": 847380000,
"refBodies": "A",
"ecc": 0,
"semiLatRect": 0,
"x_pos": 0.0,
"y_pos": 0.0,
"z_pos": 0.0,
"x_vel": 0.0,
"y_vel": 0.0,
"z_vel": 0.0
}
14 changes: 14 additions & 0 deletions ...ple data/2 Cam position and velocity change/2 Camelopardalis -100km & -1000m per s/B.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"name": "B",
"mass": 2.8832815e+30,
"radius": 597933600,
"refBodies": "A",
"ecc": 0.846,
"semiLatRect": 5.649400300536e+11,
"x_pos": -3125188814560.047,
"y_pos": 1013099567635.3763,
"z_pos": -1483085742703.4502,
"x_vel": -553.595530545,
"y_vel": 2663.7031383982853,
"z_vel": -2087.9920791396903
}
14 changes: 14 additions & 0 deletions ...ple data/2 Cam position and velocity change/2 Camelopardalis -100km & -1000m per s/C.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"name": "C",
"mass": 2.982705e+30,
"radius": 107323200,
"refBodies": "A,B",
"ecc": 0.405,
"semiLatRect": 1.602602738995e+13,
"x_pos": -7409284868633.752,
"y_pos": -2436384395686.0146,
"z_pos": 8506552270117.136,
"x_vel": -1121.2472827909405,
"y_vel": 7545.215567037536,
"z_vel": 621.295465212
}
14 changes: 14 additions & 0 deletions example data/2 Cam position and velocity change/2 Camelopardalis -10km & -100m per s/A.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"name": "A",
"mass": 3.8576318e+30,
"radius": 847380000,
"refBodies": "A",
"ecc": 0,
"semiLatRect": 0,
"x_pos": 0.0,
"y_pos": 0.0,
"z_pos": 0.0,
"x_vel": 0.0,
"y_vel": 0.0,
"z_vel": 0.0
}
14 changes: 14 additions & 0 deletions example data/2 Cam position and velocity change/2 Camelopardalis -10km & -100m per s/B.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"name": "B",
"mass": 2.8832815e+30,
"radius": 597933600,
"refBodies": "A",
"ecc": 0.846,
"semiLatRect": 5.649400300536e+11,
"x_pos": -3125188904560.047,
"y_pos": 1013099657635.3763,
"z_pos": -1483085832703.4502,
"x_vel": 346.4044694550819,
"y_vel": 3563.7031383982853,
"z_vel": -2987.9920791396903
}
14 changes: 14 additions & 0 deletions example data/2 Cam position and velocity change/2 Camelopardalis -10km & -100m per s/C.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"name": "C",
"mass": 2.982705e+30,
"radius": 107323200,
"refBodies": "A,B",
"ecc": 0.405,
"semiLatRect": 1.602602738995e+13,
"x_pos": -7409284958633.752,
"y_pos": -2436384285686.0146,
"z_pos": 8506552360117.136,
"x_vel": -2021.2472827909405,
"y_vel": 8445.215567037536,
"z_vel": -278.7045347879107
}
14 changes: 14 additions & 0 deletions example data/2 Cam position and velocity change/2 Camelopardalis -1km & -10m per s/A.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"name": "A",
"mass": 3.8576318e+30,
"radius": 847380000,
"refBodies": "A",
"ecc": 0,
"semiLatRect": 0,
"x_pos": 0.0,
"y_pos": 0.0,
"z_pos": 0.0,
"x_vel": 0.0,
"y_vel": 0.0,
"z_vel": 0.0
}
14 changes: 14 additions & 0 deletions example data/2 Cam position and velocity change/2 Camelopardalis -1km & -10m per s/B.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"name": "B",
"mass": 2.8832815e+30,
"radius": 597933600,
"refBodies": "A",
"ecc": 0.846,
"semiLatRect": 5.649400300536e+11,
"x_pos": -3125188913560.047,
"y_pos": 1013099666635.3763,
"z_pos": -1483085841703.4502,
"x_vel": 436.4044694550819,
"y_vel": 3653.7031383982853,
"z_vel": -3077.9920791396903
}
14 changes: 14 additions & 0 deletions example data/2 Cam position and velocity change/2 Camelopardalis -1km & -10m per s/C.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"name": "C",
"mass": 2.982705e+30,
"radius": 107323200,
"refBodies": "A,B",
"ecc": 0.405,
"semiLatRect": 1.602602738995e+13,
"x_pos": -7409284967633.752,
"y_pos": -2436384294686.0146,
"z_pos": 8506552369117.136,
"x_vel": -2111.2472827909405,
"y_vel": 8535.215567037536,
"z_vel": -368.7045347879107
}
14 changes: 14 additions & 0 deletions ...Cam position and velocity change/2 Camelopardalis 1000km & 10000m per s not stable/A.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"name": "A",
"mass": 3.8576318e+30,
"radius": 847380000,
"refBodies": "A",
"ecc": 0,
"semiLatRect": 0,
"x_pos": 0.0,
"y_pos": 0.0,
"z_pos": 0.0,
"x_vel": 0.0,
"y_vel": 0.0,
"z_vel": 0.0
}
14 changes: 14 additions & 0 deletions ...Cam position and velocity change/2 Camelopardalis 1000km & 10000m per s not stable/B.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"name": "B",
"mass": 2.8832815e+30,
"radius": 597933600,
"refBodies": "A",
"ecc": 0.846,
"semiLatRect": 5.649400300536e+11,
"x_pos": -3125189914560.047,
"y_pos": 1013100667635.3763,
"z_pos": -1483086842703.4502,
"x_vel": 10446.4044694550819,
"y_vel": 13663.7031383982853,
"z_vel": -13087.9920791396903
}
14 changes: 14 additions & 0 deletions ...Cam position and velocity change/2 Camelopardalis 1000km & 10000m per s not stable/C.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"name": "C",
"mass": 2.982705e+30,
"radius": 107323200,
"refBodies": "A,B",
"ecc": 0.405,
"semiLatRect": 1.602602738995e+13,
"x_pos": -7409285968633.752,
"y_pos": -2436385295686.0146,
"z_pos": 8506553370117.136,
"x_vel": -12121.2472827909405,
"y_vel": 18545.215567037536,
"z_vel": -10378.7045347879107
}
14 changes: 14 additions & 0 deletions ...position and velocity change/2 Camelopardalis 100km & 1000m per s partially stable/A.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"name": "A",
"mass": 3.8576318e+30,
"radius": 847380000,
"refBodies": "A",
"ecc": 0,
"semiLatRect": 0,
"x_pos": 0.0,
"y_pos": 0.0,
"z_pos": 0.0,
"x_vel": 0.0,
"y_vel": 0.0,
"z_vel": 0.0
}
14 changes: 14 additions & 0 deletions ...position and velocity change/2 Camelopardalis 100km & 1000m per s partially stable/B.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"name": "B",
"mass": 2.8832815e+30,
"radius": 597933600,
"refBodies": "A",
"ecc": 0.846,
"semiLatRect": 5.649400300536e+11,
"x_pos": -3125189014560.047,
"y_pos": 1013099767635.3763,
"z_pos": -1483085942703.4502,
"x_vel": 1446.4044694550819,
"y_vel": 4663.7031383982853,
"z_vel": -4087.9920791396903
}
14 changes: 14 additions & 0 deletions ...position and velocity change/2 Camelopardalis 100km & 1000m per s partially stable/C.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"name": "C",
"mass": 2.982705e+30,
"radius": 107323200,
"refBodies": "A,B",
"ecc": 0.405,
"semiLatRect": 1.602602738995e+13,
"x_pos": -7409285068633.752,
"y_pos": -2436384395686.0146,
"z_pos": 8506552470117.136,
"x_vel": -3121.2472827909405,
"y_vel": 9545.215567037536,
"z_vel": -1378.7045347879107
}
14 changes: 14 additions & 0 deletions ...ition and velocity change/2 Camelopardalis 10km & 100m per s stable half resonance/A.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"name": "A",
"mass": 3.8576318e+30,
"radius": 847380000,
"refBodies": "A",
"ecc": 0,
"semiLatRect": 0,
"x_pos": 0.0,
"y_pos": 0.0,
"z_pos": 0.0,
"x_vel": 0.0,
"y_vel": 0.0,
"z_vel": 0.0
}
14 changes: 14 additions & 0 deletions ...ition and velocity change/2 Camelopardalis 10km & 100m per s stable half resonance/B.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"name": "B",
"mass": 2.8832815e+30,
"radius": 597933600,
"refBodies": "A",
"ecc": 0.846,
"semiLatRect": 5.649400300536e+11,
"x_pos": -3125188924560.047,
"y_pos": 1013099677635.3763,
"z_pos": -1483085852703.4502,
"x_vel": 546.4044694550819,
"y_vel": 3763.7031383982853,
"z_vel": -3187.9920791396903
}
14 changes: 14 additions & 0 deletions ...ition and velocity change/2 Camelopardalis 10km & 100m per s stable half resonance/C.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"name": "C",
"mass": 2.982705e+30,
"radius": 107323200,
"refBodies": "A,B",
"ecc": 0.405,
"semiLatRect": 1.602602738995e+13,
"x_pos": -7409284978633.752,
"y_pos": -2436384305686.0146,
"z_pos": 8506552380117.136,
"x_vel": -2221.2472827909405,
"y_vel": 8645.215567037536,
"z_vel": -478.7045347879107
}
14 changes: 14 additions & 0 deletions ...osition and velocity change/2 Camelopardalis 1km & 10m per s stable full resonance/A.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"name": "A",
"mass": 3.8576318e+30,
"radius": 847380000,
"refBodies": "A",
"ecc": 0,
"semiLatRect": 0,
"x_pos": 0.0,
"y_pos": 0.0,
"z_pos": 0.0,
"x_vel": 0.0,
"y_vel": 0.0,
"z_vel": 0.0
}
14 changes: 14 additions & 0 deletions ...osition and velocity change/2 Camelopardalis 1km & 10m per s stable full resonance/B.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"name": "B",
"mass": 2.8832815e+30,
"radius": 597933600,
"refBodies": "A",
"ecc": 0.846,
"semiLatRect": 5.649400300536e+11,
"x_pos": -3125188915560.047,
"y_pos": 1013099668635.3763,
"z_pos": -1483085843703.4502,
"x_vel": 456.4044694550819,
"y_vel": 3673.7031383982853,
"z_vel": -3097.9920791396903
}
14 changes: 14 additions & 0 deletions ...osition and velocity change/2 Camelopardalis 1km & 10m per s stable full resonance/C.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"name": "C",
"mass": 2.982705e+30,
"radius": 107323200,
"refBodies": "A,B",
"ecc": 0.405,
"semiLatRect": 1.602602738995e+13,
"x_pos": -7409284969633.752,
"y_pos": -2436384296686.0146,
"z_pos": 8506552371117.136,
"x_vel": -2131.2472827909405,
"y_vel": 8555.215567037536,
"z_vel": -388.7045347879107
}
Loading