[Distr-commits] r797 - branches/distr-2.4/pkg/distr/R

[noreply at r-forge.r-project.org]

Author: ruckdeschel
Date: 2012-02-22 21:48:09 +0100 (Wed, 22 Feb 2012)
New Revision: 797

Modified:
   branches/distr-2.4/pkg/distr/R/internalUtils.R
Log:
[distr] 2.4 branch: fixed gaps issue with .multm ---caught with try catch

Modified: branches/distr-2.4/pkg/distr/R/internalUtils.R
===================================================================
--- branches/distr-2.4/pkg/distr/R/internalUtils.R	2012-02-22 16:16:54 UTC (rev 796)
+++ branches/distr-2.4/pkg/distr/R/internalUtils.R	2012-02-22 20:48:09 UTC (rev 797)
@@ -627,12 +627,14 @@
                  rm(supportnew)
 
             }else if (Dclass == "AffLinAbscontDistribution"){
-                 if(is.null(e1 at gaps)) 
+                 trY <- try(
+                 if(is.null(e1 at gaps))
                     gapsnew <- NULL
                  else {gapsnew <- e1 at gaps * e2
                        if (e2 < 0) gapsnew <- 
                              gapsnew[rev(seq(nrow(gapsnew))),c(2,1),drop = FALSE] }
-                 
+                 , silent=TRUE)
+                 if(is(trY,"try-error")) gapsnew <- NULL
                  dnew <- .makeD(substitute(e1, list(e1 = e1)),
                                 substitute(alist(x = x / e2), list(e2 = e2)),
                                 stand = abs(e2))
@@ -648,11 +650,14 @@
                     .logExact = .logExact(e1), .lowerExact = .lowerExact(e1))
  
             }else if (Dclass == "AbscontDistribution"){
-                 if(is.null(e1 at gaps)) 
+                 trY <- try(
+                 if(is.null(e1 at gaps))
                     gapsnew <- NULL
                  else {gapsnew <- e1 at gaps * e2
                        if (e2 < 0) gapsnew <- 
                             gapsnew[rev(seq(nrow(gapsnew))),c(2,1), drop = FALSE] }
+                 , silent=TRUE)
+                 if(is(trY,"try-error")) gapsnew <- NULL
 
                  dnew <- .makeD(substitute(e1, list(e1 = e1)),
                                 substitute(alist(x = x / e2), list(e2 = e2)),