Commit 013407bf authored by Dirk Eddelbuettel's avatar Dirk Eddelbuettel

Import Upstream version 0.4-1

parent 26e540cb
Package: MatrixModels
Version: 0.4-0
Date: 2015-01-13
Version: 0.4-1
Date: 2015-08-22
Title: Modelling with Sparse And Dense Matrices
Author: Douglas Bates <bates@stat.wisc.edu> and Martin Maechler <maechler@stat.math.ethz.ch>
Maintainer: Martin Maechler <mmaechler+Matrix@gmail.com>
Contact: Doug and Martin <Matrix-authors@R-project.org>
Description: Modelling with sparse and dense 'Matrix' matrices, using
modular prediction and response module classes.
Depends: R (>= 2.14.0), utils
Imports: stats, methods, Matrix (>= 1.0-1)
Depends: R (>= 3.0.1)
Imports: stats, methods, Matrix (>= 1.1-5)
Encoding: UTF-8
LazyLoad: yes
License: GPL (>= 2)
URL: http://Matrix.R-forge.R-project.org/
Packaged: 2015-01-13 11:52:51 UTC; maechler
NeedsCompilation: no
Packaged: 2015-08-22 20:32:14 UTC; maechler
Repository: CRAN
Date/Publication: 2015-01-14 06:22:36
Date/Publication: 2015-08-22 23:37:45
4ec9cd332840cbabc09ba9c99fa80e3a *ChangeLog
5949b25fd175193a8189b9f3467f510e *DESCRIPTION
2658e5da3b0bcf26640950524ef4632d *NAMESPACE
582085c214b9916b2a4bc49bd024a326 *DESCRIPTION
5eb001d1b55812200f0f71fd404e562b *NAMESPACE
7a7f7791efa7046efabbb67ab6e212ae *R/AllClass.R
412fdc8380154f704350319d8d0e42b4 *R/AllGeneric.R
602b0e257fb33e271659eb18b1d547e2 *R/modelMatrix.R
93c883c1a6958246f1ea1518c05e80c1 *R/modelMatrix.R
0d4a8c52756fab885df4ad945c144220 *man/Model-class.Rd
bb36643f358dd859d4239f8a2d13c838 *man/glm4.Rd
cb5bd701214e3700654c964b62fa70c2 *man/glpModel-class.Rd
......
......@@ -22,13 +22,12 @@ importFrom("stats" ## potentially all these (we import into 'lme4a'):
importClassesFrom("methods", ANY, call, character, environment, envRefClass,
integer, list, matrix, numeric, oldClass)
importMethodsFrom("methods", show)
importFrom("methods"
, callGeneric, as, is, extends, new
, getClass, getClassDef, validObject
, setClass, setClassUnion
, setGeneric
, setMethod, setOldClass
, setRefClass
, setClass, setClassUnion, setOldClass, setRefClass
, setGeneric, setMethod
, setValidity, slot, "slot<-", slotNames
, signature, representation, prototype)
......@@ -53,7 +52,9 @@ importClassesFrom("Matrix",
ddenseMatrix, denseMatrix,
generalMatrix, Matrix)
importFrom("Matrix", Diagonal, isLDL, sparse.model.matrix)
importFrom("Matrix",
.solve.dgC.chol, .solve.dgC.qr,
Diagonal, isLDL, sparse.model.matrix)
## Generics and functions defined in this package -------------------------
......
......@@ -83,16 +83,14 @@ lm.fit.sparse <- function(x, y, w = NULL, offset = NULL,
switch(method,
"cholesky" = {
r <- .Call(Matrix:::dgCMatrix_cholsol, # has AS_CHM_SP(x)
as(if(transpose) tx else t(x), "CsparseMatrix"), y)
r <- .solve.dgC.chol(as(if(transpose) tx else t(x), "CsparseMatrix"), y)
coef <- r[["coef"]]
},
"qr" = {
## FIXME: should improve C code here, to return more
coef <- .Call(Matrix:::dgCMatrix_qrsol, # has AS_CSP(): must be dgC or dtC:
if(cld@className %in% c("dtCMatrix", "dgCMatrix")) x
else as(x, "dgCMatrix"),
y, order)
coef <-
.solve.dgC.qr(if(cld@className %in% c("dtCMatrix", "dgCMatrix")) x
else as(x, "dgCMatrix"),
y, order)
## for now -- FIXME --
return(coef)
},
......@@ -242,7 +240,7 @@ mkRespMod <- function(fr, family = NULL, nlenv = NULL, nlmod = NULL)
} else {
ll$Class <- "nlsRespMod"
ll$nlenv <- nlenv
ll$nlmod <- Quote(nlmod)
ll$nlmod <- quote(nlmod)
ll$sqrtXwt <- grad
ll$pnames <- colnames(ll$sqrtXwt)
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment