[Distr-commits] r756 - in pkg/distrEx: . src

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

Author: ruckdeschel
Date: 2011-11-18 13:12:47 +0100 (Fri, 18 Nov 2011)
New Revision: 756

Modified:
   pkg/distrEx/DESCRIPTION
   pkg/distrEx/src/kMad.c
Log:
[distrEx] (trunk)
reaction to http://developer.r-project.org/214update.txt
+ removed lazyload tag in DESCRIPTION
+ updated version number in DESCRIPTION
+ deleted occurrences of ll and lr in kMad.c (as proposed by Matthias)

Modified: pkg/distrEx/DESCRIPTION
===================================================================
--- pkg/distrEx/DESCRIPTION	2011-11-18 12:01:27 UTC (rev 755)
+++ pkg/distrEx/DESCRIPTION	2011-11-18 12:12:47 UTC (rev 756)
@@ -1,17 +1,16 @@
 Package: distrEx
-Version: 2.3.1
-Date: 2011-09-30
+Version: 2.3.2
+Date: 2011-11-18
 Title: Extensions of package distr
 Description: Extensions of package distr and some additional functionality
 Depends: R(>= 2.6.0), methods, distr(>= 2.2), evd, actuar, startupmsg
 Suggests: tcltk
 Author: Matthias Kohl, Peter Ruckdeschel
 Maintainer: Matthias Kohl <Matthias.Kohl at stamats.de>
-LazyLoad: yes
 ByteCompile: yes
 License: LGPL-3
 Encoding: latin1
 URL: http://distr.r-forge.r-project.org/
 LastChangedDate: {$LastChangedDate$}
 LastChangedRevision: {$LastChangedRevision$}
-SVNRevision: 741
+SVNRevision: 755

Modified: pkg/distrEx/src/kMad.c
===================================================================
--- pkg/distrEx/src/kMad.c	2011-11-18 12:01:27 UTC (rev 755)
+++ pkg/distrEx/src/kMad.c	2011-11-18 12:12:47 UTC (rev 756)
@@ -47,14 +47,13 @@
 
        while(j < n2)
          {int i1l=0, i2l=0, jl=0, i1r=0, i2r=0, jr=0;
-              double ll=0, lr = 0, xll=0, xrl=0, xlr=0, xrr=0;
+              double xll=0, xrl=0, xlr=0, xrr=0;
           // l = left check values, r = right check values
                 // check left
              if(i1>0){
                 i1l = i1 - 1;
                 xll = x[i1l];
                 xrl = m + k * (m-xll);
-                ll = xrl - xll;
                 i2l = i2;
                 while((x[i2l] <= xrl +eps[0]) &&(i2l < lx[0]-2)) i2l ++;
                 jl = i2l - i1l + 1;
@@ -70,7 +69,6 @@
                    i2r = i2 + 1;
                    xrr = x[i2r];
                    xlr = m - (xrr-m) / k;
-                   lr = xrr - xlr;
                    i1r = i1;
                    while((x[i1r] >= xlr -eps[0]) &&(i1r > 0)) i1r --;
                    jr = i2r - i1r + 1;