From 3b631a94f81bdb22b93a7731796559d74cf9d5e0 Mon Sep 17 00:00:00 2001
From: Joshua Coles <josh@coles.to>
Date: Fri, 17 Mar 2023 21:49:53 +0000
Subject: [PATCH] Refactor code

---
 {notebooks => graphs}/nc-fd-convergence.py | 2 +-
 {notebooks => graphs}/rmax-n.py            | 4 ++--
 {notebooks => graphs}/sp-fd-3d.py          | 2 +-
 {notebooks => graphs}/sp-fd-rust-vs-c.py   | 3 +--
 {notebooks => graphs}/sp-fd.py             | 2 +-
 {notebooks => lib}/graphs.py               | 2 +-
 {notebooks => lib}/lib.py                  | 0
 notebooks/3d.ipynb                         | 2 +-
 8 files changed, 8 insertions(+), 9 deletions(-)
 rename {notebooks => graphs}/nc-fd-convergence.py (96%)
 rename {notebooks => graphs}/rmax-n.py (73%)
 rename {notebooks => graphs}/sp-fd-3d.py (89%)
 rename {notebooks => graphs}/sp-fd-rust-vs-c.py (93%)
 rename {notebooks => graphs}/sp-fd.py (90%)
 rename {notebooks => lib}/graphs.py (94%)
 rename {notebooks => lib}/lib.py (100%)

diff --git a/notebooks/nc-fd-convergence.py b/graphs/nc-fd-convergence.py
similarity index 96%
rename from notebooks/nc-fd-convergence.py
rename to graphs/nc-fd-convergence.py
index 742cd4e..e41ac07 100644
--- a/notebooks/nc-fd-convergence.py
+++ b/graphs/nc-fd-convergence.py
@@ -1,6 +1,6 @@
 import numpy as np
 import matplotlib.pyplot as plt
-from notebooks.lib import read_load
+from lib.lib import read_load
 
 alpha = read_load("../data/alpha")
 meaned_by_N = alpha.groupby('N').agg({'fd': ['mean', 'std']}) \
diff --git a/notebooks/rmax-n.py b/graphs/rmax-n.py
similarity index 73%
rename from notebooks/rmax-n.py
rename to graphs/rmax-n.py
index e3f21d2..1183385 100644
--- a/notebooks/rmax-n.py
+++ b/graphs/rmax-n.py
@@ -1,7 +1,7 @@
 import matplotlib.pyplot as plt
 
-from notebooks.graphs import cr_n
-from notebooks.lib import read_load
+from lib.graphs import cr_n
+from lib.lib import read_load
 
 alpha = read_load("../data/alpha")
 
diff --git a/notebooks/sp-fd-3d.py b/graphs/sp-fd-3d.py
similarity index 89%
rename from notebooks/sp-fd-3d.py
rename to graphs/sp-fd-3d.py
index f4fa84d..d2eb6d4 100644
--- a/notebooks/sp-fd-3d.py
+++ b/graphs/sp-fd-3d.py
@@ -1,6 +1,6 @@
 from matplotlib import pyplot as plt
 
-from notebooks.lib import read_sp, read_xyz_alt, aggregate_sp_fd
+from lib.lib import read_sp, read_xyz_alt, aggregate_sp_fd
 
 data_3d_sp = read_sp("../data/rust-3d-offaxis-sp", read_xyz_alt)
 sp_fd_data = aggregate_sp_fd(data_3d_sp)
diff --git a/notebooks/sp-fd-rust-vs-c.py b/graphs/sp-fd-rust-vs-c.py
similarity index 93%
rename from notebooks/sp-fd-rust-vs-c.py
rename to graphs/sp-fd-rust-vs-c.py
index 8cfa92c..150e061 100644
--- a/notebooks/sp-fd-rust-vs-c.py
+++ b/graphs/sp-fd-rust-vs-c.py
@@ -1,7 +1,6 @@
-import numpy as np
 from matplotlib import pyplot as plt
 
-from notebooks.lib import read_sp, aggregate_sp_fd
+from lib.lib import read_sp, aggregate_sp_fd
 
 c_sp = read_sp("../data/stick-probability")
 rust_sp = read_sp("../data/rust-sticking-probability")
diff --git a/notebooks/sp-fd.py b/graphs/sp-fd.py
similarity index 90%
rename from notebooks/sp-fd.py
rename to graphs/sp-fd.py
index 4750318..b7337d9 100644
--- a/notebooks/sp-fd.py
+++ b/graphs/sp-fd.py
@@ -1,6 +1,6 @@
 from matplotlib import pyplot as plt
 
-from notebooks.lib import read_sp, aggregate_sp_fd
+from lib.lib import read_sp, aggregate_sp_fd
 
 data_2d_sp = read_sp("../data/stick-probability")
 sp_fd_data = aggregate_sp_fd(data_2d_sp)
diff --git a/notebooks/graphs.py b/lib/graphs.py
similarity index 94%
rename from notebooks/graphs.py
rename to lib/graphs.py
index c90104b..af2b3a8 100644
--- a/notebooks/graphs.py
+++ b/lib/graphs.py
@@ -2,7 +2,7 @@ import numpy as np
 import scipy
 from matplotlib import pyplot as plt
 
-from notebooks.lib import linear
+from lib.lib import linear
 
 
 def cr_n(df, ignore_prefix=0, data_color="tab:blue", fit_color="tab:red"):
diff --git a/notebooks/lib.py b/lib/lib.py
similarity index 100%
rename from notebooks/lib.py
rename to lib/lib.py
diff --git a/notebooks/3d.ipynb b/notebooks/3d.ipynb
index 562318b..b979b48 100644
--- a/notebooks/3d.ipynb
+++ b/notebooks/3d.ipynb
@@ -13,7 +13,7 @@
     "import matplotlib.pyplot as plt\n",
     "import scipy\n",
     "from glob import glob\n",
-    "from notebooks.lib import read_xyz_alt, read_load, linear, mean_across"
+    "from lib.lib import read_xyz_alt, read_load, linear, mean_across"
    ]
   },
   {