1
0

Merge remote-tracking branch 'origin/main' into main

# Conflicts:
#	lib/objects.py
This commit is contained in:
Alex_Hubert
2021-11-19 15:42:36 +01:00
5 changed files with 40 additions and 20 deletions

View File

@@ -23,10 +23,10 @@ class Body:
self.vp = np.zeros(3)
def __repr__(self): # Called upon "print(body)"
return r"Body of mass: {0:.2f} $M_\odot$, position: {1}, velocity: {2}".format(self.m/Ms, self.q, self.v)
return r"Body of mass: {0:.1e} $M_\odot$, position: {1}, velocity: {2}".format(self.m/Ms, self.q, self.v)
def __str__(self): # Called upon "str(body)"
return r"Body of mass: {0:.2f} $M_\odot$".format(self.m/Ms)
return r"Body of mass: {0:.1e} $M_\odot$".format(self.m/Ms)
class System(Body):