Feature/joint isi dithering (NeuralEnsemble#275)

INM-6 · Jan 10, 2020 · 731bbe4 · 731bbe4
1 parent 08e23a8
commit 731bbe4
Show file tree

Hide file tree

Showing 5 changed files with 575 additions and 22 deletions.
diff --git a/.gitignore b/.gitignore
@@ -66,7 +66,7 @@ cover
 ######################
 .directory
 .gdb_history
-.DS_Store?
+.DS_Store
 ehthumbs.db
 Icon?
 Thumbs.db
@@ -75,3 +75,5 @@ Thumbs.db
 ###################################
 # ignored folder for fast prototyping
 ignored/
+
+.ipynb_checkpoints/
diff --git a/elephant/conversion.py b/elephant/conversion.py
@@ -832,7 +832,6 @@ def _store_array(self):
     def remove_stored_array(self):
         """
         Unlinks the matrix with counted time points from memory.
-
         """
         self._mat_u = None
-Original file line number
+Diff line change
@@ Expand Up / @@ -832,7 +832,6 @@ def _store_array(self): @@
         def remove_stored_array(self):
             """
             Unlinks the matrix with counted time points from memory.
             """
             self._mat_u = None
@@ Expand Down @@