Skip to content

Commit

Permalink
v-0.99.6
Browse files Browse the repository at this point in the history
  • Loading branch information
kokitsuyuzaki committed Jun 15, 2022
1 parent 30dc51d commit 0a6e59e
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 7 deletions.
6 changes: 3 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -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 = "[email protected]"))
Suggests: testthat
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions R/myICA.R
Original file line number Diff line number Diff line change
@@ -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")
}
}
4 changes: 4 additions & 0 deletions inst/NEWS
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/testthat.R
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ library("MASS")
library("rTensor")
library("nnTensor")
library("ccTensor")
library("ica")
library("iTensor")
library("igraph")
library("testthat")

Expand Down

0 comments on commit 0a6e59e

Please sign in to comment.