Skip to content

Commit

Permalink
Merge from trunk
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.r-project.org/R/branches/R-Win-CMD@28362 00db46b3-68df-0310-9c12-caf00c1e9a41
  • Loading branch information
murdoch committed Feb 20, 2004
1 parent 99eb0f7 commit 38a8f12
Show file tree
Hide file tree
Showing 50 changed files with 611 additions and 498 deletions.
145 changes: 52 additions & 93 deletions BUGS
Expand Up @@ -266,6 +266,10 @@ Subject: return() undocumented
From: Scot@Wilcoxon.Org
Date: Sat, 10 Jan 2004 16:12:16 +0100 (CET)
..He meant in R-lang
* PR# 6570 *
Subject: Spelling
From: Peter Dalgaard <p.dalgaard@biostat.ku.dk>
Date: 11 Feb 2004 01:13:32 +0100

Directory: Graphics

Expand Down Expand Up @@ -575,15 +579,6 @@ Date: Tue, 22 Apr 2003 06:21:19 +0200 (MET DST)
..According to Simon Urbanek this is a java security issue. With RAqua a good
..alternative is starting HTML
..help and then using help.search() or Help|Search Help on...
* PR# 5529 *
Subject: R OS X panther?
From: Bronwyn Carlisle <bronwyn@biocadmin.otago.ac.nz>
Date: Fri, 5 Dec 2003 12:47:55 +1300
..Probably not an R bug
* PR# 5674 *
Subject: R.app should ignore -psn command line argument
From: ellis@stat.harvard.edu
Date: Wed, 10 Dec 2003 19:18:15 +0100 (CET)
* PR# 6438 *
Subject: R crash
From: sstoddar@uiuc.edu
Expand Down Expand Up @@ -817,87 +812,51 @@ Date: Tue, 16 Dec 2003 08:13:17 +0100 (CET)
Subject: Bug
From: huan.huang@bnpparibas.com
Date: Fri, 6 Feb 2004 18:40:05 +0100 (CET)
* PR# 6561 *
Subject: Returned mail
Subject: Mail Delivery System
From: mailgate01@metso.com
From: r-bugs@r-project.org
Date: Mon, 09 Feb 2004 15:13:09 -0600
Date: Mon, 9 Feb 2004 16:08:45 -0500
* PR# 6562 *
Subject: FWD: Have Pills V|a|lium + v|@GRa ~ XAna/x/ ` %RND_MED_VIC+0DIN $ Pnt3rmin ( Som@ PI6nH
From: "emerson orton" <bj.orton@rr.com>
Date: Mon, 09 Feb 2004 09:36:04 -0400
* PR# 6563 *
Subject: Re:
From: "Jeremiah Pryor" <veakadwteqdta@europe.com>
Date: Tue, 10 Feb 2004 03:31:37 -0600
* PR# 6564 *
Subject: Business Proposition:Respond ASAP
From: Bola Adeosho <'bolaadeosho@gawab.com>
Date: Tue, 10 Feb 2004 13:00:26 +0000 (GMT)
* PR# 6565 *
Subject: V1agra has been replaced by the more effective Cia1is! zBX lU
From: "Laura" <Vanessa@excite.com>
Date: Wed, 11 Feb 2004 06:07:28 +0400
* PR# 6566 *
Subject: Returned mail: see transcript for details
Subject: Status
From: Mail Delivery Subsystem <MAILER-DAEMON@ual.es>
From: r-bugs@biostat.ku.dk
Date: Tue, 10 Feb 2004 18:05:09 +0100 (MET)
Date: Tue, 10 Feb 2004 18:06:41 +0100
* PR# 6567 *
Subject: Virus Alert
From: antivirus@ual.es
Date: Tue, 10 Feb 2004 18:05:17 +0100
* PR# 6568 *
Subject: Virus Alert
From: antivirus@ual.es
Date: Tue, 10 Feb 2004 18:39:28 +0100
* PR# 6569 *
Subject: Re:
From: "Joe Hagan" <jtlvujcybsfv@seductive.com>
Date: Tue, 10 Feb 2004 16:51:46 -0600
* PR# 6570 *
Subject: Spelling
From: Peter Dalgaard <p.dalgaard@biostat.ku.dk>
Date: 11 Feb 2004 01:13:32 +0100
* PR# 6571 *
Subject: sugper viagrga slayer bunts
From: "R.n.griffiths" <bobbyannotated@asiamail.com>
Date: Wed, 11 Feb 2004 06:44:15 +0000
* PR# 6572 *
Subject: Mail delivery failed: returning message to sender
Subject: Server Report
From: Mail Delivery System <Mailer-Daemon@lfallback1.lnd.ops.eu.uu.net>
From: r-bugs@biostat.ku.dk
Date: Wed, 11 Feb 2004 07:04:44 +0000
Date: Wed, 11 Feb 2004 01:32:20 -0500
* PR# 6573 *
Subject: Re: Hello
From: "Quanta IT" <void@void.com>
Date: Wed, 11 Feb 2004 10:02:15 +0100
* PR# 6574 *
Subject: Re: Hello
From: "Zancolo' Olga - Direzione Amministrativa (auto reply)" <olga.zancolo@unimib.it>
Date: Wed, 11 Feb 2004 12:37:09 +0100
* PR# 6575 *
Subject: V�RUS ENCONTRADO NA MENSAGEM DESTINADA A sofia@facic.fuom.br
Subject: Hi
From: admlab@facic.fuom.br
From: r-bugs@r-project.org
Date: Thu, 12 Feb 2004 04:54:48 -0300
Date: Fri, 2 Feb 2001 05:02:18 -0200
* PR# 6576 *
Subject: HEALTH CARE SECTOR: NEWS On Tubercin and FDA Testing--R-bugs 37608693
From: "Helen Hammond" <ktkqglbfw@personal.ro>
Date: Fri, 13 Feb 2004 00:20:35 -0500
* PR# 6577 *
Subject: Re: incommunicable boylston
From: "Edward Potter" <sxhaaxyb@winning.com>
Date: Fri, 13 Feb 2004 07:54:02 -0600
* PR# 6578 *
Subject: death hut ababa barth
From: "Donn Brandon" <pherfhkhrcjjb@att.net>
Date: Fri, 13 Feb 2004 10:04:01 -0500
* PR# 6588 *
Subject: limitation
From: Ming Lo <fnlo@ust.hk>
Date: Mon, 16 Feb 2004 20:24:54 +0800 (HKT)
* PR# 6591 *
Subject: R-bugs I found your addie ano
From: "Lee Law" <NEWVWD@wsdc3sx.com>
Date: Tue, 17 Feb 2004 15:56:21 -0400
* PR# 6592 *
Subject: Youre not gonna believe this man!
From: "Natalie ." <dygmhnsdvvdhk@apexmail.com>
Date: Mon, 16 Feb 2004 22:52:41 -0600
* PR# 6593 *
Subject: Macintosh
From: dspublic@earthlink.net
Date: Tue, 17 Feb 2004 06:10:00 +0100 (CET)
* PR# 6594 *
Subject: typo in help(names)?
From: weigand@mayo.edu
Date: Tue, 17 Feb 2004 16:24:08 +0100 (CET)
* PR# 6595 *
Subject: Your message to R-announce awaits moderator approval
From: r-announce-bounces@stat.math.ethz.ch
Date: Tue, 17 Feb 2004 16:12:30 +0100
* PR# 6596 *
Subject: "Out of memory" while building R with perl 5.8.2
From: vangyzen@stat.duke.edu
Date: Tue, 17 Feb 2004 20:32:01 +0100 (CET)
* PR# 6597 *
Subject: summary.rpart() in rpart package
From: "Chen, Feiming" <feiming_chen@spectramarketing.com>
Date: Tue, 17 Feb 2004 17:07:02 -0600
* PR# 6598 *
Subject: src/scripts/Makefile bug
From: Atro Tossavainen <atossava@cc.helsinki.fi>
Date: Wed, 18 Feb 2004 14:45:24 +0200 (EET)
* PR# 6599 *
Subject: warning
From: bw@bwdigitronik.ch
Date: Wed, 18 Feb 2004 16:53:58 +0100
* PR# 6600 *
Subject: R would not quit (bug?)
From: Michael Herron <Michael.C.Herron@Dartmouth.EDU>
Date: Wed, 18 Feb 2004 14:27:07 -0500
* PR# 6601 *
Subject: Process R segmentation with strsplit()
From: "wolski" <wolski@molgen.mpg.de>
Date: Thu, 19 Feb 2004 19:05:49 +0100
46 changes: 31 additions & 15 deletions FAQ
Expand Up @@ -4,7 +4,7 @@ END-INFO-DIR-ENTRY

R FAQ
Frequently Asked Questions on R
Version 1.8-40, 2004-02-13
Version 1.8-42, 2004-02-19
ISBN 3-900051-01-1
Kurt Hornik

Expand Down Expand Up @@ -1158,17 +1158,16 @@ to a web server. It is easily installed using Apache under Linux and in
principle should run on any platform that supports R and a web server
provided that the installer has the necessary security permissions.

*Rcgi* is a CGI WWW interface to R by Mark J. Ray
<mjr@stats.mth.uea.ac.uk>. It had the ability to use "embedded code": you
could mix user input and code, allowing the HTML author to do anything from
load in data sets to enter most of the commands for users without writing
CGI scripts. Graphical output was possible in PostScript or GIF formats
and the executed code was presented to the user for revision. However, it
is not clear if the project is still active and recent attempts to contact
the author or find the package have failed. Currently, a modified version
of *Rcgi* by Mai Zhou <mai@ms.uky.edu> (actually, two versions: one with
(bitmap) graphics and one without) as well as the original code are
available from `http://www.ms.uky.edu/~statweb'.
*Rcgi* is a CGI WWW interface to R by MJ Ray <mjr@dsl.pipex.com>. It
had the ability to use "embedded code": you could mix user input and code,
allowing the HTML author to do anything from load in data sets to enter
most of the commands for users without writing CGI scripts. Graphical
output was possible in PostScript or GIF formats and the executed code was
presented to the user for revision. However, it is not clear if the
project is still active. Currently, a modified version of *Rcgi* by Mai
Zhou <mai@ms.uky.edu> (actually, two versions: one with (bitmap) graphics
and one without) as well as the original code are available from
`http://www.ms.uky.edu/~statweb'.

5 R Add-On Packages
*******************
Expand Down Expand Up @@ -1258,6 +1257,9 @@ distributions of R.)
*BradleyTerry*
Specify and fit the Bradley-Terry model and structured versions.

*BsMD*
Bayes screening and model discrimination follow-up designs.

*CDNmoney*
Components of Canadian monetary aggregates.

Expand Down Expand Up @@ -1870,6 +1872,10 @@ distributions of R.)
*hdf5*
Interface to the NCSA HDF5 library.

*hett*
Functions for the fitting and summarizing of heteroscedastic
t-regression.

*hier.part*
Hierarchical Partitioning: variance partition of a multivariate data
set.
Expand Down Expand Up @@ -1906,6 +1912,10 @@ distributions of R.)
*its*
An S4 class for handling irregular time series.

*kernlab*
Kernel-based machine learning methods including support vector
machines. (Currently in `1.9.0/Other'.)

