From 0a6e59ea9374b8834a0670090f83660f44705126 Mon Sep 17 00:00:00 2001
From: kokitsuyuzaki <k.t.the-answer@hotmail.co.jp>
Date: Wed, 15 Jun 2022 10:20:07 +0900
Subject: [PATCH] v-0.99.6

---
 DESCRIPTION      | 6 +++---
 NAMESPACE        | 2 +-
 R/myICA.R        | 4 ++--
 inst/NEWS        | 4 ++++
 tests/testthat.R | 2 +-
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/DESCRIPTION b/DESCRIPTION
index df1ecd3..f2e09bd 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: mwTensor
 Type: Package
 Title: Multi-Way Component Analysis
-Version: 0.99.5
-Date: 2021-10-12
+Version: 0.99.6
+Date: 2022-6-15
 Authors@R: c(person("Koki", "Tsuyuzaki", role = c("aut", "cre"),
                       email = "k.t.the-answer@hotmail.co.jp"))
 Suggests: testthat
@@ -12,7 +12,7 @@ Imports: methods,
     rTensor,
     nnTensor,
     ccTensor,
-    ica,
+    iTensor,
     igraph
 Description: For single tensor data, any matrix factorization method can be specified the matricised tensor in each dimension by Multi-way Component Analysis (MWCA). An originally extended MWCA is also implemented to specify and decompose multiple matrices and tensors simultaneously (CoupledMWCA). See the reference section of GitHub README.md <https://github.com/rikenbit/mwTensor>, for details of the methods.
 License: Artistic-2.0
diff --git a/NAMESPACE b/NAMESPACE
index 4169057..ac4a0b3 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -3,7 +3,7 @@ importFrom(MASS, ginv)
 importFrom(rTensor, as.tensor, vec, cs_unfold, khatri_rao_list, ttm)
 importFrom(nnTensor, recTensor, NMF, plotTensor3D, plotTensor2D)
 importFrom(ccTensor, CX)
-importFrom(ica, icafast)
+importFrom(iTensor, ICA)
 importFrom(igraph, graph_from_incidence_matrix, max_bipartite_match)
 importFrom(graphics, layout, par, text)
 importFrom(grDevices, dev.off, png)
diff --git a/R/myICA.R b/R/myICA.R
index f6ed051..de373cf 100644
--- a/R/myICA.R
+++ b/R/myICA.R
@@ -1,7 +1,7 @@
 myICA <- function(Xn, k){
     if(k == 1){
-        .normMat(icafast(Xn, nc=k+1)$Y, "column")[,1]
+        .normMat(ICA(Xn, J=k+1)$S, "column")[,1]
     }else{
-        .normMat(icafast(Xn, nc=k)$Y, "column")
+        .normMat(ICA(Xn, J=k)$S, "column")
     }
 }
diff --git a/inst/NEWS b/inst/NEWS
index 6a035ef..2b329e0 100644
--- a/inst/NEWS
+++ b/inst/NEWS
@@ -1,3 +1,7 @@
+VERSION 0.99.6
+------------------------
+   o Dependent package ica is changed to iTensor
+
 VERSION 0.99.2 - 0.99.5
 ------------------------
    o Bug fixed
diff --git a/tests/testthat.R b/tests/testthat.R
index 7ba79d5..632777e 100644
--- a/tests/testthat.R
+++ b/tests/testthat.R
@@ -3,7 +3,7 @@ library("MASS")
 library("rTensor")
 library("nnTensor")
 library("ccTensor")
-library("ica")
+library("iTensor")
 library("igraph")
 library("testthat")