SCM

SCM Repository

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

Diff of /pkg/Matrix/R/Auxiliaries.R

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

revision 3045, Mon Feb 16 14:39:35 2015 UTC revision 3046, Mon Feb 16 14:40:37 2015 UTC
# Line 1164  Line 1164 
1164      ##(extends(cld, "diagonalMatrix") && isDiagonal(x)) ||      ##(extends(cld, "diagonalMatrix") && isDiagonal(x)) ||
1165      if (extends(cld, "symmetricMatrix") && isSymmetric(x))      if (extends(cld, "symmetricMatrix") && isSymmetric(x))
1166          forceSymmetric(as(x,"CsparseMatrix"))          forceSymmetric(as(x,"CsparseMatrix"))
1167      else if (extends(cld, "triangularMatrix") && (iT <- isTriangular(x)))      else if (extends(cld, "triangularMatrix") && isTriangular(x))
1168          as(x, cl)          as(x, cl)
1169      else if(is(x, "CsparseMatrix")) x      else if(is(x, "CsparseMatrix")) x
1170      else as(x, paste0(.M.kind(x, cld), "gCMatrix"))      else as(x, paste0(.M.kind(x, cld), "gCMatrix"))
# Line 1312  Line 1312 
1312              ## -> has 'uplo'  differentiate between packed and unpacked              ## -> has 'uplo'  differentiate between packed and unpacked
1313    
1314  ### .......... FIXME ...............  ### .......... FIXME ...............
1315                ## packed <- isPacked(object)
1316              packed <- isPacked(object)              ## if(object@uplo == "U") {
1317              if(object@uplo == "U") {              ## } else { ## uplo == "L"
1318              } else { ## uplo == "L"              ## }
             }  
   
1319  ### very cheap workaround  ### very cheap workaround
1320              all0(as.matrix(object)[rep_len(c(FALSE, rep.int(TRUE,n)), n^2)])              all0(as.matrix(object)[rep_len(c(FALSE, rep.int(TRUE,n)), n^2)])
1321          }          }

Legend:
Removed from v.3045  
changed lines
  Added in v.3046

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