*knnTree*
Construct or predict with k-nearest-neighbor classifiers, using
cross-validation to select k, choose variables (by forward or
Expand Down Expand Up @@ -2019,9 +2029,6 @@ distributions of R.)
*mclust*
Model-based cluster analysis: the 2002 version of MCLUST.

*mclust1998*
Model-based cluster analysis: the 1998 version of MCLUST.

*mda*
Code for mixture discriminant analysis (MDA), flexible discriminant
analysis (FDA), penalized discriminant analysis (PDA), multivariate
Expand Down Expand Up @@ -2078,6 +2085,10 @@ distributions of R.)
Multidimensional descriptive statistics: factorial methods and
classification.

*multinomRob*
Overdispersed multinomial regression using robust (LQD and tanh)
estimation.

*multiv*
Functions for hierarchical clustering, partitioning, bond energy
algorithm, Sammon mapping, PCA and correspondence analysis.
Expand Down Expand Up @@ -2260,6 +2271,11 @@ distributions of R.)
*randomForest*
Breiman's random forest classifier.

*ref*
Functions for creating references, reading from and writing ro
references and a memory efficient refdata type that transparently
encapsulates matrices and data frames.

*relimp*
Functions to facilitate inference on the relative importance of
predictors in a linear or generalized linear model.
Expand Down
20 changes: 10 additions & 10 deletions Makefile.in
Expand Up @@ -83,9 +83,9 @@ install: installdirs
@for f in $(INSTFILES); do \
$(INSTALL_DATA) $(srcdir)/$${f} $(rhome); \
done
@WANT_R_FRAMEWORK_TRUE@ $(MAKE) install-R-framework
@WANT_R_FRAMEWORK_TRUE@ sed 's/^LIBR =.*/LIBR = -framework R/' \
@WANT_R_FRAMEWORK_TRUE@ $(top_builddir)/etc/Makeconf > $(rhome)/etc/Makeconf
@WANT_R_FRAMEWORK_TRUE@ $(MAKE) install-R-framework
@WANT_R_FRAMEWORK_TRUE@ @(sed 's/^LIBR =.*/LIBR = -framework R/' \
@WANT_R_FRAMEWORK_TRUE@ $(top_builddir)/etc/Makeconf > $(rhome)/etc/Makeconf)
installdirs:
@$(MKINSTALLDIRS) $(rhome)
install-strip:
Expand Down Expand Up @@ -168,14 +168,14 @@ install-R-framework:
@(cd $(top_builddir)/src/modules/aqua && \
cp Info.plist "$(R_FRAMEWORK_DIR)/Versions/$(VERSION)/Resources")
@(cd "$(R_FRAMEWORK_DIR)/Versions/$(VERSION)" && \
ln -f -s Resources/include Headers && \
ln -f -s Resources/bin/libR.dylib R)
ln -f -s -h Resources/include Headers && \
ln -f -s -h Resources/bin/libR.dylib R)
@(cd "$(R_FRAMEWORK_DIR)/Versions" && \
ln -f -s $(VERSION) Current)
ln -f -s -h $(VERSION) Current)
@(cd "$(R_FRAMEWORK_DIR)" && \
ln -f -s Versions/Current/Headers Headers&& \
ln -f -s Versions/Current/R R && \
ln -f -s Versions/Current/Resources Resources)
ln -f -s -h Versions/Current/Headers Headers&& \
ln -f -s -h Versions/Current/R R && \
ln -f -s -h Versions/Current/Resources Resources)
@(cd "$(srcdir)/src/modules/aqua/Contents/Resources" && \
cp -R * "$(R_FRAMEWORK_DIR)/Resources/bin")
@(cd "$(R_FRAMEWORK_DIR)/Resources/bin" && \
Expand All @@ -196,6 +196,6 @@ install-aqua:
@test -f "$(R_FRAMEWORK_DIR)/Resources/bin/RAqua" \
|| (echo "please, make install-R-framework first" && exit 1)
@(cd /Applications/R.app/Contents/MacOS && \
ln -f "$(R_FRAMEWORK_DIR)/Resources/bin/RAqua" R && \
ln -f -h "$(R_FRAMEWORK_DIR)/Resources/bin/RAqua" R && \
chmod 755 R)
TAGS:
13 changes: 13 additions & 0 deletions NEWS
Expand Up @@ -229,6 +229,9 @@ NEW FEATURES
plus many utility functions similar to those for date-times.
See ?Date.

o varimax() and promax() add class "loadings" to their loadings
component.


UTILITIES

Expand Down Expand Up @@ -268,6 +271,10 @@ C-LEVEL FACILITIES
o Salloc and Srealloc are provided in S.h as wrappers for S_alloc
and S_realloc, since current S versions use these forms.

o The type used for vector lengths is now R_len_t rather than
int, to allow this to de defined as long and so allow vectors
longer than 2^31 - 1 elements on 64-bit platforms.


DEPRECATED & DEFUNCT

Expand Down Expand Up @@ -306,6 +313,8 @@ INSTALLATION CHANGES

BUG FIXES

o minor copy-paste error in example(names) (PR#6594)

o contrasts() turns a logical variable into a factor. This now
always has levels c("FALSE", "TRUE") even if only one (or
none) of these occur in the variable.
Expand Down Expand Up @@ -408,6 +417,10 @@ BUG FIXES

o ftable() incorrectly handled arguments named "x". (PR#6541)

o vector(), matrix(), array() and their internal equivalents
report correctly that the number of elements specified was too
large (rather than reporting it as negative).




Expand Down
4 changes: 2 additions & 2 deletions acinclude.m4
Expand Up @@ -1619,7 +1619,7 @@ AC_EGREP_CPP([yes],
AC_DEFUN([_R_PATH_TCL_CONFIG],
[AC_MSG_CHECKING([for tclConfig.sh in library (sub)directories])
AC_CACHE_VAL([r_cv_path_TCL_CONFIG],
[for ldir in /opt/lib /sw/lib /usr/local/lib /usr/lib /lib; do
[for ldir in /opt/lib /sw/lib /usr/local/lib /usr/lib /lib /usr/lib64 ; do
for dir in \
${ldir} \
`ls -d ${ldir}/tcl[[8-9]].[[0-9]]* 2>/dev/null | sort -r`; do
Expand All @@ -1645,7 +1645,7 @@ fi
AC_DEFUN([_R_PATH_TK_CONFIG],
[AC_MSG_CHECKING([for tkConfig.sh in library (sub)directories])
AC_CACHE_VAL([r_cv_path_TK_CONFIG],
[for ldir in /opt/lib /sw/lib /usr/local/lib /usr/lib /lib; do
[for ldir in /opt/lib /sw/lib /usr/local/lib /usr/lib /lib /usr/lib64 ; do
for dir in \
${ldir} \
`ls -d ${ldir}/tk[[8-9]].[[0-9]]* 2>/dev/null | sort -r`; do
Expand Down
4 changes: 2 additions & 2 deletions aclocal.m4
Expand Up @@ -1289,7 +1289,7 @@ AC_EGREP_CPP([yes],
AC_DEFUN([_R_PATH_TCL_CONFIG],
[AC_MSG_CHECKING([for tclConfig.sh in library (sub)directories])
AC_CACHE_VAL([r_cv_path_TCL_CONFIG],
[for ldir in /opt/lib /sw/lib /usr/local/lib /usr/lib /lib; do
[for ldir in /opt/lib /sw/lib /usr/local/lib /usr/lib /lib /usr/lib64 ; do
for dir in \
${ldir} \
`ls -d ${ldir}/tcl[[8-9]].[[0-9]]* 2>/dev/null | sort -r`; do
Expand All @@ -1309,7 +1309,7 @@ fi
AC_DEFUN([_R_PATH_TK_CONFIG],
[AC_MSG_CHECKING([for tkConfig.sh in library (sub)directories])
AC_CACHE_VAL([r_cv_path_TK_CONFIG],
[for ldir in /opt/lib /sw/lib /usr/local/lib /usr/lib /lib; do
[for ldir in /opt/lib /sw/lib /usr/local/lib /usr/lib /lib /usr/lib64 ; do
for dir in \
${ldir} \
`ls -d ${ldir}/tk[[8-9]].[[0-9]]* 2>/dev/null | sort -r`; do
Expand Down

0 comments on commit 38a8f12

Please sign in to comment.