[Distr-commits] r1352 - in branches/distr-2.9/pkg/distr: R inst

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

Author: ruckdeschel
Date: 2019-12-11 10:02:03 +0100 (Wed, 11 Dec 2019)
New Revision: 1352

Modified:
   branches/distr-2.9/pkg/distr/R/bAcDcLcDistribution.R
   branches/distr-2.9/pkg/distr/inst/NEWS
Log:
+ distr {devel-branch}: + fixed a glitch in catching argument names in bAcDcLcDistribution.R 
  detected by Elio Campitelli <elio.campitelli at cima.fcen.uba.ar>


Modified: branches/distr-2.9/pkg/distr/R/bAcDcLcDistribution.R
===================================================================
--- branches/distr-2.9/pkg/distr/R/bAcDcLcDistribution.R	2019-12-11 09:01:00 UTC (rev 1351)
+++ branches/distr-2.9/pkg/distr/R/bAcDcLcDistribution.R	2019-12-11 09:02:03 UTC (rev 1352)
@@ -104,8 +104,8 @@
 setMethod("/", c("numeric",
                  "AcDcLcDistribution"),
 function(e1,e2){
-  if (is((e2s <- as.character(deparse(match.call(
-                call = sys.call(sys.parent(1)))$e2))), "try-error"))
+  if (is(try(e2s <- as.character(deparse(match.call(
+                call = sys.call(sys.parent(1)))$e2)),silent =TRUE), "try-error"))
       e2s <- "e2"
 
  e2 <- .ULC.cast(e2)
@@ -168,8 +168,8 @@
 setMethod("/", c("AcDcLcDistribution",
                  "AcDcLcDistribution"),
 function(e1,e2){
-  if (is((e2s <- as.character(deparse(match.call(
-                call = sys.call(sys.parent(1)))$e2))), "try-error"))
+  if (is(try(e2s <- as.character(deparse(match.call(
+                call = sys.call(sys.parent(1)))$e2)),silent =TRUE), "try-error"))
       e2s <- "e2"
 
 #         if( is(e2,"AbscontDistribution"))
@@ -369,11 +369,11 @@
 setMethod("^", c("AcDcLcDistribution","AcDcLcDistribution"),
 function(e1,e2){
  ### check if there are problems
-  if (is((e1s <- as.character(deparse(match.call(
-                call = sys.call(sys.parent(1)))$e1))), "try-error"))
+  if (is(try(e1s <- as.character(deparse(match.call(
+                call = sys.call(sys.parent(1)))$e1)),silent =TRUE), "try-error"))
       e1s <- "e1"
-  if (is((e2s <- as.character(deparse(match.call(
-                call = sys.call(sys.parent(1)))$e2))), "try-error"))
+  if (is(try(e2s <- as.character(deparse(match.call(
+                call = sys.call(sys.parent(1)))$e2)),silent =TRUE), "try-error"))
       e2s <- "e2"
 
 # if( is(e1,"AffLinUnivarLebDecDistribution"))
@@ -456,11 +456,11 @@
 setMethod("^", c("numeric","AcDcLcDistribution"),
 function(e1,e2){
  ### check if there are problems
-  if (is((e1s <- as.character(deparse(match.call(
-                call = sys.call(sys.parent(1)))$e1))), "try-error"))
+  if (is(try(e1s <- as.character(deparse(match.call(
+                call = sys.call(sys.parent(1)))$e1)),silent =TRUE), "try-error"))
       e1s <- "e1"
-  if (is((e2s <- as.character(deparse(match.call(
-                call = sys.call(sys.parent(1)))$e2))), "try-error"))
+  if (is(try(e2s <- as.character(deparse(match.call(
+                call = sys.call(sys.parent(1)))$e2)),silent =TRUE), "try-error"))
       e2s <- "e2"
 
  e2 <- .ULC.cast(e2)

Modified: branches/distr-2.9/pkg/distr/inst/NEWS
===================================================================
--- branches/distr-2.9/pkg/distr/inst/NEWS	2019-12-11 09:01:00 UTC (rev 1351)
+++ branches/distr-2.9/pkg/distr/inst/NEWS	2019-12-11 09:02:03 UTC (rev 1352)
@@ -8,6 +8,17 @@
  information)
  
 ##############
+v 2.9
+##############
+user-visible CHANGES:
+  
+bug fixes
++ fixed a glitch in catching argument names in bAcDcLcDistribution.R 
+  detected by Elio Campitelli <elio.campitelli at cima.fcen.uba.ar>
+
+under the hood:
+
+##############
 v 2.8
 ##############