From 6f7a55ffd114f54b4afc34ff74fc1fdee0174c0c Mon Sep 17 00:00:00 2001
From: Thodoris Sotiropoulos <theosot@dmst.aueb.gr>
Date: Sat, 26 Nov 2016 00:20:26 +0200
Subject: [PATCH 1/2] Implementation of CP-APR algorithm

https://arxiv.org/pdf/1112.2414.pdf
---
 sktensor/cp.py | 68 +++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 67 insertions(+), 1 deletion(-)

diff --git a/sktensor/cp.py b/sktensor/cp.py
index 2aa637e..4b36385 100644
--- a/sktensor/cp.py
+++ b/sktensor/cp.py
@@ -26,7 +26,7 @@
 from numpy import array, dot, ones, sqrt
 from scipy.linalg import pinv
 from numpy.random import rand
-from .core import nvecs, norm
+from .core import nvecs, norm, khatrirao
 from .ktensor import ktensor
 
 _log = logging.getLogger('CP')
@@ -171,6 +171,72 @@ def als(X, rank, **kwargs):
     return P, fit, itr, array(exectimes)
 
 
+def apr(X, r, M=None, outer_iter=100, inner_iter=10, t=1e-4, k=0.01,
+        k_tol=1e-10, e=1e-10):
+    """
+    Alternating Poisson Regression algorithm to compute the CP decomposition.
+
+    Parameters
+    ----------
+    X : tensor
+        The tensor to be decomposed.
+    r : Number of R components.
+    M : Initial guess for tensor decomposed components.
+    outer_iter : Number of maximum outer iterations.
+    inner_iter : Number of maximum inner iterations.
+    t : Convergence tolerance of KKT conditions.
+    k : Inadmissible zero avoidance adjustment.
+    k_tol : Tolerance of identifying a potentional inadmissible zero.
+    e : Minimum divisor to prevent divide-by-zero.
+
+    Returns
+    -------
+    M : ktensor
+        Rank ``rank`` factorization of X. ``M.U[i]`` corresponds to the factor
+        matrix for the i-th mode. ``M.lambda[i]`` corresponds to the weight
+        of the i-th mode.
+    i : int
+        Number of iterations that were needed until convergence
+    exectimes : ndarray of floats
+        Time needed for each single iteration
+    References
+    ----------
+    .. [1] EC Chi, TG Kolda.
+           On Tensors, Sparsity, and Nonnegative Factorizations.
+           SIAM Journal on Matrix Analysis and Applications, (2012).
+    """
+    N = len(X.shape)
+    if M is None:
+        M = ktensor([np.random.rand(X.shape[i], r) for i in range(N)])
+    phi = np.empty([N, ], dtype=object)
+
+    exectimes = []
+    for i in range(outer_iter):
+        tic = time.clock()
+        is_converged = True
+        for n in range(N):
+            S = np.zeros((X.shape[n], r))
+            if i > 0:
+                S[(phi[n] > 1) & (M.U[n] < k_tol)] = k
+            b = np.dot((M.U[n] + S), np.diag(M.lmbda))
+            pi = khatrirao(tuple(
+                [M.U[i] for i in range(n) + range(n + 1, N)])).transpose()
+            for j in range(inner_iter):
+                phi[n] = np.dot(X.unfold(n) / np.maximum(np.dot(b, pi), e),
+                                pi.transpose())
+                if np.amax(np.abs(np.ravel(np.minimum(M.U[n], 1-phi[n])))) < t:
+                    break
+
+                is_converged = False
+                b *= phi[n]
+            M.lmbda = np.dot(np.ones(b.shape[0]).transpose(), b)
+            M.U[n] = np.dot(b, np.linalg.inv(np.diag(M.lmbda)))
+        exectimes.append(time.clock() - tic)
+        if is_converged:
+            break
+    return M, i, exectimes
+
+
 def opt(X, rank, **kwargs):
     ainit = kwargs.pop('init', _DEF_INIT)
     maxiter = kwargs.pop('maxIter', _DEF_MAXITER)

From dd76b32d32deaf819b5162e63237a7ea7a6ed41b Mon Sep 17 00:00:00 2001
From: "Brian D. Holland" <brian.d.holland@gmail.com>
Date: Tue, 29 Nov 2016 07:52:32 -0500
Subject: [PATCH 2/2] cp-apr: edited inner loop exit condition; reversed
 Khatri-Rao factor order

---
 sktensor/__init__.py | 2 +-
 sktensor/cp.py       | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/sktensor/__init__.py b/sktensor/__init__.py
index 95b01ef..020c192 100644
--- a/sktensor/__init__.py
+++ b/sktensor/__init__.py
@@ -9,6 +9,6 @@
 from .ktensor import ktensor
 
 # import algorithms
-from .cp import als as cp_als
+from .cp import als as cp_als, apr as cp_apr
 from .tucker import hooi as tucker_hooi
 from .tucker import hooi as tucker_hosvd
diff --git a/sktensor/cp.py b/sktensor/cp.py
index 4b36385..90bb587 100644
--- a/sktensor/cp.py
+++ b/sktensor/cp.py
@@ -38,6 +38,7 @@
 
 __all__ = [
     'als',
+    'apr',
     'opt',
     'wopt'
 ]
@@ -220,11 +221,12 @@ def apr(X, r, M=None, outer_iter=100, inner_iter=10, t=1e-4, k=0.01,
                 S[(phi[n] > 1) & (M.U[n] < k_tol)] = k
             b = np.dot((M.U[n] + S), np.diag(M.lmbda))
             pi = khatrirao(tuple(
-                [M.U[i] for i in range(n) + range(n + 1, N)])).transpose()
+                [M.U[i] for i in range(n) + range(n + 1, N)]),
+                reverse=True).transpose()
             for j in range(inner_iter):
                 phi[n] = np.dot(X.unfold(n) / np.maximum(np.dot(b, pi), e),
                                 pi.transpose())
-                if np.amax(np.abs(np.ravel(np.minimum(M.U[n], 1-phi[n])))) < t:
+                if np.amax(np.abs(np.ravel(np.minimum(b, 1-phi[n])))) < t:
                     break
 
                 is_converged = False