fixed merging conflicts

dokato · Sep 15, 2015 · d79af80 · d79af80
2 parents 90db222 + e082115
commit d79af80
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 23 deletions.
diff --git a/connectivipy/conn.py b/connectivipy/conn.py
@@ -7,8 +7,8 @@
 import numpy as np
 import scipy.stats as st
 from abc import ABCMeta, abstractmethod
-from mvarmodel import Mvar
-from mvar.comp import ldl
+from .mvar.comp import ldl
+from .mvarmodel import Mvar
 
 import six
 from six.moves import map

diff --git a/doc/conf.py b/doc/conf.py
@@ -18,8 +18,8 @@
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-sys.path.insert(0, os.path.abspath('../connectivipy'))
-
+sys.path.insert(0, os.path.abspath('..'))
+import connectivipy
 
 # -- General configuration ------------------------------------------------
 
@@ -36,9 +36,6 @@
     'sphinx.ext.viewcode',
 ]
 
-#Autodoc
-autodoc_member_order = 'bysource'
-
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
 
@@ -286,3 +283,6 @@
 
 # If true, do not generate a @detailmenu in the "Top" node's menu.
 #texinfo_no_detailmenu = False
+
+#Autodoc
+autodoc_member_order = 'bysource'
diff --git a/doc/conn.rst b/doc/conn.rst
@@ -5,5 +5,5 @@ Connectvity
 
 Connectivity methods classes.
 
-.. automodule:: conn
+.. automodule:: connectivipy.conn
    :members:
diff --git a/doc/data.rst b/doc/data.rst
@@ -6,17 +6,20 @@ Data
 Data module - main class governing your data and wrapper for all other
 **ConnectiviPy** functions.
 
-.. automodule:: data
+.. automodule:: connectivipy.data
    :members:
 
 Data loading
 ########
+
 **Additonal function which enable other data formats loading**
 
-.. automodule:: load.loaders
+.. automodule:: connectivipy.load.loaders
    :members:
 
 Additional functions
 ########
 
-.. autofunction:: __init__.plot_conn
+**Plot tools which are separate from Data class**
+
+.. autofunction:: connectivipy.plot_conn
diff --git a/doc/index.rst b/doc/index.rst
@@ -26,7 +26,6 @@ Contents:
     data
     conn
     mvar
-    plot
 
 Tutorials:
 

diff --git a/doc/mvar.rst b/doc/mvar.rst
@@ -7,19 +7,19 @@ MVAR class
 ########
 *Tools for MVAR parameters fitting*
 
-.. automodule:: mvarmodel
+.. automodule:: connectivipy.mvarmodel
    :members:
 
 Algorithms
 ########
 
-.. automodule:: mvar.fitting
+.. automodule:: connectivipy.mvar.fitting
    :members:
 
 Additional
 ########
 
 *Additional tools*
 
-.. automodule:: mvar.comp
+.. automodule:: connectivipy.mvar.comp
    :members:
diff --git a/doc/plot.rst b/doc/plot.rst
diff --git a/doc/tutorial.rst b/doc/tutorial.rst
@@ -175,7 +175,7 @@ Instantaneous
     import connectivipy as cp
 
     """
-    This example reproduce simulation from article:
+    This example reproduces simulation from article:
     Erla S et all (2009) "Multivariate autoregressive model with
                           instantaneous effects to improve brain
                           connectivity estimation"