From a67b188ed9079db1a76ed9f6368484c6abe628e0 Mon Sep 17 00:00:00 2001
From: Thomas Faour <thomasfaour@gmail.com>
Date: Sat, 31 May 2025 12:52:30 -0400
Subject: [PATCH] working checkpoint system

---
 last_checkpoint.npz                           | Bin 0 -> 1090 bytes
 {src => orbiter}/__init__.py                  |   0
 orbiter/__pycache__/__init__.cpython-312.pyc  | Bin 0 -> 156 bytes
 orbiter/__pycache__/units.cpython-312.pyc     | Bin 0 -> 337 bytes
 {src => orbiter}/orbits/__init__.py           |   0
 .../__pycache__/__init__.cpython-312.pyc      | Bin 0 -> 163 bytes
 .../orbits/__pycache__/body.cpython-312.pyc   | Bin 0 -> 1644 bytes
 .../__pycache__/simulator.cpython-312.pyc     | Bin 0 -> 4035 bytes
 {src => orbiter}/orbits/body.py               |   2 +-
 {src => orbiter}/orbits/simulator.py          |  67 ++++++++++++------
 orbiter/units.py                              |   9 +++
 src/units.py                                  |  16 -----
 12 files changed, 54 insertions(+), 40 deletions(-)
 create mode 100644 last_checkpoint.npz
 rename {src => orbiter}/__init__.py (100%)
 create mode 100644 orbiter/__pycache__/__init__.cpython-312.pyc
 create mode 100644 orbiter/__pycache__/units.cpython-312.pyc
 rename {src => orbiter}/orbits/__init__.py (100%)
 create mode 100644 orbiter/orbits/__pycache__/__init__.cpython-312.pyc
 create mode 100644 orbiter/orbits/__pycache__/body.cpython-312.pyc
 create mode 100644 orbiter/orbits/__pycache__/simulator.cpython-312.pyc
 rename {src => orbiter}/orbits/body.py (89%)
 rename {src => orbiter}/orbits/simulator.py (57%)
 create mode 100644 orbiter/units.py
 delete mode 100644 src/units.py

diff --git a/last_checkpoint.npz b/last_checkpoint.npz
new file mode 100644
index 0000000000000000000000000000000000000000..1edcfaa21145ba380ebb7a1c36b23012c5e8c324
GIT binary patch
literal 1090
zcmWIWW@gc4fB;1Xso2%q|3d*Ug9t-GesN|=W`16=US2^ZBZC0L45(5VJ=rhRHz1Oc
zp^TwgJteg`xk%kgLER?PLS08eJuSbeq$n{jKEEg>6(sJKm{Xhz6fe$5EJy|NH4JqW
zj5T!>Y8A)^T#Qinpwj^;-ZEP069V%VAJAK6sX6({K#!#kT7N;kg+ZbE>&TS2TQGld
z0sWPmSX_+oQwLNxjHWQID2pit1uj;odr<ulwnW<!<_AuoABsy-3rLKXG~$w*u@1#v
zm^BjwcG{!Hi-<#jHzSiSGip8pWf2hOMN-@VPNyij3SBEGt-`eOp=iAh<e{cqbiJVT
w0E%r8=0efC9%wNlb)f45#R1GtP85B`Obmz^3GilR1Ie-g;WHrZ#th;C0FYka1^@s6

literal 0
HcmV?d00001

diff --git a/src/__init__.py b/orbiter/__init__.py
similarity index 100%
rename from src/__init__.py
rename to orbiter/__init__.py
diff --git a/orbiter/__pycache__/__init__.cpython-312.pyc b/orbiter/__pycache__/__init__.cpython-312.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..7d52799096b63313191511f65c3d828ea6debd51
GIT binary patch
literal 156
zcmX@j%ge<81VT#I86f&Gh(HIQS%4zb87dhx8U0o=6fpsLpFwJVS?g!y=cekHq$TE;
z7U>rh<!7ZPmlW&g7bRtuB<92yXXcjXB$nhCK}1rE^yA|*^D;}~<Mj$Ee{tC4=BJeA
Zq}mm+0?lFs;$jfvBQql-V-Yiu1prG!CG-FQ

literal 0
HcmV?d00001

