SCM

SCM Repository

[matrix] Diff of /pkg/R/AllClass.R
ViewVC logotype

Diff of /pkg/R/AllClass.R

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1200, Mon Jan 23 16:01:20 2006 UTC revision 1201, Mon Jan 23 16:04:12 2006 UTC
# Line 194  Line 194 
194    
195  ## numeric, dense, non-packed symmetric matrices  ## numeric, dense, non-packed symmetric matrices
196  setClass("lsyMatrix",  setClass("lsyMatrix",
197           contains = c("lgeMatrix", "symmetricMatrix"),           contains = c("ldenseMatrix", "symmetricMatrix"),
198           prototype = prototype(uplo = "U")           prototype = prototype(uplo = "U")
199           ##, validity = function(object) .Call("lsyMatrix_validate", object, PACKAGE = "Matrix")           ##, validity = function(object) .Call("lsyMatrix_validate", object, PACKAGE = "Matrix")
200           )           )
201    
202  ## numeric, dense, packed symmetric matrices  ## numeric, dense, packed symmetric matrices
203  setClass("lspMatrix",  setClass("lspMatrix",
          prototype = prototype(uplo = "U"),  
204           contains = c("ldenseMatrix", "symmetricMatrix"),           contains = c("ldenseMatrix", "symmetricMatrix"),
205             prototype = prototype(uplo = "U"),
206           validity = function(object)           validity = function(object)
207           .Call("dspMatrix_validate", object, PACKAGE = "Matrix")           .Call("dspMatrix_validate", object, PACKAGE = "Matrix")
208           ## "dsp" and "lsp" have the same validate           ## "dsp" and "lsp" have the same validate
# Line 210  Line 210 
210    
211  ## 'diagonalMatrix' already has validity checking  ## 'diagonalMatrix' already has validity checking
212  ## diagonal, numeric matrices;      "d*" has 'x' slot :  ## diagonal, numeric matrices;      "d*" has 'x' slot :
213  setClass("ddiMatrix", contains = c("diagonalMatrix", "dMatrix"))  setClass("ddiMatrix", contains = c("diagonalMatrix", "ddenseMatrix"))# or "dMatrix"
214  ## diagonal, logical matrices; "ldense*" has 'x' slot :  ## diagonal, logical matrices; "ldense*" has 'x' slot :
215  setClass("ldiMatrix", contains = c("diagonalMatrix", "ldenseMatrix"))  setClass("ldiMatrix", contains = c("diagonalMatrix", "ldenseMatrix"))
216    
# Line 279  Line 279 
279    
280  ## numeric, sparse, sorted compressed sparse row-oriented general matrices  ## numeric, sparse, sorted compressed sparse row-oriented general matrices
281  setClass("dgRMatrix",  setClass("dgRMatrix",
282           representation(j = "integer", p = "integer"),           contains = c("RsparseMatrix", "dsparseMatrix", "generalMatrix"),
          contains = c("dsparseMatrix", "generalMatrix"),  
283           prototype = prototype(p = 0:0),           prototype = prototype(p = 0:0),
284           ##TODO: validity = function(object) .Call("dgRMatrix_validate", object, PACKAGE = "Matrix")           ##TODO: validity = function(object) .Call("dgRMatrix_validate", object, PACKAGE = "Matrix")
285           )           )
# Line 329  Line 328 
328    
329  ## logical, sparse, sorted compressed sparse column-oriented general matrices  ## logical, sparse, sorted compressed sparse column-oriented general matrices
330  setClass("lgCMatrix",  setClass("lgCMatrix",
331           contains = c("lsparseMatrix", "CsparseMatrix", "generalMatrix"),           contains = c("CsparseMatrix", "lsparseMatrix", "generalMatrix"),
332           prototype = prototype(p = 0:0),# to be valid           prototype = prototype(p = 0:0),# to be valid
333           validity =           validity =
334           function(object) .Call("lgCMatrix_validate", object, PACKAGE = "Matrix")           function(object) .Call("lgCMatrix_validate", object, PACKAGE = "Matrix")
# Line 337  Line 336 
336    
337  ## logical, sparse, sorted compressed sparse column-oriented triangular matrices  ## logical, sparse, sorted compressed sparse column-oriented triangular matrices
338  setClass("ltCMatrix",  setClass("ltCMatrix",
339           contains = c("lsparseMatrix", "CsparseMatrix", "triangularMatrix"),           contains = c("CsparseMatrix", "lsparseMatrix", "triangularMatrix"),
340           prototype = prototype(p = 0:0, uplo = "U", diag = "N"),# to be valid           prototype = prototype(p = 0:0, uplo = "U", diag = "N"),# to be valid
341           validity =           validity =
342           function(object) .Call("ltCMatrix_validate", object, PACKAGE = "Matrix")           function(object) .Call("ltCMatrix_validate", object, PACKAGE = "Matrix")
# Line 345  Line 344 
344    
345  ## logical, sparse, sorted compressed sparse column-oriented symmetric matrices  ## logical, sparse, sorted compressed sparse column-oriented symmetric matrices
346  setClass("lsCMatrix",  setClass("lsCMatrix",
347           contains = c("lsparseMatrix", "CsparseMatrix", "symmetricMatrix"),           contains = c("CsparseMatrix", "lsparseMatrix", "symmetricMatrix"),
348           prototype = prototype(p = 0:0, uplo = "U"),# to be valid           prototype = prototype(p = 0:0, uplo = "U"),# to be valid
349           validity =           validity =
350           function(object) .Call("lsCMatrix_validate", object, PACKAGE = "Matrix")           function(object) .Call("lsCMatrix_validate", object, PACKAGE = "Matrix")
# Line 354  Line 353 
353  ## logical, sparse, sorted compressed sparse row-oriented general matrices  ## logical, sparse, sorted compressed sparse row-oriented general matrices
354  setClass("lgRMatrix",  setClass("lgRMatrix",
355           representation(j = "integer", p = "integer"),           representation(j = "integer", p = "integer"),
356           contains = "lsparseMatrix",           contains = c("RsparseMatrix", "lsparseMatrix", "generalMatrix"),
357           validity =           validity =
358           function(object) .Call("lgRMatrix_validate", object, PACKAGE = "Matrix")           function(object) .Call("lgRMatrix_validate", object, PACKAGE = "Matrix")
359           )           )
360    
361  ## logical, sparse, sorted compressed sparse row-oriented triangular matrices  ## logical, sparse, sorted compressed sparse row-oriented triangular matrices
362  setClass("ltRMatrix",  setClass("ltRMatrix",
363           contains = c("lgRMatrix", "triangularMatrix"),           contains = c("RsparseMatrix", "lsparseMatrix", "triangularMatrix"),
364           validity =           validity =
365           function(object) .Call("ltRMatrix_validate", object, PACKAGE = "Matrix")           function(object) .Call("ltRMatrix_validate", object, PACKAGE = "Matrix")
366           )           )
367    
368  ## logical, sparse, sorted compressed sparse row-oriented symmetric matrices  ## logical, sparse, sorted compressed sparse row-oriented symmetric matrices
369  setClass("lsRMatrix",  setClass("lsRMatrix",
370           contains = c("lgRMatrix", "symmetricMatrix"),           contains = c("RsparseMatrix", "lsparseMatrix", "symmetricMatrix"),
371           validity =           validity =
372           function(object) .Call("lsRMatrix_validate", object, PACKAGE = "Matrix")           function(object) .Call("lsRMatrix_validate", object, PACKAGE = "Matrix")
373           )           )
374    
375  ## Factorization classes  ### Factorization classes ---------------------------------------------
376    
377  setClass("Cholesky", contains = "dtrMatrix")  setClass("Cholesky", contains = "dtrMatrix")
378    

Legend:
Removed from v.1200  
changed lines
  Added in v.1201

root@r-forge.r-project.org
ViewVC Help
Powered by ViewVC 1.0.0  
Thanks to:
Vienna University of Economics and Business Powered By FusionForge