fix: fix rebase

jaxleyverse · Nov 22, 2024 · 9e52fbb · 9e52fbb
1 parent b8798c5
commit 9e52fbb
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 124 deletions.
diff --git a/docs/index.rst b/docs/index.rst
@@ -42,11 +42,7 @@ Getting started
    plt.plot(v.T)  # Plot voltage trace.
 
 
-<<<<<<< HEAD
 If you want to learn more, check out our [Tutorials](https://jaxley.readthedocs.io/en/latest/tutorials.html), [FAQ](https://jaxley.readthedocs.io/en/latest/faq.html), or [Advanced tutorials](https://jaxley.readthedocs.io/en/latest/advanced_tutorials.html).
-=======
-If you want to learn more, check out our `Tutorial on the basics of Jaxley <https://jaxley.readthedocs.io/en/latest/tutorials/01_morph_neurons.html>`_. For more resources, see the `FAQ <https://jaxley.readthedocs.io/en/latest/faq.html>`_ or `Advanced tutorials <https://jaxley.readthedocs.io/en/latest/advanced_tutorials.html>`_.
->>>>>>> wip: new baselines
 
 
 Installation

diff --git a/jaxley/io/swc.py b/jaxley/io/swc.py
@@ -22,11 +22,7 @@
 
 def swc_to_jaxley(
     fname: str,
-<<<<<<< HEAD
     max_branch_len: float = 100.0,
-=======
-    max_branch_len: Optional[float] = None,
->>>>>>> wip: new baselines
     sort: bool = True,
     num_lines: Optional[int] = None,
 ) -> Tuple[List[int], List[float], List[Callable], List[float], List[np.ndarray]]:
@@ -103,15 +99,9 @@ def read_swc(
     fname: str,
     ncomp: Optional[int] = None,
     nseg: Optional[int] = None,
-<<<<<<< HEAD
     max_branch_len: float = 300.0,
     min_radius: Optional[float] = None,
     assign_groups: bool = False,
-=======
-    max_branch_len: Optional[float] = None,
-    min_radius: Optional[float] = None,
-    assign_groups: bool = True,
->>>>>>> wip: new baselines
 ) -> Cell:
     """Reads SWC file into a `Cell`.
 

diff --git a/jaxley/utils/cell_utils.py b/jaxley/utils/cell_utils.py
@@ -16,33 +16,18 @@
 
 def _split_into_branches_and_sort(
     content: np.ndarray,
-<<<<<<< HEAD
     max_branch_len: float,
-=======
-    max_branch_len: Optional[float],
->>>>>>> wip: new baselines
     is_single_point_soma: bool,
     sort: bool = True,
 ) -> Tuple[np.ndarray, np.ndarray]:
     branches, types = _split_into_branches(content, is_single_point_soma)
-<<<<<<< HEAD
     branches, types = _split_long_branches(
         branches,
         types,
         content,
         max_branch_len,
         is_single_point_soma=is_single_point_soma,
     )
-=======
-    if max_branch_len is not None:
-        branches, types = _split_long_branches(
-            branches,
-            types,
-            content,
-            max_branch_len,
-            is_single_point_soma=is_single_point_soma,
-        )
->>>>>>> wip: new baselines
 
     if sort:
         first_val = np.asarray([b[0] for b in branches])

diff --git a/mkdocs/docs/index.md b/mkdocs/docs/index.md
@@ -3,9 +3,6 @@
   <img src="logo.png?raw=true" width="360">
 </p>
 
-> :warning: **The official documentation for Jaxley has moved to [jaxley.readthedocs.io](https://jaxley.readthedocs.io/en/latest/)**. 
-> The website you are currently on will be taken down in the future.
-
 `Jaxley` is a differentiable simulator for biophysical neuron models in [JAX](https://github.com/google/jax). Its key features are:
 
 - automatic differentiation, allowing gradient-based optimization of thousands of parameters  

diff --git a/tests/regression_test_baselines.json b/tests/regression_test_baselines.json