Merge pull request #50 from flatironinstitute/reparametrize_raisedcosine

Reparametrize raisedcosine
flatironinstitute · Dec 19, 2023 · 6f210b4 · 6f210b4
2 parents 2dcf1b2 + 14055b6
commit 6f210b4
Show file tree

Hide file tree

Showing 5 changed files with 384 additions and 165 deletions.
diff --git a/docs/developers_notes/01-basis_module.md b/docs/developers_notes/01-basis_module.md
@@ -19,9 +19,7 @@ Abstract Class Basis
 │   │
 │   └─ Concrete Subclass CyclicBSplineBasis
 │
-├─ Abstract Subclass RaisedCosineBasis
-│   │
-│   ├─ Concrete Subclass RaisedCosineBasisLinear
+├─ Concrete Subclass RaisedCosineBasisLinear 
 │   │
 │   └─ Concrete Subclass RaisedCosineBasisLog
 │

diff --git a/docs/examples/plot_1D_basis_function.py b/docs/examples/plot_1D_basis_function.py
@@ -69,11 +69,11 @@
 # evaluate a log-spaced cosine raised function basis.
 
 # Instantiate the basis noting that the `RaisedCosineBasisLog` does not require an `order` parameter
-raised_cosine_log = nmo.basis.RaisedCosineBasisLog(n_basis_funcs=10)
+raised_cosine_log = nmo.basis.RaisedCosineBasisLog(n_basis_funcs=10, width=1.5, time_scaling=50)
 
 # Evaluate the raised cosine basis at the equi-spaced sample points
 # (same method in all Basis elements)
-samples, eval_basis = raised_cosine_log.evaluate_on_grid(1000)
+samples, eval_basis = raised_cosine_log.evaluate_on_grid(100)
 
 # Plot the evaluated log-spaced raised cosine basis
 plt.figure()

diff --git a/src/nemos/__init__.py b/src/nemos/__init__.py
@@ -1,11 +1,3 @@
 #!/usr/bin/env python3
 
-from . import (
-    basis,
-    exceptions,
-    glm,
-    observation_models,
-    regularizer,
-    simulation,
-    utils,
-)
+from . import basis, exceptions, glm, observation_models, regularizer, simulation, utils