diff --git a/orbiter/__pycache__/units.cpython-312.pyc b/orbiter/__pycache__/units.cpython-312.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..bfa835fe2ef557f046c595d6859ddf9f395d8664
GIT binary patch
literal 337
zcmX@j%ge<81Wkt48A(9;F^B^LOi;$>2q0rRLkdF*V-7<UV=7}73rq=uj$+0k&Voan
zHI*%jy^>Lr=_SYzKTVEXta+um1(mm$@(OOTCKeSXR^H+W$S=+;$;{8Y#Sxa8lb@Vf
zQhAHVF*!LkC$%UMEY6&nS8|KRH?g>QCBtWsLBA~YGxBp&^-Izc^Gl2L3ySiyQj<%H
z_4A98GD{M3;)^qLOLG!S@{1rMsYUvwd6^}}dIgogIBatBQ%ZAE?TYw-1~CG0u?CR%
oz|6?Vc$-1!0XJ{IMW;mr2ZF&b*k93E(ZKV7ovV?hhzF<`0QlEaf&c&j

literal 0
HcmV?d00001

diff --git a/src/orbits/__init__.py b/orbiter/orbits/__init__.py
similarity index 100%
rename from src/orbits/__init__.py
rename to orbiter/orbits/__init__.py
diff --git a/orbiter/orbits/__pycache__/__init__.cpython-312.pyc b/orbiter/orbits/__pycache__/__init__.cpython-312.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..7c8f0c8200fcedc2e9056ae8f36b042b6bc977c7
GIT binary patch
literal 163
zcmX@j%ge<81d5W@86f&Gh(HIQS%4zb87dhx8U0o=6fpsLpFwJVIq7HQ=cekHq$TE;
z7U>rh<!7ZPmlW&g7bRtuB<92yXXcjXB$nhCK}1rabg_PXd}dx|NqoFsLFF$Fo80`A
a(wtPgB37W0j6hrrVtiy~WMnL22C@K{w<yB^

literal 0
HcmV?d00001

diff --git a/orbiter/orbits/__pycache__/body.cpython-312.pyc b/orbiter/orbits/__pycache__/body.cpython-312.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..0ab85630d5607ded55a3ea3011f3a7d654c226b3
GIT binary patch
literal 1644
zcmZux&1)M+6rb6T(Mq;(BqxEU4c!{rcwLB6Ty#iFAR+y@RFtNKvX^DEGl~^<wesxB
zL_!B24DBI-<RrP5IK7nMOaG5vTzm=J_E35#z9~_mkW=3qt!z2uf!_PQH%~Kfe(%lx
zS}vCe$b*kQ+4x=~<ZpClV&q_Q6Tpyg!f8k%>QahW3pH2gIyXWiGF>xbE{h6oA+lVH
z5{-O8xVb|(+lO6I++t623P%VXni-$9yHVo^*Bm3WzK)Yt+KStmbz6jS&`Num@s*z>
z+2Zve5TTGht_Jw$nXnv8J_j%)g1D3uSK}0l(uBcvVRA#TCWA5zx4_vBaV=5gg&ne=
z|J5yVODr@sUWAOrUddU=j2kiU^_`Lpa>GxA9fVMZ-HfH}w|jOh@3c}swC_Nc%E{<=
z8NHp+D43Cjdn4B2H~9wCkPPU6cz~ud(7>ZJFEwZAF3|fE-OpDb2X|01(7`+2A86G3
zSJdfP<$Zg#le6bQjojX{SGRH!9s4-V(It|7q8g4V7cjDj$^w<q>#__M8e$|OY|brX
zIKc|=#8=m98*wCRY15CpveuFDJrSfyEhooIT2VLj(^yU;BDYBmS-afnWtQi)+O5>{
z`emg1^326aOx_2zO~w|fF8^RWV9zU6G=Ees{&@GW^1*TFA)7!V366;b2MJTOe+d9+
zC-=a<E)dNpa()G(#{{3moBA#Cj5dI~6Q&eHRGxvX1P`}m1vD_`Z;5_U-3Q?^uD=ax
zn>;^rcE}#Hk@1A>vOVKx_LLngT{^HXNlXgntHGgGH&_KQgjY0x;o<Zx@W5)h)zR+f
z<8cf6)lh9c!g3^D;~8<ZOb@~&)6;Gz!4vFRonh?ryiSDYVJ*1`YMcDERDHDmX!CJ>
zv_9J0t?#YxZ9c6ZF0CC{YpT+$n53cu?d^+GMdS9W=x+f`r~OUD_hHiKCm&zMn@G>|
zV6Un4h&%@fnxH0Cbz%tvnrec?;!j@@%bc|W-~~)r0R^q7To`@)q`q7Kt@7S<l;-`1
zOx?5LlyOAcek43ED|ucN^KOWE(epODeweQmJdekL=Sh6R5?dz=sH&)t*K9$3JtC2A
z#9Y3E5wi)Tr}AA)!7i!;)dWeLex-1y1ixxK<b|f0)|eH{<<aVxfZ4mR%r7@5=)J5`
zb9KxJtGv*t`QbzdG)6RLnz=F({}M3MBXD=8lo<lPyAr#VnSkIiYVA&DcHucDuipc|
w3Dc@hSNh8ObjrvzxdtgXb!yVbI;Heaa_)Ch{fAsVBv=14&eN5b1eB`bf3K=dAOHXW

literal 0
HcmV?d00001

diff --git a/orbiter/orbits/__pycache__/simulator.cpython-312.pyc b/orbiter/orbits/__pycache__/simulator.cpython-312.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..5749f93976289f0ebb7ef951550abf58a8a34c85
GIT binary patch
literal 4035
zcmcInO>Er86&`X)?s7@}|67(tS@O>!veXz&;<|2v#<r46)fx#>L#@G5ORkm<cex&N
zCGUC#7=?kZQ3JM4l2N2pZw{P8kG-bXUL?eU2{r)?v^^N;VJ#VM?Ni?ya#w5BNP1`q
z?97{)_ujmj`QA6Pf9~i=6Zq;Uzn`B{3Hd8Fnx7C0yQe@{CnhmDhZML4jzgJu_=SX-
zFa<{_hzlY|c=8@G#T&$w?(>o5f>hx%$;a5paG~%M!_Ut@=Hk}7u35=OdQsUCH+C<A
zuud$pz?o!$H@Ss`Ok`rJCT|IrI0B<)!jeqEN}8gTG9{>!mYh?~)D3YVZ7JBB<4yU7
za6fjrpql9$WTB&?WI96m1G`Xm4Bw^3V1kge2H*K*i&p%+U0l)(&1;TpMawch&383g
zE}mwJsC)u-e5(YCRjaLc(KT($(^hOhuh~W0w+%-txgH2^(bJ5gsTJIURrHNEn_{`J
zXi?40F^_C6-}t!QtD#ZLvwW>!W%EYS_6lv*hL+7+*^f)EU3|4d-dzFTzE#9Uc*e5z
zPMft0i(a9&Z)tAXFO_{QXFHZ==QQi8?fKq2nrY>XvIG5w<3%CC;7hu&Eauj14+Pyz
zYknSPEqfLUY|<Qc3wm3;S;z1^SeBo6O$;wfEdyc!b&U<pq?wru9dyM8M=&`Kwg(VJ
zIvp9n&O44)bbZ)MgZfSTXl*ux3fpU4^`nE#+0^qj$1Z}yT)c7*+RzE@0)z%f2~u>Z
zEE3De<~6Up=vi0FaEy^L_-z`!eAdgB<7VOPBR9-8@)gYwa^>}_)9AnQdL^!xn;pw>
z&&jysWV5||RkQqTv@>%q)jU8Hh6x+v!KT}=_Pkqm;5=}ELD92{p1lYs8y{zcP_`o6
zPGiw_Y`?-z006cW9abns!G<y-T}PycohW*G$)Y+!DO949(DA%OHCv_>c11^}u)BpV
zJyOah<5a{-gdb!c+5HC;>!c=JMpD@KHFKBt)FiLVM}790Tut~5(9b7{`?1w8p{GXl
zm~;rKanNe%*LY|(sf^ST(8BrIR}-NnwOZdCM|Vx4oqktS+e}~_pYY8nI8q~*dzzzr
zb#omYsgR5?Ulr#t%c@7>EMvUT+AS^T7)uPoOZKu=oT-lf)SyM6r3vlFake5y;f|ly
zGIA(I2@rOn)AKBC&r|ABsz3lVg@ud-k~{@|C!tuPKo+6WmWi2UD0r5W+po`jpb<rC
z_V5Ie{@{CYb~X?An)P#rTc)!m>Rz_8zBlXAMcX$VfJ@A<QIAEV+M8_+%#<o&O4pGl
zb-mi#qU4!o-xyAL4T|fe(M!~!hsxNtGWI|j-#&iotKNyt^Y>o6H@5ZW&$bT#{EOa8
zTk54pqett)gVb;^c(5+qQi74gP;~}}rm=T4ICvcEkw?nlo~Nnrex>$o_0Rr6xwpF2
z`-2DS+YO1x9S>8(+o|C%QwMfodXjD73L3bX47vXTVV(Fb++J?if-(F|u8ECRzQ&t8
z-dw8*kP=K1KoXcFf)w3r5^GDXc9OM|t#*pFQ~n-;0fja3evI~W<hGpUmmua#!!VcZ
zx3aD#o6I-V%qP^$SJQHhzjZ($tLasl2OQVZHK~?@JWAe=XZiqqa`0P~S4c*lf6)iz
z?YCiQrdX<ma*F}O^d9|%QpBdA$oPZePEkzA$0%ilkS~@(!Ep^UOjPX>#The7n8-RF
zgK;RB2JktqoF2ep6blAx22R9wm{>L(hF=d+%Rm|xv>%7N_FX>Jkv+ui8+sG;y+1;6
zo&2q<=l06Ym93%aFS<_Dg`j_UV|2U!NL>yFMmDCm2aeU#LC?UQ{Mw<qgo8tCKiZtw
z?w<mMq0x=^)>bz!Y!4l)tHH?F#?sxf%`4j@nR@3_iM(+t=pNZPy}7)b;NR$cmJoW=
z!HMtOI(Mh<&V{wXjlPWwcLz87HZS~s@Jsc01BdHUgFy8pO}hI6wKq@)0`)+k4h8D)
zt|E1(8$^=R&vz8i@sQ9ySI2(%mXK}X6S@!!47)1q`?p~ixU9vQU>ARYFD}McC*X^#
zahF@{+0-Efu+%LeR@(6Y&6)CF&xVY)?|a2;iT}}T>}mY+bg!6A_}1AFru#lvG3?;}
z4|==z_Ytzxy6INMwz+!$Qxon+9&R{bgwOb9=EA*`h;x@)X=d?DQbwr$iaiG~V?JDQ
z;V}W1j0f*ryymsMy_DBV)XLf(JY+RY{Fh#P@Ctz!YPkS5Eidq}C`Q(fy8`dqJ#&14
zX*sa*sezY<OW}povZFv-KneSk{UG$tXVUZ#)S+llYE)RVhup=G`zYiJ`{_W$$g3HN
z_MwG<kE~F}QopDJ+eG3=dtw1ah4E8WFG7PQQ5%C$-0kYX9&5C5-#iR?Uqf-7JWZ2<
zq4oFI-Veqne|PQfwPy+bP#Vafe(v_%ujh8KwM+N`r7i;t{692@M%MFd`9STyJ%4i^
zs)y>>wmQay@ojaykrXtDKp0Z$%2Sod%I(z6)K<^Y;J{=sIu#6Q!QjL*S&%26?~FsN
z&v&F&>EYYvw|!^dN_{@iclJ!`Pio&eE;XOw8KKW*I`KX)8U;(&!?dm!T(j(;tm^ue
zvf;!dNnJPHEOZO_YGzy?ia8*EKTN>8gd#!VdASZ9Kv7|T1)@I*bP9UdL3~Q+Aj-(?
z6nTvmNJSon;s$xb4~VJ8DRSg!kePYXH7Jfg8a}x3;oWpY1Q~AmgA<J;N+~ii)sRt2
zlS79a3Q8&&Kiud*sgq0|+ePcfNh0+$_<k{cZ)%4?wVP;m?9L2}lTkPr2|T8fCHSN3
z*o)C(MEHwWsxau%*DzGP-=d(uhf-@HFH&csO?#W3fdQm$5AVB1g5$Wa$?#uD@88Mb
PKZRd#+~f|ylG*+n_3Y8z

literal 0
HcmV?d00001

diff --git a/src/orbits/body.py b/orbiter/orbits/body.py
similarity index 89%
rename from src/orbits/body.py
rename to orbiter/orbits/body.py
index c2b5236..57028a6 100644
--- a/src/orbits/body.py
+++ b/orbiter/orbits/body.py
@@ -1,7 +1,7 @@
 from enum import Enum
 import numpy as np
 
-from ..units import Position, Velocity, Mass, Acceleration, Force
+from ..units import Position, Velocity, Mass, Acceleration
 
 class Body:
     """
diff --git a/src/orbits/simulator.py b/orbiter/orbits/simulator.py
similarity index 57%
rename from src/orbits/simulator.py
rename to orbiter/orbits/simulator.py
index a75249f..317e2d6 100644
--- a/src/orbits/simulator.py
+++ b/orbiter/orbits/simulator.py
@@ -1,7 +1,7 @@
 from pathlib import Path
+import numpy as np
 
-from body import Body
-from ..units import Position, Velocity, Mass, Acceleration, Force
+from .body import Body
 
 class Simulator:
     """
@@ -31,7 +31,8 @@ class Simulator:
                 bodies: list[Body],
                 step_size: float,
                 steps_per_save: int,
-                output_file: Path
+                output_file: Path,
+                current_step: int = 0,
                 overwrite_output: bool = False
     ):
         if output_file.exists() and not overwrite_output:
@@ -40,43 +41,63 @@ class Simulator:
         self.output_file = output_file
         self.bodies = bodies
         self.step_size = step_size
-        self.steps_to_take = steps_to_take
         self.steps_per_save = steps_per_save
+        self.current_step = current_step
 
         if output_file.exists() and overwrite_output:
             print(f"Warning! Overwriting file: {output_file}")
 
-        _save_body_masses_to_file()
-        _checkpoint()
+        #self._save_body_masses_to_file()
+        self._checkpoint()
 
     
-        self.current_step = 0
-
     @classmethod
-    def from_checkpoint(cls, input_file: Path):
+    def from_checkpoint(cls, output_file: Path):
+        data = np.load("last_checkpoint.npz")
+        positions = data["positions"]
+        velocities = data["velocities"]
+        masses = data["masses"]
+        step_size = data["steps"][0]
+        current_step = data["steps"][1]
+        steps_per_save = data["steps"][2]
 
+        bodies = [
+            Body(val[0], val[1], val[2]) for val in zip(
+                positions, velocities, masses
+            )
+        ]
+        return cls(
+            bodies, 
+            step_size, 
+            steps_per_save,
+            output_file,
+            current_step,
+        )
 
-    def _save_body_masses_to_file(self):
-        masses_str = ' '.join([
-            str(body.m) for body in bodies
-        ]) + '\n'
-        #if saving masses, we are always starting a new file,
-        #this will overwrite file.
-        self.output_file.write_text(masses_str)
     
     def _checkpoint(self):
         """
         Two things - save high precision last checkpoint for resuming
         then save lower precision text for trajectories
         """
-        body_X_V_np = np.array([
-            [body.X, body.Y] for body in self.bodies
+        body_X_np = np.array([
+            body.X for body in self.bodies
         ])
-        body_ints_np = np.array([
+        body_V_np = np.array([
+            body.V for body in self.bodies
+        ])
+        body_m_np = np.array([
             body.m for body in self.bodies
         ])
-        body_m_np.append(self.step_size, self.current_step)
-        np.savez("last_checkpoint.npz", 
-                array=body_X_V_np,
-                ints = body_m_np)
+        stepsz_n_np = np.array([
+            self.step_size,
+            self.current_step,
+            self.steps_per_save
+        ])
+
+        np.savez("last_checkpoint.npz", 
+                positions=body_X_np,
+                velocities=body_V_np,
+                masses=body_m_np,
+                steps=stepsz_n_np)
 
diff --git a/orbiter/units.py b/orbiter/units.py
new file mode 100644
index 0000000..9ab7ee7
--- /dev/null
+++ b/orbiter/units.py
@@ -0,0 +1,9 @@
+import numpy as np
+
+Position = np.array
+
+Velocity = np.array
+
+Acceleration = np.array
+
+Mass = int
diff --git a/src/units.py b/src/units.py
deleted file mode 100644
index 02bddb9..0000000
--- a/src/units.py
+++ /dev/null
@@ -1,16 +0,0 @@
-import numpy as np
-
-class Position(np.array):
-    pass
-
-class Velocity(np.array):
-    pass
-
-class Acceleration(np.array):
-    pass
-
-class Force(np.array):
-    pass
-
-class Mass(int):
-    pass