final minor fix

pik-copan · May 6, 2017 · 176eee0 · 176eee0
1 parent cff2f60
commit 176eee0
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 27 deletions.
diff --git a/pyunicorn/core/interacting_networks.py b/pyunicorn/core/interacting_networks.py
@@ -15,13 +15,14 @@
 import numpy as np
 from numpy import random
 
-#  Import Network base class and Cython code
-from .network import Network, NetworkError
 from pyunicorn.core._ext.numerics import                 \
     _randomlySetCrossLinks, _randomlyRewireCrossLinks,   \
     _cross_transitivity, _nsi_cross_transitivity,        \
     _cross_local_clustering, _nsi_cross_local_clustering
 
+#  Import Network base class and Cython code
+from .network import Network, NetworkError
+
 
 #
 #  Define class InteractingNetworks

diff --git a/pyunicorn/timeseries/_ext/numerics.pyx b/pyunicorn/timeseries/_ext/numerics.pyx
@@ -47,7 +47,7 @@ cdef extern from "time.h":
     double time()
 
 
-cdef extern from "src_fast_numerics.c":
+cdef extern from "src_numerics.c":
     void _test_pearson_correlation_fast(double *original_data,
         double *surrogates, float *correlation, int n_time, int N, double norm)
     void _test_pearson_correlation_slow(double *original_data,

diff --git a/pyunicorn/timeseries/_ext/src_fast_numerics.h b/pyunicorn/timeseries/_ext/src_fast_numerics.h
diff --git a/...icorn/timeseries/_ext/src_fast_numerics.c → pyunicorn/timeseries/_ext/src_numerics.c b/...icorn/timeseries/_ext/src_fast_numerics.c → pyunicorn/timeseries/_ext/src_numerics.c
diff --git a/pyunicorn/timeseries/surrogates.py b/pyunicorn/timeseries/surrogates.py
@@ -15,15 +15,15 @@
 import numpy as np
 from numpy import random
 
+from pyunicorn.timeseries._ext.numerics import \
+        _embed_time_series_array, _recurrence_plot, _twins, \
+        _test_pearson_correlation
+
 # C++ inline code
 from .. import weave_inline
 # easy progress bar handling
 from ..utils import progressbar
 
-from pyunicorn.timeseries._ext.numerics import \
-        _embed_time_series_array, _recurrence_plot, _twins, \
-        _test_pearson_correlation
-
 
 #
 #  Define class Surrogates

diff --git a/pyunicorn/timeseries/visibility_graph.py b/pyunicorn/timeseries/visibility_graph.py
@@ -15,11 +15,11 @@
 # array object and fast numerics
 import numpy as np
 
-from .. import InteractingNetworks
 from pyunicorn.timeseries._ext.numerics import \
     _visibility_relations_missingvalues,\
     _visibility_relations_no_missingvalues, _visibility_relations_horizontal,\
     _retarded_local_clustering, _advanced_local_clustering
+from .. import InteractingNetworks
 
 
 #