Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Armin Rauschenberger
joinet
Commits
11ac779a
Commit
11ac779a
authored
Aug 02, 2019
by
Armin Rauschenberger
Browse files
automation
parent
030addd5
Changes
2
Hide whitespace changes
Inline
Side-by-side
CRAN-RELEASE
View file @
11ac779a
This package was submitted to CRAN on 2019-07-31.
This package was submitted to CRAN on 2019-07-31.
Once it is accepted, delete this file and tag the release (commit
f27baa2a83
).
Once it is accepted, delete this file and tag the release (commit
030addd525
).
R/functions.R
View file @
11ac779a
...
@@ -447,7 +447,7 @@ cv.joinet <- function(Y,X,family="gaussian",nfolds.ext=5,nfolds.int=10,foldid.ex
...
@@ -447,7 +447,7 @@ cv.joinet <- function(Y,X,family="gaussian",nfolds.ext=5,nfolds.int=10,foldid.ex
#--- cross-validated predictions ---
#--- cross-validated predictions ---
models
<-
c
(
"base"
,
"meta"
,
"
spls"
[
spls
],
"mnorm"
[
mnorm
],
"sier"
[
sier
],
"mrce"
[
mrce
],
"none"
)
models
<-
c
(
"base"
,
"meta"
,
"
mnorm"
[
mnorm
],
"spls"
[
spls
],
"sier"
[
sier
],
"mrce"
[
mrce
],
"none"
)
pred
<-
lapply
(
X
=
models
,
function
(
x
)
matrix
(
data
=
NA
,
nrow
=
n
,
ncol
=
q
))
pred
<-
lapply
(
X
=
models
,
function
(
x
)
matrix
(
data
=
NA
,
nrow
=
n
,
ncol
=
q
))
names
(
pred
)
<-
models
names
(
pred
)
<-
models
...
@@ -491,6 +491,7 @@ cv.joinet <- function(Y,X,family="gaussian",nfolds.ext=5,nfolds.int=10,foldid.ex
...
@@ -491,6 +491,7 @@ cv.joinet <- function(Y,X,family="gaussian",nfolds.ext=5,nfolds.int=10,foldid.ex
pred
$
sier
[
foldid.ext
==
i
,]
<-
SiER
::
pred.SiER
(
cv.fit
=
object
,
X.new
=
X1
)
pred
$
sier
[
foldid.ext
==
i
,]
<-
SiER
::
pred.SiER
(
cv.fit
=
object
,
X.new
=
X1
)
}
}
if
(
mrce
){
if
(
mrce
){
# bug?
lam1
<-
rev
(
10
^
seq
(
from
=
-2
,
to
=
0
,
by
=
0.5
))
lam1
<-
rev
(
10
^
seq
(
from
=
-2
,
to
=
0
,
by
=
0.5
))
lam2
<-
rev
(
10
^
seq
(
from
=
-2
,
to
=
0
,
by
=
0.5
))
lam2
<-
rev
(
10
^
seq
(
from
=
-2
,
to
=
0
,
by
=
0.5
))
object
<-
MRCE
::
mrce
(
X
=
x0
,
Y
=
y0
,
lam1.vec
=
lam1
,
lam2.vec
=
lam2
,
method
=
"cv"
)
object
<-
MRCE
::
mrce
(
X
=
x0
,
Y
=
y0
,
lam1.vec
=
lam1
,
lam2.vec
=
lam2
,
method
=
"cv"
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment