[Distr-commits] r659 - branches/distr-2.3/pkg/distr branches/distr-2.3/pkg/distr/R branches/distr-2.3/pkg/utils pkg/distr/R

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

Author: ruckdeschel
Date: 2010-06-15 20:48:35 +0200 (Tue, 15 Jun 2010)
New Revision: 659

Modified:
   branches/distr-2.3/pkg/distr/DESCRIPTION
   branches/distr-2.3/pkg/distr/R/internalUtils.R
   branches/distr-2.3/pkg/utils/showsvnlog.R
   pkg/distr/R/internalUtils.R
Log:
tentative fix for Uwe Ligges' bug report obsevered in 
http://cran.r-project.org/bin/windows/contrib/2.12/check/distr-check.log  15-06-2010

Modified: branches/distr-2.3/pkg/distr/DESCRIPTION
===================================================================
--- branches/distr-2.3/pkg/distr/DESCRIPTION	2010-05-28 19:06:16 UTC (rev 658)
+++ branches/distr-2.3/pkg/distr/DESCRIPTION	2010-06-15 18:48:35 UTC (rev 659)
@@ -1,8 +1,8 @@
 Package: distr
 Version: 2.3
 Date: 2010-02-07
-Title: Object orientated implementation of distributions
-Description: Object orientated implementation of distributions
+Title: Object oriented implementation of distributions
+Description: S4 Classes and Methods for distributions
 Author: Florian Camphausen, Matthias Kohl, Peter Ruckdeschel, Thomas Stabla
 Maintainer: Peter Ruckdeschel <Peter.Ruckdeschel at itwm.fraunhofer.de>
 Depends: R(>= 2.2.0), methods, graphics, startupmsg, sfsmisc, SweaveListingUtils

Modified: branches/distr-2.3/pkg/distr/R/internalUtils.R
===================================================================
--- branches/distr-2.3/pkg/distr/R/internalUtils.R	2010-05-28 19:06:16 UTC (rev 658)
+++ branches/distr-2.3/pkg/distr/R/internalUtils.R	2010-06-15 18:48:35 UTC (rev 659)
@@ -612,6 +612,10 @@
 #x0 <- x00[idx]               ### maximal x's
 #y0 <- y00[idx]
 #f1 <- approxfun(x = x0, y = y0, yleft = y0[1], yright = y0[length(y0)])
+
+yleft <- yleft[1]
+yright <- yright[1]
+
 isna <- is.na(x)|is.na(y)
 x <- x[!isna]
 y <- y[!isna]

Modified: branches/distr-2.3/pkg/utils/showsvnlog.R
===================================================================
--- branches/distr-2.3/pkg/utils/showsvnlog.R	2010-05-28 19:06:16 UTC (rev 658)
+++ branches/distr-2.3/pkg/utils/showsvnlog.R	2010-06-15 18:48:35 UTC (rev 659)
@@ -21,14 +21,14 @@
     inRforge = TRUE,    ### shall we use r-forge as repository
                         ## (otherwise need full URL as arg pathRepo
     withlogin = TRUE,   ### do we need option --login (yes in cygwin, don't know in Linux)
-    PathToBash = "C:/cygwin/bin/bash",  ## path to bash
-    PathToUtils="C:/rtest/distr/branches/distr-2.2/pkg/utils",
+    PathToBash = "C:/Programme/bin/bash", ## old: "C:/cygwin/bin/bash",  ## path to bash
+    PathToUtils="C:/rtest/distr/branches/distr-2.3/pkg/utils",
                     ### path to shell script readsvnlog.sh
     fromRev = 501,  ## arg for svn log --- first log-listed revision
     toRev = 502,    ## arg for svn log --- last log-listed revision;
                     ## may be Inf or <0 => then use HEAD revision
     limit = 100,    ### how many revisions will be shown atmost
-    tmpfile = "C:/rtest/tmp-svnlog3.txt", ### some tmpfile to which we write the
+    tmpfile = "C:/rtest/tmp-svnlog4.txt", ### some tmpfile to which we write the
                         ## results temporarily; is deleted afterwords
     con = stdout(),     ### results are written to con; by default screen, but
                         ### may also be a file

Modified: pkg/distr/R/internalUtils.R
===================================================================
--- pkg/distr/R/internalUtils.R	2010-05-28 19:06:16 UTC (rev 658)
+++ pkg/distr/R/internalUtils.R	2010-06-15 18:48:35 UTC (rev 659)
@@ -612,6 +612,9 @@
 #x0 <- x00[idx]               ### maximal x's
 #y0 <- y00[idx]
 #f1 <- approxfun(x = x0, y = y0, yleft = y0[1], yright = y0[length(y0)])
+yleft <- yleft[1]
+yright <- yright[1]
+
 isna <- is.na(x)|is.na(y)
 x <- x[!isna]
 y <- y[!isna]