`Modern Applied Statistics with S-Plus' by W N Venables & B D Ripley ==================================================================== 24 August 1996 Patch 2.7 for VR2 distributed with the third printing Patch for diskette version of VR2. Apply as patch -N VR2 < Patch3 ==================================================================== 10,29c10,29 < # MASS/First2.lib.Q MASS/IQR.d MASS/IQR.q MASS/Ins MASS/Install < # MASS/Makef MASS/README MASS/Sonly MASS/abbey.d MASS/accdeaths.d < # MASS/aids2.dat MASS/animals.d MASS/animals.dat MASS/anova.negbin.d < # MASS/anova.negbin.q MASS/area.d MASS/area.q MASS/bcv.d < # MASS/birthwt.d MASS/birthwt.dat MASS/boxcox.d MASS/boxcox.q < # MASS/cats.d MASS/cats.dat MASS/cement.d MASS/cement.dat < # MASS/chem.d MASS/coop.d MASS/coop.dat MASS/corresp.d < # MASS/corresp.q MASS/cpgram.d MASS/cpgram.q MASS/cpus.d < # MASS/cpus.dat MASS/crabs.d MASS/crabs.dat MASS/data.q < # MASS/deaths.d MASS/deriv3.q MASS/dose.p.q MASS/enlist.q < # MASS/eqscplot.d MASS/eqscplot.q MASS/faithful.d MASS/faithful.dat < # MASS/fdeaths.d MASS/forbes.d MASS/forbes.dat MASS/galaxies.d < # MASS/galaxies.dat MASS/gehan.d MASS/gehan.dat MASS/glm.convert.d < # MASS/glm.nb.d MASS/hills.d MASS/hills.dat MASS/hist.scott.q < # MASS/horner.c MASS/houses.dat MASS/huber.d MASS/huber.q < # MASS/hubers.d MASS/hubers.q MASS/immer.d MASS/immer.dat < # MASS/jasa1.dat MASS/lda.d MASS/lda.q MASS/leuk.d MASS/leuk.dat < # MASS/lh.d MASS/mad.D MASS/mad.Q MASS/make.call.q MASS/mammals.d < # MASS/mammals.dat MASS/mcycle.d MASS/mcycle.dat MASS/mdeaths.d < # MASS/melanoma.d MASS/melanoma.dat MASS/michels.dat --- > # MASS/First2.lib.Q MASS/Firsts.lib.Q MASS/IQR.d MASS/IQR.q MASS/Ins > # MASS/Install MASS/Makef MASS/README MASS/Shared MASS/Sonly > # MASS/abbey.d MASS/accdeaths.d MASS/aids2.dat MASS/animals.d > # MASS/animals.dat MASS/anova.negbin.d MASS/anova.negbin.q > # MASS/area.d MASS/area.q MASS/bcv.d MASS/birthwt.d MASS/birthwt.dat > # MASS/boxcox.d MASS/boxcox.q MASS/cats.d MASS/cats.dat > # MASS/cement.d MASS/cement.dat MASS/chem.d MASS/coop.d > # MASS/coop.dat MASS/corresp.d MASS/corresp.q MASS/cpgram.d > # MASS/cpgram.q MASS/cpus.d MASS/cpus.dat MASS/crabs.d > # MASS/crabs.dat MASS/data.q MASS/deaths.d MASS/deriv3.q > # MASS/dose.p.q MASS/enlist.q MASS/eqscplot.d MASS/eqscplot.q > # MASS/faithful.d MASS/faithful.dat MASS/fdeaths.d MASS/forbes.d > # MASS/forbes.dat MASS/galaxies.d MASS/galaxies.dat MASS/gehan.d > # MASS/gehan.dat MASS/glm.convert.d MASS/glm.nb.d MASS/hills.d > # MASS/hills.dat MASS/hist.scott.q MASS/horner.c MASS/houses.dat > # MASS/huber.d MASS/huber.q MASS/hubers.d MASS/hubers.q MASS/immer.d > # MASS/immer.dat MASS/jasa1.dat MASS/lda.d MASS/lda.q MASS/leuk.d > # MASS/leuk.dat MASS/lh.d MASS/mad.D MASS/mad.Q MASS/make.call.q > # MASS/mammals.d MASS/mammals.dat MASS/mcycle.d MASS/mcycle.dat > # MASS/mdeaths.d MASS/melanoma.d MASS/melanoma.dat MASS/michels.dat 51,54c51,55 < # nnet/First2.lib.Q nnet/Ins nnet/Install nnet/Makef nnet/README < # nnet/class.ind.d nnet/nnet.Hess.d nnet/nnet.c nnet/nnet.d < # nnet/nnet.q nnet/predict.nnet.d nnet/which.is.max.d < # spatial/First.lib.q spatial/First2.lib.Q spatial/Ins --- > # nnet/First2.lib.Q nnet/Firsts.lib.Q nnet/Ins nnet/Install > # nnet/Makef nnet/README nnet/Shared nnet/class.ind.d > # nnet/nnet.Hess.d nnet/nnet.c nnet/nnet.d nnet/nnet.q > # nnet/predict.nnet.d nnet/which.is.max.d spatial/First.lib.q > # spatial/First2.lib.Q spatial/Firsts.lib.Q spatial/Ins 57,71c58,72 < # spatial/SSI.d spatial/Sonly spatial/Strauss.d spatial/agter.dat < # spatial/caveolae.dat spatial/cells.dat spatial/correlogram.d < # spatial/data_kr.q spatial/davis.dat spatial/drumlin.dat < # spatial/eagles.dat spatial/expcov.d spatial/fig1b.dat < # spatial/fig1c.dat spatial/fig2a.dat spatial/fig2b.dat < # spatial/fig3a.dat spatial/fig3b.dat spatial/fig3c.dat < # spatial/grocery.dat spatial/hccells.dat spatial/krc.c < # spatial/krfast.q spatial/krslow.q spatial/npr.dat spatial/npr1.d < # spatial/nztrees.dat spatial/pairfn.dat spatial/pereg.dat < # spatial/pines.dat spatial/ppinit.d spatial/ppinit.q < # spatial/pplik.d spatial/ppregion.d spatial/pps.c spatial/prmat.d < # spatial/redwood.dat spatial/schools.dat spatial/semat.d < # spatial/shkap.dat spatial/stowns1.dat spatial/surf.gls.d < # spatial/surf.ls.d spatial/tokyo.dat spatial/topo.d < # spatial/topo.dat spatial/towns.dat spatial/trmat.d --- > # spatial/SSI.d spatial/Shared spatial/Sonly spatial/Strauss.d > # spatial/agter.dat spatial/caveolae.dat spatial/cells.dat > # spatial/correlogram.d spatial/data_kr.q spatial/davis.dat > # spatial/drumlin.dat spatial/eagles.dat spatial/expcov.d > # spatial/fig1b.dat spatial/fig1c.dat spatial/fig2a.dat > # spatial/fig2b.dat spatial/fig3a.dat spatial/fig3b.dat > # spatial/fig3c.dat spatial/grocery.dat spatial/hccells.dat > # spatial/krc.c spatial/krfast.q spatial/krslow.q spatial/npr.dat > # spatial/npr1.d spatial/nztrees.dat spatial/pairfn.dat > # spatial/pereg.dat spatial/pines.dat spatial/ppinit.d > # spatial/ppinit.q spatial/pplik.d spatial/ppregion.d spatial/pps.c > # spatial/prmat.d spatial/redwood.dat spatial/schools.dat > # spatial/semat.d spatial/shkap.dat spatial/stowns1.dat > # spatial/surf.gls.d spatial/surf.ls.d spatial/tokyo.dat > # spatial/topo.d spatial/topo.dat spatial/towns.dat spatial/trmat.d 74c75 < # Wrapped by ripley@puffin.stats on Mon Oct 9 16:05:52 1995 --- > # Wrapped by ripley@auk.stats on Sat Aug 31 09:13:31 1996 98c99 < echo shar: Extracting \"'Install'\" \(2957 characters\) --- > echo shar: Extracting \"'Install'\" \(3257 characters\) 103c104 < XIt should suffice to type --- > XIt will normally suffice to type 120a122,129 > XIf you have S-Plus 3.3 on a DEC Alpha or SGI Iris machine, > Xreplace ./INS by > X > X ./INS dyn.load.shared > X > XIgnore the messages about `unresolved external references' during > Xinstallation. This version is _only_ intended to be used as libraries. > X 126,127c135,137 < X(This fixes up the .First.lib in each library -- otherwise you will < Xneed to edit all occurrences of dyn.load in the *.q files.) --- > X(This fixes up the .First.lib in each library -- to use other than > Xas libraries you will need to edit all occurrences of dyn.load > Xin the *.q files.) 128a139 > X 171c182 < XThe only problems known to us are using SunOS5 and the SunPro C3.0 --- > XThe only problems known to us are using S-Plus 3.2, SunOS5 and the SunPro C3.0 175,176c186,187 < Xsystems under the standard install procedure. SG Irix 5.x users please < Xread the file Irix.Users. --- > Xsystems under the standard install procedure. SG Irix 5.x users > Xusing S-Plus 3.1 please read the file Irix.Users. 182c193 < XCompiled objects for most platforms may be obtained by anonymous ftp --- > XCompiled objects for some platforms may be obtained by anonymous ftp 192c203 < if test 2957 -ne `wc -c <'Install'`; then --- > if test 3257 -ne `wc -c <'Install'`; then 200c211 < echo shar: Extracting \"'Makefile'\" \(934 characters\) --- > echo shar: Extracting \"'Makefile'\" \(1096 characters\) 228a240,245 > Xdyn.load.shared: > X -@for name in $(DIRS); \ > X do \ > X (cd $${name}; echo ----- $$name; ./Shared) \ > X done > X 234c251 < X @${RM} -f */*.q */*.d */DATA */*.c MASS/*.dat */*.Q */Makef */Ins */Sonly */Install */.Data/.Audit --- > X @${RM} -f */*.q */*.d */DATA */*.c MASS/*.dat */*.Q */*.D */Makef */Ins */Shared */Sonly */Install */.Data/.Audit */.Data/.Last.value 248c265 < if test 934 -ne `wc -c <'Makefile'`; then --- > if test 1096 -ne `wc -c <'Makefile'`; then 485a503,517 > if test -f 'MASS/Firsts.lib.Q' -a "${1}" != "-c" ; then > echo shar: Will not clobber existing file \"'MASS/Firsts.lib.Q'\" > else > echo shar: Extracting \"'MASS/Firsts.lib.Q'\" \(112 characters\) > sed "s/^X//" >'MASS/Firsts.lib.Q' <<'END_OF_FILE' > X.First.lib <- function(lib.loc, section) > X{ > X dyn.load.shared(paste(lib.loc, section, 'MASS.so', sep='/')) > X} > END_OF_FILE > if test 112 -ne `wc -c <'MASS/Firsts.lib.Q'`; then > echo shar: \"'MASS/Firsts.lib.Q'\" unpacked with wrong size! > fi > # end of 'MASS/Firsts.lib.Q' > fi 540c572 < echo shar: Extracting \"'MASS/Ins'\" \(267 characters\) --- > echo shar: Extracting \"'MASS/Ins'\" \(292 characters\) 555c587,588 < Xecho "help.findsum('.Data')" | $S --- > X$S help.findsum .Data > Xrm -f .Data/.Audit .Data/.Last.value 557c590 < if test 267 -ne `wc -c <'MASS/Ins'`; then --- > if test 292 -ne `wc -c <'MASS/Ins'`; then 566c599 < echo shar: Extracting \"'MASS/Install'\" \(833 characters\) --- > echo shar: Extracting \"'MASS/Install'\" \(949 characters\) 581,583c614 < XThe software relies dynamic loading. The load module is either < Xloaded when .First.lib is called or from the current directory < Xis not set up as a library. Users of dyn.load2 should execute --- > XThe software relies on dynamic loading. Users of dyn.load2 should execute 585c616 < XSplus < First2.lib.Q --- > X Splus < First2.lib.Q 599a631,638 > X > XUsers of dyn.load.shared (DEC Alpha and SGI with S-Plus3.3 should used > X./Shared rather than the makefile Makef. Either use this as a library > Xor invoke > X > X dyn.load.shared("./MASS.so") > X > Xbefore using ucv, bcv, sammon or prune.tree. 601c640 < if test 833 -ne `wc -c <'MASS/Install'`; then --- > if test 949 -ne `wc -c <'MASS/Install'`; then 609c648 < echo shar: Extracting \"'MASS/Makef'\" \(2211 characters\) --- > echo shar: Extracting \"'MASS/Makef'\" \(2199 characters\) 682c721 < X echo "help.findsum('.Data')" | $S --- > X $S help.findsum .Data 687c726 < if test 2211 -ne `wc -c <'MASS/Makef'`; then --- > if test 2199 -ne `wc -c <'MASS/Makef'`; then 820a860,886 > if test -f 'MASS/Shared' -a "${1}" != "-c" ; then > echo shar: Will not clobber existing file \"'MASS/Shared'\" > else > echo shar: Extracting \"'MASS/Shared'\" \(314 characters\) > sed "s/^X//" >'MASS/Shared' <<'END_OF_FILE' > X#! /bin/sh > XS=${S-Splus} > Xmkdir .Data .Data/.Help > Xecho --reading in S files > Xcat *.q Firsts.lib.Q | $S > Xtouch DATA > Xecho --compiling > X$S SHLIB -o MASS.so sammon.c ucv.c treefix.c > Xecho --Installing help > Xfor f in *.d > Xdo > X cp $f .Data/.Help/`basename $f .d` > Xdone > X$S help.findsum .Data > Xrm -f .Data/.Audit .Data/.Last.value > END_OF_FILE > if test 314 -ne `wc -c <'MASS/Shared'`; then > echo shar: \"'MASS/Shared'\" unpacked with wrong size! > fi > chmod +x 'MASS/Shared' > # end of 'MASS/Shared' > fi 824c890 < echo shar: Extracting \"'MASS/Sonly'\" \(518 characters\) --- > echo shar: Extracting \"'MASS/Sonly'\" \(543 characters\) 842c908,909 < Xecho "help.findsum('.Data')" | $S --- > X$S help.findsum .Data > Xrm -f .Data/.Audit .Data/.Last.value 844c911 < if test 518 -ne `wc -c <'MASS/Sonly'`; then --- > if test 543 -ne `wc -c <'MASS/Sonly'`; then 5692c5759 < echo shar: Extracting \"'MASS/crabs.d'\" \(810 characters\) --- > echo shar: Extracting \"'MASS/crabs.d'\" \(809 characters\) 5704c5771 < Xcollected at Freemantle, W. Australia. --- > Xcollected at Fremantle, W. Australia. 5734c5801 < if test 810 -ne `wc -c <'MASS/crabs.d'`; then --- > if test 809 -ne `wc -c <'MASS/crabs.d'`; then 5954c6021 < echo shar: Extracting \"'MASS/data.q'\" \(3900 characters\) --- > echo shar: Extracting \"'MASS/data.q'\" \(3890 characters\) 6036c6103 < Xjasa1 <- read.table("jasa1.dat", header=T) --- > Xjasa1 <- read.table("jasa1.dat") 6038c6105 < if test 3900 -ne `wc -c <'MASS/data.q'`; then --- > if test 3890 -ne `wc -c <'MASS/data.q'`; then 7857c7924 < echo shar: Extracting \"'MASS/lda.q'\" \(2757 characters\) --- > echo shar: Extracting \"'MASS/lda.q'\" \(2706 characters\) 7885d7951 < X X <- scale(group.means[g, ], T, F) %*% scaling 7928c7994 < if test 2757 -ne `wc -c <'MASS/lda.q'`; then --- > if test 2706 -ne `wc -c <'MASS/lda.q'`; then 9647c9713 < echo shar: Extracting \"'MASS/p.tree.q'\" \(652 characters\) --- > echo shar: Extracting \"'MASS/p.tree.q'\" \(832 characters\) 9649c9715,9725 < Xp.tree <- function(tree, ...) prune.tree(tree, ..., method="misclass") --- > Xp.tree <- # function(tree, ...) prune.tree(tree, ..., method="misclass") > Xfunction(tree, ...) > X{ > X # > X # changed to give correct call from prune.tree > X # > X oc <- match.call() > X oc$method <- "misclass" > X oc[[1]] <- prune.tree > X eval(oc, local = sys.parent()) > X} 9670c9746 < if test 652 -ne `wc -c <'MASS/p.tree.q'`; then --- > if test 832 -ne `wc -c <'MASS/p.tree.q'`; then 9944c10020 < echo shar: Extracting \"'MASS/plot.survfit.q'\" \(4494 characters\) --- > echo shar: Extracting \"'MASS/plot.survfit.q'\" \(4506 characters\) 9988c10064 < X yy <- ssurv[ssurv > 0] --- > X yy <- ssurv[ssurv > 0 & ssurv < 1] 10083c10159 < if test 4494 -ne `wc -c <'MASS/plot.survfit.q'`; then --- > if test 4506 -ne `wc -c <'MASS/plot.survfit.q'`; then 10770c10846 < echo shar: Extracting \"'MASS/qda.q'\" \(2196 characters\) --- > echo shar: Extracting \"'MASS/qda.q'\" \(2200 characters\) 10797c10873 < X ldet[i] <- sum(log(abs(diag(qx)))) --- > X ldet[i] <- 2 * sum(log(abs(diag(qx)))) 10832c10908 < if test 2196 -ne `wc -c <'MASS/qda.q'`; then --- > if test 2200 -ne `wc -c <'MASS/qda.q'`; then 11102c11178 < echo shar: Extracting \"'MASS/rlm.q'\" \(4620 characters\) --- > echo shar: Extracting \"'MASS/rlm.q'\" \(4646 characters\) 11235c11311,11312 < X for(i in 2:p)for(j in 1:(i-1))R[i,j] <- 0 --- > X # for(i in 2:p)for(j in 1:(i-1))R[i,j] <- 0 > X R[lower.tri(R)] <- 0 11259c11336 < if test 4620 -ne `wc -c <'MASS/rlm.q'`; then --- > if test 4646 -ne `wc -c <'MASS/rlm.q'`; then 11552c11629 < XData from BP Research, image analysis by Ronit Seal, U. Oxford. --- > XData from BP Research, image analysis by Ronit Katz, U. Oxford. 11782c11859 < echo shar: Extracting \"'MASS/sammon.c'\" \(2743 characters\) --- > echo shar: Extracting \"'MASS/sammon.c'\" \(2893 characters\) 11788,11789c11865 < X/* #define MAGIC 0.2 < X#define TOL 1e-4 */ --- > X#define min9(a,b) a X 11806a11884 > X magic = magic; 11832a11911 > XCORRECT: 11876a11956,11957 > X magic = magic * 0.2; > X if (magic > 1.0e-3) goto CORRECT; 11882a11964,11965 > X magic *= 1.5; > X if (magic > 0.5) magic = 0.5; 11897c11980 < X printf("stress after %3d iters: %7.5f\n", i, e); --- > X printf("stress after %3d iters: %7.5f, magic = %5.3f\n", i, e, magic); 11908c11991 < if test 2743 -ne `wc -c <'MASS/sammon.c'`; then --- > if test 2893 -ne `wc -c <'MASS/sammon.c'`; then 11916c11999 < echo shar: Extracting \"'MASS/sammon.d'\" \(1929 characters\) --- > echo shar: Extracting \"'MASS/sammon.d'\" \(2028 characters\) 11942,11943c12025 < Xstep size constant in diagonal Newton method. Sammon used 0.2, but this < Xmay need to be reduced. --- > Xinitial value of the step size constant in diagonal Newton method. 11965a12048,12049 > XIn this release the algorithm has been modified by adding a step-length > Xsearch ('magic') to ensure that it always goes downhill. 11977c12061 < Xtext(swiss.sam$points, as.character(1:nrows(swiss.x))) --- > Xtext(swiss.sam$points, as.character(1:nrow(swiss.x))) 11981c12065 < if test 1929 -ne `wc -c <'MASS/sammon.d'`; then --- > if test 2028 -ne `wc -c <'MASS/sammon.d'`; then 14212a14297,14311 > if test -f 'nnet/Firsts.lib.Q' -a "${1}" != "-c" ; then > echo shar: Will not clobber existing file \"'nnet/Firsts.lib.Q'\" > else > echo shar: Extracting \"'nnet/Firsts.lib.Q'\" \(120 characters\) > sed "s/^X//" >'nnet/Firsts.lib.Q' <<'END_OF_FILE' > X.First.lib <- function(lib.loc, section) { > X path <- paste(lib.loc, section,"nnet.so", sep="/") > X dyn.load.shared(path) > X} > END_OF_FILE > if test 120 -ne `wc -c <'nnet/Firsts.lib.Q'`; then > echo shar: \"'nnet/Firsts.lib.Q'\" unpacked with wrong size! > fi > # end of 'nnet/Firsts.lib.Q' > fi 14216c14315 < echo shar: Extracting \"'nnet/Ins'\" \(307 characters\) --- > echo shar: Extracting \"'nnet/Ins'\" \(332 characters\) 14231c14330,14331 < Xecho "help.findsum('.Data')" | $S --- > X$S help.findsum .Data > Xrm -f .Data/.Audit .Data/.Last.value 14233c14333 < if test 307 -ne `wc -c <'nnet/Ins'`; then --- > if test 332 -ne `wc -c <'nnet/Ins'`; then 14242c14342 < echo shar: Extracting \"'nnet/Install'\" \(538 characters\) --- > echo shar: Extracting \"'nnet/Install'\" \(742 characters\) 14261c14361,14369 < XFinally, make -f Makef tidy removes unnecessary files/ --- > XFinally, make -f Makef tidy removes unnecessary files. > X > XUsers of dyn.load.shared (DEC Alpha and SGI with S-Plus3.3 should used > X./Shared rather than the makefile Makef, and either install this as > Xa library or invoke > X > X dyn.load.shared("./nnet.so") > X > Xbefore use. 14263c14371 < if test 538 -ne `wc -c <'nnet/Install'`; then --- > if test 742 -ne `wc -c <'nnet/Install'`; then 14271c14379 < echo shar: Extracting \"'nnet/Makef'\" \(607 characters\) --- > echo shar: Extracting \"'nnet/Makef'\" \(595 characters\) 14304c14412 < X echo "help.findsum('.Data')" | $S --- > X $S help.findsum .Data 14309c14417 < if test 607 -ne `wc -c <'nnet/Makef'`; then --- > if test 595 -ne `wc -c <'nnet/Makef'`; then 14335a14444,14469 > if test -f 'nnet/Shared' -a "${1}" != "-c" ; then > echo shar: Will not clobber existing file \"'nnet/Shared'\" > else > echo shar: Extracting \"'nnet/Shared'\" \(288 characters\) > sed "s/^X//" >'nnet/Shared' <<'END_OF_FILE' > X#! /bin/sh > XS=${S-Splus} > Xmkdir .Data .Data/.Help > Xecho --reading in S files > Xcat nnet.q Firsts.lib.Q | $S > Xecho --compiling > X$S SHLIB -o nnet.so nnet.c > Xecho --Installing help > Xfor f in *.d > Xdo > X cp $f .Data/.Help/`basename $f .d` > Xdone > X$S help.findsum .Data > Xrm -f .Data/.Audit .Data/.Last.value > END_OF_FILE > if test 288 -ne `wc -c <'nnet/Shared'`; then > echo shar: \"'nnet/Shared'\" unpacked with wrong size! > fi > chmod +x 'nnet/Shared' > # end of 'nnet/Shared' > fi 15502a15637,15652 > if test -f 'spatial/Firsts.lib.Q' -a "${1}" != "-c" ; then > echo shar: Will not clobber existing file \"'spatial/Firsts.lib.Q'\" > else > echo shar: Extracting \"'spatial/Firsts.lib.Q'\" \(203 characters\) > sed "s/^X//" >'spatial/Firsts.lib.Q' <<'END_OF_FILE' > X.First.lib <- function(lib.loc, section) { > X path <- paste(lib.loc, section,"spatial.so", sep="/") > X dyn.load.shared(path) > X assign("sp.lib.name", paste(lib.loc, section, sep="/"), frame=0) > X} > END_OF_FILE > if test 203 -ne `wc -c <'spatial/Firsts.lib.Q'`; then > echo shar: \"'spatial/Firsts.lib.Q'\" unpacked with wrong size! > fi > # end of 'spatial/Firsts.lib.Q' > fi 15506c15656 < echo shar: Extracting \"'spatial/Ins'\" \(310 characters\) --- > echo shar: Extracting \"'spatial/Ins'\" \(332 characters\) 15513c15663 < Xecho --compiling $f --- > Xecho --compiling 15522c15672,15673 < Xecho "help.findsum('.Data')" | $S --- > X$S help.findsum .Data > Xrm -f .Data/.Audit .Data/.Last.value 15524c15675 < if test 310 -ne `wc -c <'spatial/Ins'`; then --- > if test 332 -ne `wc -c <'spatial/Ins'`; then 15533c15684 < echo shar: Extracting \"'spatial/Install'\" \(706 characters\) --- > echo shar: Extracting \"'spatial/Install'\" \(820 characters\) 15557a15709,15712 > X > XUsers of dyn.load.shared (DEC Alpha and SGI with S-Plus3.3 should used > X./Shared rather than the makefile Makef. > X 15559c15714 < if test 706 -ne `wc -c <'spatial/Install'`; then --- > if test 820 -ne `wc -c <'spatial/Install'`; then 15705c15860 < echo shar: Extracting \"'spatial/Makef'\" \(1188 characters\) --- > echo shar: Extracting \"'spatial/Makef'\" \(1176 characters\) 15724c15879 < X echo "help.findsum('.Data')" | $S --- > X $S help.findsum .Data 15766c15921 < if test 1188 -ne `wc -c <'spatial/Makef'`; then --- > if test 1176 -ne `wc -c <'spatial/Makef'`; then 15938a16094,16121 > if test -f 'spatial/Shared' -a "${1}" != "-c" ; then > echo shar: Will not clobber existing file \"'spatial/Shared'\" > else > echo shar: Extracting \"'spatial/Shared'\" \(357 characters\) > sed "s/^X//" >'spatial/Shared' <<'END_OF_FILE' > X#! /bin/sh > XS=${S-Splus} > Xmkdir .Data .Data/.Help > Xecho --reading in S files > Xcat *.q Firsts.lib.Q | $S > Xecho --compiling > X$S SHLIB -o spatial.so krc.c pps.c > Xecho --Installing help > Xfor f in *.d > Xdo > X cp $f .Data/.Help/`basename $f .d` > Xdone > Xcp expcov.d .Data/.Help/gaucov > Xcp expcov.d .Data/.Help/sphercov > X$S help.findsum .Data > Xrm -f .Data/.Audit .Data/.Last.value > END_OF_FILE > if test 357 -ne `wc -c <'spatial/Shared'`; then > echo shar: \"'spatial/Shared'\" unpacked with wrong size! > fi > chmod +x 'spatial/Shared' > # end of 'spatial/Shared' > fi 15942c16125 < echo shar: Extracting \"'spatial/Sonly'\" \(341 characters\) --- > echo shar: Extracting \"'spatial/Sonly'\" \(366 characters\) 15956c16139,16140 < Xecho "help.findsum('.Data')" | $S --- > X$S help.findsum .Data > Xrm -f .Data/.Audit .Data/.Last.value 15958c16142 < if test 341 -ne `wc -c <'spatial/Sonly'`; then --- > if test 366 -ne `wc -c <'spatial/Sonly'`; then 18585c18769 < echo shar: Extracting \"'spatial/krc.c'\" \(15572 characters\) --- > echo shar: Extracting \"'spatial/krc.c'\" \(15651 characters\) 18602c18786 < Xstatic double alph1[10001]; --- > Xstatic double alph1[10002]; 18770c18954 < X cov(n * (n + 1) / 2, w); --- > X cov(n * (n + 1) / 2, w, 0); 19064c19248 < X cov(*n, d); --- > X cov(*n, d, 1); 19099c19283 < X cov(*n, w1); --- > X cov(*n, w1, 1); 19123,19124c19307,19308 < Xstatic void cov(n, d) < Xinteger n; --- > Xstatic void cov(n, d, pred) > Xinteger n, pred; 19135c19319 < X id = (integer) (dd / mm + (double).5); --- > X id = (integer) (dd / mm); 19136a19321 > X if(pred && id == 0) p = 1; /* Preserve nugget effect on prediction */ 19273c19458 < if test 15572 -ne `wc -c <'spatial/krc.c'`; then --- > if test 15651 -ne `wc -c <'spatial/krc.c'`; then 19580c19765 < echo shar: Extracting \"'spatial/krslow.q'\" \(7256 characters\) --- > echo shar: Extracting \"'spatial/krslow.q'\" \(7419 characters\) 19782c19967 < X se^2*(alpha*(r < d/1000) + (1-alpha)*exp(-r/d)) --- > X se^2*(alpha*(r < d/10000) + (1-alpha)*exp(-r/d)) 19787c19972 < X se^2*(alpha*(r < d/1000) + (1-alpha)*exp(-(r/d)^2)) --- > X se^2*(alpha*(r < d/10000) + (1-alpha)*exp(-(r/d)^2)) 19798c19983 < X se^2*(alpha*(r < 1/1000) + (1-alpha)*t) --- > X se^2*(alpha*(r < 1/10000) + (1-alpha)*t) 19813c19998,20002 < X for(j in 2:length(x)-1) zx <- c(zx, (z[(j+1):n]-zm)*(z[j] - zm)) --- > X# for(j in 2:length(x)-1) zx <- c(zx, (z[(j+1):n]-zm)*(z[j] - zm)) > X# speed-up due to Oscar Bj\ornstad, Oslo. > X zscale <- z - zm > X zx <- outer(zscale, zscale) > X zx <- zx[lower.tri(zx)] 19846c20035,20037 < X for(j in 2:length(x)-1) zx <- c(zx, (z[(j+1):n]-z[j])^2) --- > X# for(j in 2:length(x)-1) zx <- c(zx, (z[(j+1):n]-z[j])^2) > X zx <- dist(z) > X zx <- zx[lower.tri(zx)] 19866c20057 < if test 7256 -ne `wc -c <'spatial/krslow.q'`; then --- > if test 7419 -ne `wc -c <'spatial/krslow.q'`; then 20342c20533 < echo shar: Extracting \"'spatial/ppinit.q'\" \(3038 characters\) --- > echo shar: Extracting \"'spatial/ppinit.q'\" \(3041 characters\) 20371c20562 < X z <- .C("pp2", --- > X z <- .C("sp_pp2", 20492c20683 < if test 3038 -ne `wc -c <'spatial/ppinit.q'`; then --- > if test 3041 -ne `wc -c <'spatial/ppinit.q'`; then 20568c20759 < echo shar: Extracting \"'spatial/pps.c'\" \(4638 characters\) --- > echo shar: Extracting \"'spatial/pps.c'\" \(4646 characters\) 20640c20831 < Xvoid pp2(x, y, npt, k, h, dmin, lm, fs) --- > Xvoid sp_pp2(x, y, npt, k, h, dmin, lm, fs) 20645,20646c20836,20837 < X float ax, ay, xi, yi, x1, y1, fss = *fs, fs1, sarea, < X g, s1, a, rr, dm, alm; --- > X float ax, ay, xi, yi, sarea, g, dm, alm; > X double a, x1, y1, rr, fss = *fs, fs1, s1; 20655c20846 < X k1 = floor(s1 * fs1); --- > X k1 = floor(s1 * fs1 + 1e-3); 20805c20996 < if test 4638 -ne `wc -c <'spatial/pps.c'`; then --- > if test 4646 -ne `wc -c <'spatial/pps.c'`; then 21867c22058 < echo shar: Extracting \"'test/master.res'\" \(7746 characters\) --- > echo shar: Extracting \"'test/master.res'\" \(7826 characters\) 21869c22060 < XS-PLUS : Copyright (c) 1988, 1993 Statistical Sciences, Inc. --- > XS-PLUS : Copyright (c) 1988, 1995 MathSoft, Inc. 21871c22062 < XVersion 3.2 Release 1 for Sun SPARC, SunOS 4.x : 1993 --- > XVersion 3.3 Release 1 for Sun SPARC, SunOS 5.3 : 1995 21886,21888c22077,22080 < Xstress after 10 iters: 0.00489 < Xstress after 20 iters: 0.00407 < Xstress after 30 iters: 0.00399 --- > Xstress after 10 iters: 0.00630, magic = 0.046 > Xstress after 20 iters: 0.00549, magic = 0.105 > Xstress after 30 iters: 0.00400, magic = 0.500 > Xstress after 40 iters: 0.00396, magic = 0.500 21973,21975c22165,22167 < X[4,] 887.41 867.50 848.47 830.30 813.01 796.60 781.05 766.37 < X[5,] 879.13 859.33 840.41 822.37 805.19 788.89 773.45 758.89 < X[6,] 879.67 859.99 841.18 823.25 806.19 789.99 774.68 760.23 --- > X[4,] 887.41 867.50 848.47 830.31 813.01 796.60 781.05 766.37 > X[5,] 879.13 859.33 840.42 822.37 805.19 788.89 773.45 758.89 > X[6,] 879.67 859.99 841.18 823.25 806.19 790.00 774.68 760.23 22006,22008c22198,22200 < X[6,] 906.75 954.74 879.41 854.72 821.46 785.18 756.03 736.32 < X[7,] 899.63 894.49 859.75 836.47 813.14 793.05 785.45 779.41 < X[8,] 880.18 884.44 861.65 845.05 822.73 811.55 817.34 809.61 --- > X[6,] 906.75 954.74 879.41 854.73 821.46 785.18 756.03 736.32 > X[7,] 899.63 894.49 859.75 836.46 813.14 793.05 785.45 779.41 > X[8,] 880.18 884.44 861.65 845.05 822.72 811.55 817.34 809.61 22012c22204 < X[2,] 814.18 --- > X[2,] 814.19 22032,22040c22224,22232 < X[1,] 31.115 26.2571 26.351 22.164 27.225 22.073 26.507 26.010 < X[2,] 24.977 22.4359 18.430 22.661 13.780 16.425 24.450 24.182 < X[3,] 19.460 19.1837 17.636 21.995 22.468 19.564 20.570 21.799 < X[4,] 21.214 19.9386 21.332 23.340 23.303 18.246 15.547 21.658 < X[5,] 16.460 20.6058 23.688 24.410 23.716 21.726 18.954 15.748 < X[6,] 27.048 9.0284 22.383 20.145 20.644 22.314 19.691 22.968 < X[7,] 26.710 23.8840 21.582 23.999 18.845 15.622 21.592 14.566 < X[8,] 20.799 16.6504 17.550 22.645 18.504 23.614 21.232 22.419 < X[9,] 27.777 23.0757 24.629 21.502 20.132 21.040 23.025 27.113 --- > X[1,] 31.116 26.2570 26.351 22.164 27.225 22.072 26.506 26.010 > X[2,] 24.976 22.4350 18.431 22.661 13.776 16.426 24.451 24.182 > X[3,] 19.459 19.1822 17.636 21.995 22.467 19.563 20.570 21.799 > X[4,] 21.214 19.9387 21.332 23.340 23.303 18.246 15.547 21.657 > X[5,] 16.460 20.6052 23.688 24.410 23.716 21.725 18.952 15.744 > X[6,] 27.048 9.0284 22.383 20.144 20.642 22.314 19.691 22.968 > X[7,] 26.709 23.8842 21.581 23.999 18.846 15.619 21.592 14.564 > X[8,] 20.799 16.6496 17.550 22.645 18.504 23.614 21.232 22.420 > X[9,] 27.777 23.0758 24.629 21.501 20.132 21.039 23.025 27.113 22043,22044c22235,22236 < X[2,] 25.615 < X[3,] 23.162 --- > X[2,] 25.614 > X[3,] 23.161 22050c22242 < X[9,] 33.716 --- > X[9,] 33.717 22067c22259 < X [71] 3.57084 3.60068 3.66837 3.72217 3.79302 3.83253 3.89752 --- > X [71] 3.57084 3.60068 3.66837 3.72563 3.79302 3.83253 3.89752 22069,22070c22261,22262 < X [85] 4.31612 4.35934 4.41881 4.45375 4.50023 4.54654 4.59633 < X [92] 4.65079 4.70538 4.76038 4.82715 4.85999 4.91129 4.96026 --- > X [85] 4.31612 4.35934 4.41881 4.45375 4.50023 4.54896 4.59633 > X [92] 4.65079 4.70538 4.75829 4.82715 4.85999 4.91129 4.96026 22142c22334 < if test 7746 -ne `wc -c <'test/master.res'`; then --- > if test 7826 -ne `wc -c <'test/master.res'`; then 22220c22412 < echo shar: Extracting \"'INS'\" \(692 characters\) --- > echo shar: Extracting \"'INS'\" \(835 characters\) 22234a22427,22433 > X if [ $1 = "dyn.load.shared" ] > X then > X for name in MASS nnet spatial; > X do > X (cd ${name}; echo ----- $name; ./Shared) > X done > X fi 22260c22459 < if test 692 -ne `wc -c <'INS'`; then --- > if test 835 -ne `wc -c <'INS'`; then 22269c22468 < echo shar: Extracting \"'VERSION'\" \(72 characters\) --- > echo shar: Extracting \"'VERSION'\" \(448 characters\) 22271c22470,22482 < XThis is version 2.2, as supplied on the diskette of the third printing. --- > XThis is version 2.6, as supplied on the diskette of the third printing, > Xwith corrections to MASS/data.q, PLUS > X > Xenhancements to MASS/p.tree, MASS/summary.rlm. > X > Xoptions for installing under S-Plus 3.3 on Dec Alpha and SGI machines. > X > XSlight changes to handling of covariance functions (especially the nugget > Xeffect) in kriging. > X > XA more reliable and efficient algorithm for MASS/sammon.c. > X > XChanges in the test results to reflect the last two changes. 22273c22484 < if test 72 -ne `wc -c <'VERSION'`; then --- > if test 448 -ne `wc -c <'VERSION'`; then 22304c22515 < echo shar: Extracting \"'Irix.Users'\" \(893 characters\) --- > echo shar: Extracting \"'Irix.Users'\" \(967 characters\) 22308a22520,22521 > XWARNING: for Splus 3.3 under Irix 5.x or 6.x do not use this! > X 22310c22523 < XYou can of course choose to use ./INS Sonly and not compiled the C code. --- > XYou can of course choose to use ./INS Sonly and not compile the C code. 22326c22539 < X(3) ./INS will then not compile the C files. --- > X(3) ./INS will then omit the compilation of the C files. 22333c22546 < if test 893 -ne `wc -c <'Irix.Users'`; then --- > if test 967 -ne `wc -c <'Irix.Users'`; then