[Robast-commits] r1051 - branches/robast-1.1/pkg/RobRex/inst/scripts branches/robast-1.2/pkg/RobRex/inst/scripts pkg/RobRex/inst/scripts

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

Author: ruckdeschel
Date: 2018-07-24 13:48:47 +0200 (Tue, 24 Jul 2018)
New Revision: 1051

Modified:
   branches/robast-1.1/pkg/RobRex/inst/scripts/ExamplesEstimation.R
   branches/robast-1.1/pkg/RobRex/inst/scripts/ExamplesIC.R
   branches/robast-1.2/pkg/RobRex/inst/scripts/ExamplesEstimation.R
   branches/robast-1.2/pkg/RobRex/inst/scripts/ExamplesIC.R
   pkg/RobRex/inst/scripts/ExamplesEstimation.R
   pkg/RobRex/inst/scripts/ExamplesIC.R
Log:
[RobRex] fixed some minor things in scripts in RobRex (a wrong color argument and a new calling paradigm for distrExOptions)

Modified: branches/robast-1.1/pkg/RobRex/inst/scripts/ExamplesEstimation.R
===================================================================
--- branches/robast-1.1/pkg/RobRex/inst/scripts/ExamplesEstimation.R	2018-07-24 11:17:22 UTC (rev 1050)
+++ branches/robast-1.1/pkg/RobRex/inst/scripts/ExamplesEstimation.R	2018-07-24 11:48:47 UTC (rev 1051)
@@ -81,7 +81,7 @@
 ## Plot
 plot(calls ~ year, ylab = "phone calls [Mio.]", xlab = "year", 
      main = "Belgium Phone Calls 1950-1973", pch = 20)
-abline(fit2.LS, lwd = 2, col = "black", col = myCol[1])
+abline(fit2.LS, lwd = 2, col = myCol[1])
 abline(fit2.M, lwd = 2, col = myCol[2])
 abline(fit2.MM, lwd = 2, col = myCol[3])
 abline(fit2.LTS, lwd = 2, col = myCol[4], lty = 2)

Modified: branches/robast-1.1/pkg/RobRex/inst/scripts/ExamplesIC.R
===================================================================
--- branches/robast-1.1/pkg/RobRex/inst/scripts/ExamplesIC.R	2018-07-24 11:17:22 UTC (rev 1050)
+++ branches/robast-1.1/pkg/RobRex/inst/scripts/ExamplesIC.R	2018-07-24 11:48:47 UTC (rev 1051)
@@ -12,9 +12,9 @@
 
 # AL-estimator
 system.time(IC.AL1 <- rgsOptIC.AL(r = 0.1, K = K1, check = TRUE), gcFirst = TRUE)
-distrExOptions(ErelativeTolerance, 1e-10)
+distrExOptions("ErelativeTolerance"= 1e-10)
 checkIC(IC.AL1)
-distrExOptions(ErelativeTolerance, .Machine$double.eps^0.25)
+distrExOptions("ErelativeTolerance"= .Machine$double.eps^0.25)
 Risks(IC.AL1)
 
 # M-estimator

Modified: branches/robast-1.2/pkg/RobRex/inst/scripts/ExamplesEstimation.R
===================================================================
--- branches/robast-1.2/pkg/RobRex/inst/scripts/ExamplesEstimation.R	2018-07-24 11:17:22 UTC (rev 1050)
+++ branches/robast-1.2/pkg/RobRex/inst/scripts/ExamplesEstimation.R	2018-07-24 11:48:47 UTC (rev 1051)
@@ -81,7 +81,7 @@
 ## Plot
 plot(calls ~ year, ylab = "phone calls [Mio.]", xlab = "year", 
      main = "Belgium Phone Calls 1950-1973", pch = 20)
-abline(fit2.LS, lwd = 2, col = "black", col = myCol[1])
+abline(fit2.LS, lwd = 2, col = myCol[1])
 abline(fit2.M, lwd = 2, col = myCol[2])
 abline(fit2.MM, lwd = 2, col = myCol[3])
 abline(fit2.LTS, lwd = 2, col = myCol[4], lty = 2)

Modified: branches/robast-1.2/pkg/RobRex/inst/scripts/ExamplesIC.R
===================================================================
--- branches/robast-1.2/pkg/RobRex/inst/scripts/ExamplesIC.R	2018-07-24 11:17:22 UTC (rev 1050)
+++ branches/robast-1.2/pkg/RobRex/inst/scripts/ExamplesIC.R	2018-07-24 11:48:47 UTC (rev 1051)
@@ -12,9 +12,9 @@
 
 # AL-estimator
 system.time(IC.AL1 <- rgsOptIC.AL(r = 0.1, K = K1, check = TRUE), gcFirst = TRUE)
-distrExOptions(ErelativeTolerance, 1e-10)
+distrExOptions("ErelativeTolerance"= 1e-10)
 checkIC(IC.AL1)
-distrExOptions(ErelativeTolerance, .Machine$double.eps^0.25)
+distrExOptions("ErelativeTolerance"= .Machine$double.eps^0.25)
 Risks(IC.AL1)
 
 # M-estimator

Modified: pkg/RobRex/inst/scripts/ExamplesEstimation.R
===================================================================
--- pkg/RobRex/inst/scripts/ExamplesEstimation.R	2018-07-24 11:17:22 UTC (rev 1050)
+++ pkg/RobRex/inst/scripts/ExamplesEstimation.R	2018-07-24 11:48:47 UTC (rev 1051)
@@ -81,7 +81,7 @@
 ## Plot
 plot(calls ~ year, ylab = "phone calls [Mio.]", xlab = "year", 
      main = "Belgium Phone Calls 1950-1973", pch = 20)
-abline(fit2.LS, lwd = 2, col = "black", col = myCol[1])
+abline(fit2.LS, lwd = 2, col = myCol[1])
 abline(fit2.M, lwd = 2, col = myCol[2])
 abline(fit2.MM, lwd = 2, col = myCol[3])
 abline(fit2.LTS, lwd = 2, col = myCol[4], lty = 2)

Modified: pkg/RobRex/inst/scripts/ExamplesIC.R
===================================================================
--- pkg/RobRex/inst/scripts/ExamplesIC.R	2018-07-24 11:17:22 UTC (rev 1050)
+++ pkg/RobRex/inst/scripts/ExamplesIC.R	2018-07-24 11:48:47 UTC (rev 1051)
@@ -12,9 +12,9 @@
 
 # AL-estimator
 system.time(IC.AL1 <- rgsOptIC.AL(r = 0.1, K = K1, check = TRUE), gcFirst = TRUE)
-distrExOptions(ErelativeTolerance, 1e-10)
+distrExOptions("ErelativeTolerance"= 1e-10)
 checkIC(IC.AL1)
-distrExOptions(ErelativeTolerance, .Machine$double.eps^0.25)
+distrExOptions("ErelativeTolerance"= .Machine$double.eps^0.25)
 Risks(IC.AL1)
 
 # M-estimator