SCM

SCM Repository

[matrix] Diff of /pkg/Matrix/R/diagMatrix.R
ViewVC logotype

Diff of /pkg/Matrix/R/diagMatrix.R

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

revision 2945, Thu Dec 19 13:52:00 2013 UTC revision 2978, Wed Mar 26 18:17:09 2014 UTC
# Line 666  Line 666 
666              x <- as(x, "generalMatrix")              x <- as(x, "generalMatrix")
667          ind <- rep.int(seq_len(dx[2]), x@p[-1] - x@p[-dx[2]-1L])          ind <- rep.int(seq_len(dx[2]), x@p[-1] - x@p[-dx[2]-1L])
668          x@x <- x@x * y@x[ind]          x@x <- x@x * y@x[ind]
669          if(is(x, "compMatrix") && length(xf <- x@factors)) {          if(.hasSlot(x, "factors") && length(x@factors)) {# drop cashed ones
670              ## instead of dropping all factors, be smart about some              ## instead of dropping all factors, be smart about some
671              ## TODO ......              ## TODO ......
672              x@factors <- list()              x@factors <- list()
# Line 686  Line 686 
686          if(!all(x@x[1L] == x@x[-1L]) && is(y, "symmetricMatrix"))          if(!all(x@x[1L] == x@x[-1L]) && is(y, "symmetricMatrix"))
687              y <- as(y, "generalMatrix")              y <- as(y, "generalMatrix")
688          y@x <- y@x * x@x[y@i + 1L]          y@x <- y@x * x@x[y@i + 1L]
689          if(is(y, "compMatrix") && length(yf <- y@factors)) {          if(.hasSlot(y, "factors") && length(yf <- y@factors)) {
690              ## TODO              ## TODO
691              if(FALSE) { ## instead of dropping all factors, be smart about some              if(FALSE) { ## instead of dropping all factors, be smart about some
692                  keep <- character()                  keep <- character()

Legend:
Removed from v.2945  
changed lines
  Added in v.2978

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