Add setuptools to windows, fix shapely issues

SENeC-Initiative · Jan 29, 2024 · 32ae9d8 · 32ae9d8
1 parent 58046c5
commit 32ae9d8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/extra/install_debian.sh b/extra/install_debian.sh
@@ -5,6 +5,7 @@ sudo apt install cmake g++ python3 python3-dev python3-pip libgeos++-dev doxygen
 # workaround for PyOpenGL
 for lg in /usr/lib/x86_64-linux-gnu/libglut.so.3.*; do
     sudo ln -s "${lg}" /usr/lib/x86_64-linux-gnu/libglut.so.3
+    sudo ln -s "${lg}" /usr/lib/x86_64-linux-gnu/libglut.so
 done
 
 pip3 install --user setuptools

diff --git a/src/pymodule/dense/morphology/connections.py b/src/pymodule/dense/morphology/connections.py
@@ -312,7 +312,9 @@ def _get_synapses_intersection(axon_polygon, d_polygon, synapse_density, somas,
     '''
     intsct = axon_polygon.intersection(d_polygon)
 
-    if not isinstance(intsct, MultiPolygon):
+    if isinstance(intsct, MultiPolygon):
+        intsct = intsct.geoms
+    else:
         intsct = [intsct]
 
     for poly in intsct:
@@ -324,8 +326,8 @@ def _get_synapses_intersection(axon_polygon, d_polygon, synapse_density, somas,
             s_soma = np.array(somas[i])
             t_soma = np.array(somas[j])
             pos    = np.array(poly.centroid.coords)[0]
-            dist   = np.linalg.norm(s_soma - pos) \
-                    + np.linalg.norm(t_soma - pos)
+            dist   = np.linalg.norm(s_soma - pos) + \
+                     np.linalg.norm(t_soma - pos)
 
             positions.extend([pos]*num_synapses)
             edges.extend([etuple]*num_synapses)
@@ -413,9 +415,11 @@ def _edges_from_spines(source_set, target_set, axons, dendrites, somas,
                                 if num_syn > 0:
                                     s_soma = np.array(somas[i])
                                     t_soma = np.array(somas[j])
-                                    pos    = insct_line.centroid
-                                    dist   = np.linalg.norm(s_soma - pos) \
-                                            + np.linalg.norm(t_soma - pos)
+                                    pos = np.array(
+                                        insct_line.centroid.coords)[0]
+
+                                    dist = np.linalg.norm(s_soma - pos) + \
+                                           np.linalg.norm(t_soma - pos)
 
                                     positions.extend([pos]*num_syn)
                                     edges.extend([etuple]*num_syn)

diff --git a/tests/todo/test_retraction.py b/tests/todo/test_retraction.py
@@ -112,7 +112,6 @@
     lower.append(low)
 
 
-
 ax.plot(resolutions, median, color="b", alpha=0.8)
 ax.plot(resolutions, lower, ls="--", color="b", alpha=0.5)
 ax.plot(resolutions, upper, ls="--", color="b", alpha=0.5)