Merge pull request #15 from olivertomic/upgrade-0.12.0

Commit for version 0.12

.gitignore

@@ -1,3 +1,6 @@
 *.pyc
 .spyproject/
 *.egg-info
+build
+dist
+.pytest_cache

docs/conf.py

@@ -49,17 +49,17 @@
 
 # General information about the project.
 project = 'hoggormplot'
-copyright = '2017, Oliver Tomic'
+copyright = '2019, Oliver Tomic'
 author = 'Oliver Tomic'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '0.10.0'
+version = '0.12.0'
 # The full version, including alpha/beta/rc tags.
-release = '0.10.0'
+release = '0.12.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/quickstart.rst

@@ -76,7 +76,7 @@ Example
 
 	# Plot results with HoggormPlot
 	# Get multiple plots with the main hoggormplot function
-	>>> hopl.plot(myModel, plots=[1, 2, 3, 6], cumulative=True, line=True)
-	>>> hopl.plot(myModel)
-	>>> hopl.plot(myModel, plots=['scores', 'loadings', 'explainedVariance'], cumulative=True)
+	>>> hopl.plot(model, plots=[1, 2, 3, 6], cumulative=True, line=True)
+	>>> hopl.plot(model)
+	>>> hopl.plot(model, plots=['scores', 'loadings', 'explainedVariance'], cumulative=True)
 

hoggormplot/SMI_plot.py

@@ -39,18 +39,17 @@ def plotSMI(smi, pc='max', significance=True, X1name='X1', X2name='X2',\
     EXAMPLES
     --------
     >>> import numpy as np
-    >>> import SMI as S
-    >>> import statTools as st
-    >>> import resPlotting_with_SMI as resPlot
+    >>> import hoggorm as ho
+    >>> import hoggormplot as hopl
     
-    >>> X1 = st.centre(np.random.rand(100,300))
+    >>> X1 = ho.center(np.random.rand(100,300))
     >>> U, s, V = np.linalg.svd(X1, 0)
     >>> X2 = np.dot(np.dot(np.delete(U, 2,1), np.diag(np.delete(s,2))), np.delete(V,2,0))
     
-    >>> smiOP = S.SMI(X1,X2, ncomp1 = 10, ncomp2 = 10)
+    >>> smiOP = ho.SMI(X1,X2, ncomp1 = 10, ncomp2 = 10)
     >>> print(smiOP.smi[:4,:4])
     
-    >>> resPlot.plotSMI(smiOP)
+    >>> hopl.plotSMI(smiOP)
     """
 
     # Check how many components to use

requirements.txt

@@ -1,3 +1,3 @@
 numpy >= 1.11.3
-hoggorm >= 0.11.3
+hoggorm >= 0.12.0
 matplotlib >= 2.1.1