Olimaol develop

.gitignore

@@ -17,3 +17,4 @@ dist/
 *.pkl
 *json
 *.log
+*test2_data*/

src/CompNeuroPy/__init__.py

@@ -1,3 +1,40 @@
+### ANNarchy
+import os
+import sys
+from contextlib import contextmanager
+
+
+@contextmanager
+def suppress_stdout():
+    """
+    Suppresses the print output of a function
+
+    Example:
+        ```python
+        with suppress_stdout():
+            print("this will not be printed")
+        ```
+    """
+    with open(os.devnull, "w") as devnull:
+        old_stdout = sys.stdout
+        sys.stdout = devnull
+        try:
+            yield
+        finally:
+            sys.stdout = old_stdout
+
+
+with suppress_stdout():
+    import ANNarchy as ann
+    from ANNarchy.core import ConnectorMethods as ann_ConnectorMethods
+
+    if ann.__version__ >= "4.8":
+        from ANNarchy.intern.NetworkManager import NetworkManager as ann_NetworkManager
+    else:
+        from ANNarchy.core import Global as ann_Global
+
+    from ANNarchy.core import Random as ann_Random
+
 ### functions
 from CompNeuroPy.analysis_functions import (
     my_raster_plot,

src/CompNeuroPy/analysis_functions.py

@@ -1,7 +1,7 @@
 import numpy as np
 import matplotlib.pyplot as plt
 from matplotlib.ticker import MaxNLocator
-from ANNarchy import raster_plot, dt, inter_spike_interval, coefficient_of_variation
+from CompNeuroPy import ann
 import warnings
 from CompNeuroPy import system_functions as sf
 from CompNeuroPy import extra_functions as ef
@@ -27,9 +27,9 @@ def my_raster_plot(spikes: dict):
         n (array):
             ranks of the neurons
     """
-    t, n = raster_plot(spikes)
+    t, n = ann.raster_plot(spikes)
     np.zeros(10)
-    t = np.round(t / dt(), 0).astype(int)
+    t = np.round(t / ann.dt(), 0).astype(int)
     return t, n
 
 
@@ -357,7 +357,7 @@ def _get_pop_rate_old(spikes, duration, dt=1, t_start=0, t_smooth_ms=-1):
     duration_init = duration
     temp_duration = duration + t_start
 
-    t, n = raster_plot(spikes)
+    t, n = ann.raster_plot(spikes)
     if len(t) > 1:  # check if there are spikes in population at all
         if t_smooth_ms == -1:
             ISIs = []
@@ -1562,7 +1562,7 @@ def _interspike_interval_plot(self, compartment, data):
         ### set title
         plt.title(f"Interspike interval histogram {compartment} ({len(data)})")
         ### get interspike intervals
-        interspike_intervals_list = inter_spike_interval(spikes=data)
+        interspike_intervals_list = ann.inter_spike_interval(spikes=data)
         ### plot histogram
         plt.hist(
             interspike_intervals_list,
@@ -1590,7 +1590,7 @@ def _coefficient_of_variation_plot(self, compartment, data):
         ### set title
         plt.title(f"Coefficient of variation histogram {compartment} ({len(data)})")
         ### get coefficient of variation
-        coefficient_of_variation_dict = coefficient_of_variation(
+        coefficient_of_variation_dict = ann.coefficient_of_variation(
             spikes=data,
             per_neuron=True,
         )