projects
/
morpheus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix reporting scripts + reset W to identity at each OptimParams()
[morpheus.git]
/
pkg
/
R
/
optimParams.R
diff --git
a/pkg/R/optimParams.R
b/pkg/R/optimParams.R
index
894aebd
..
5a88ed9
100644
(file)
--- a/
pkg/R/optimParams.R
+++ b/
pkg/R/optimParams.R
@@
-102,7
+102,7
@@
setRefClass(
n <<- nrow(X)
d <<- ncol(X)
n <<- nrow(X)
d <<- ncol(X)
- W <<- diag(d+d^2+d^3) #initialize at W = Identity
+ # W will be initialized when calling run()
},
expArgs = function(v)
},
expArgs = function(v)
@@
-264,6
+264,10
@@
setRefClass(
θ0$b = rep(0, K)
else if (!is.numeric(θ0$b) || length(θ0$b) != K || any(is.na(θ0$b)))
stop("θ0$b: length K, no NA")
θ0$b = rep(0, K)
else if (!is.numeric(θ0$b) || length(θ0$b) != K || any(is.na(θ0$b)))
stop("θ0$b: length K, no NA")
+
+ # (Re)Set W to identity, to allow several run from the same object
+ W <<- diag(d+d^2+d^3)
+
# TODO: stopping condition? N iterations? Delta <= epsilon ?
loopMax <- 2
for (loop in 1:loopMax)
# TODO: stopping condition? N iterations? Delta <= epsilon ?
loopMax <- 2
for (loop in 1:loopMax)