The R Project SVN R

Rev

Hide changed files | Details | Compare with Previous | Blame | RSS feed

Filtering Options

Rev Age Author Path Log message Diff Changes
52864 5807 d 5 h urbaneks /branches/R-exp-R5/ Experinental branch implementing "R5" ideas - extending S language to
create a more intuitive object system
 
/branches/R-exp-R5
50896 6047 d 1 h falcon /trunk/ Allow n-dim arrays to be subsetted by an n-column character matrix

The character matrix is converted to the corresponding integer matrix
by matching against the dimnames of the array. NA values in any row
of the character matrix are propagated to the result. Unmatched
values result in a subscript out of bounds error. Empty string "" is
not allowed to match and therefore always results in an error.
 
/trunk/tests/array-subset.R
/trunk/NEWS
/trunk/src/include/Defn.h
/trunk/src/library/base/man/Extract.Rd
/trunk/src/main/subassign.c
/trunk/src/main/subscript.c
/trunk/src/main/subset.c
/trunk/tests/Makefile.common
50745 6068 d 8 h ripley /trunk/ store vmax in const void *, consistently  
/trunk/NEWS
/trunk/src/library/grDevices/src/devPS.c
/trunk/src/library/grDevices/src/devQuartz.c
/trunk/src/library/grDevices/src/devWindows.c
/trunk/src/library/grid/src/grid.c
/trunk/src/library/stats/src/mAR.c
/trunk/src/main/connections.c
/trunk/src/main/dotcode.c
/trunk/src/main/engine.c
/trunk/src/main/eval.c
/trunk/src/main/graphics.c
/trunk/src/main/names.c
/trunk/src/main/objects.c
/trunk/src/main/plot.c
/trunk/src/main/plot3d.c
/trunk/src/main/printutils.c
/trunk/src/main/saveload.c
/trunk/src/main/subassign.c
/trunk/src/main/subset.c
/trunk/src/modules/X11/cairoX11.c
/trunk/src/modules/X11/devX11.c
/trunk/src/modules/vfonts/g_alab_her.c
/trunk/src/nmath/bessel_i.c
/trunk/src/nmath/bessel_j.c
/trunk/src/nmath/bessel_k.c
/trunk/src/nmath/bessel_y.c
/trunk/src/unix/aqua.c
/trunk/src/unix/edit.c
50609 6083 d 20 h jmc /trunk/ Changes to fix efficiency in dispatch, potential recursive loops, and
incorrect signatures, all for S4 methods for primitive functions.

1. A bug in get_primitive_methods prevented all quick dispatch of primitives from
working. Fixing this exposed a problem in quickDispatch in methods
that prevented matching methods with traiiling "missing" in the
signature.

2. A mechanism was added to temporarily turn off all dispatch of methods for
primitives. The code for findInheritedMethods activates the
mechanism. At the moment, this is just for efficiency, but in
principle it could be needed to avoid recursive calls to
findInheritedMethods.

3. The signatures for "$" and "$<-" were modified to remove "name",
since the grammar prevents general objects for this argument.

Some additional changes were tested but not installed to allow a
general signature in methods for "[", "[[" and their replacement
versions. Problems found with the Matrix package for this change. See
the commented calls to DiispatchAnyOrEval in src/main.
 
/trunk/NEWS
/trunk/src/include/Defn.h
/trunk/src/library/base/man/Extract.Rd
/trunk/src/library/base/man/isS4.Rd
/trunk/src/library/methods/R/BasicClasses.R
/trunk/src/library/methods/R/BasicFunsList.R
/trunk/src/library/methods/R/Methods.R
/trunk/src/library/methods/R/RMethodUtils.R
/trunk/src/library/methods/R/methodsTable.R
/trunk/src/library/methods/man/findMethods.Rd
/trunk/src/library/methods/src/methods_list_dispatch.c
/trunk/src/main/eval.c
/trunk/src/main/objects.c
/trunk/src/main/subassign.c
/trunk/src/main/subset.c
49592 6168 d 4 h murdoch /trunk/ Indexing with a vector index to [[]] extended to all recursive types, minor changes to trace() to print messages that recognize this.  
/trunk/NEWS
/trunk/doc/manual/R-lang.texi
/trunk/src/include/Defn.h
/trunk/src/library/base/man/trace.Rd
/trunk/src/library/methods/R/trace.R
/trunk/src/main/subassign.c
/trunk/src/main/subscript.c
/trunk/src/main/subset.c
48062 6351 d 23 h jmc /trunk/ S4 objects converted for S3 methods; class nonStructure  
/trunk/src/library/methods/man/nonStructure-class.Rd
/trunk/NEWS
/trunk/src/include/Rinternals.h
/trunk/src/library/base/R/methodsSupport.R
/trunk/src/library/base/man/isS4.Rd
/trunk/src/library/methods/R/BasicClasses.R
/trunk/src/library/methods/R/Methods.R
/trunk/src/library/methods/R/MethodsListClass.R
/trunk/src/library/methods/R/RMethodUtils.R
/trunk/src/library/methods/R/zzz.R
/trunk/src/library/methods/man/Classes.Rd
/trunk/src/library/methods/man/StructureClasses.Rd
/trunk/src/library/methods/man/setGeneric.Rd
/trunk/src/library/methods/man/setMethod.Rd
/trunk/src/library/methods/man/setOldClass.Rd
/trunk/src/main/array.c
/trunk/src/main/attrib.c
/trunk/src/main/eval.c
/trunk/src/main/objects.c
/trunk/src/main/registration.c
/trunk/src/main/subset.c
48053 6353 d 6 h maechler /trunk/ basically revert r47039: internal-"[" no longer preserves S4 class  
/trunk/NEWS
/trunk/src/main/subset.c
/trunk/tests/reg-S4.R
/trunk/tests/reg-S4.Rout.save
47934 6369 d 21 h jmc /trunk/src/ .xData mechanism to inherit from abnormal object types  
/trunk/src/include/Internal.h
/trunk/src/library/methods/R/BasicClasses.R
/trunk/src/library/methods/R/MethodsListClass.R
/trunk/src/library/methods/R/RClassUtils.R
/trunk/src/library/methods/R/SClasses.R
/trunk/src/library/methods/R/show.R
/trunk/src/library/methods/R/zzz.R
/trunk/src/main/attrib.c
/trunk/src/main/coerce.c
/trunk/src/main/envir.c
/trunk/src/main/subassign.c
/trunk/src/main/subset.c
47301 6426 d 1 h murdoch /trunk/ NAMED not set properly when using vector in [[]]. (PR#13411)  
/trunk/NEWS
/trunk/src/main/subset.c
47039 6445 d 10 h maechler /trunk/ do not lose S4-class in internal "["  
/trunk/NEWS
/trunk/src/main/subset.c
/trunk/tests/reg-S4.R
/trunk/tests/reg-S4.Rout.save
46923 6465 d 7 h murdoch /trunk/ Make srcref handling less fragile  
/trunk
/trunk/src/main/deparse.c
/trunk/src/main/subset.c
46124 6576 d 9 h ripley /trunk/src/ rationalize some error messages  
/trunk/src/include/Errormsg.h
/trunk/src/main/subassign.c
/trunk/src/main/subset.c
46117 6577 d 7 h ripley /trunk/ Using $ on a function is now an error.  
/trunk/NEWS
/trunk/src/library/base/man/Extract.Rd
/trunk/src/main/subassign.c
/trunk/src/main/subset.c
45446 6670 d 8 h ripley /trunk/src/main/ whitespace cleanup  
/trunk/src/main/CConverters.c
/trunk/src/main/CommandLineArgs.c
/trunk/src/main/RBufferUtils.h
/trunk/src/main/RNG.c
/trunk/src/main/Rdynload.c
/trunk/src/main/Renviron.c
/trunk/src/main/apply.c
/trunk/src/main/apse.c
/trunk/src/main/arithmetic.c
/trunk/src/main/arithmetic.h
/trunk/src/main/array.c
/trunk/src/main/attrib.c
/trunk/src/main/base.c
/trunk/src/main/basedecl.h
/trunk/src/main/bind.c
/trunk/src/main/character.c
/trunk/src/main/coerce.c
/trunk/src/main/colors.c
/trunk/src/main/complex.c
/trunk/src/main/connections.c
/trunk/src/main/context.c
/trunk/src/main/cov.c
/trunk/src/main/datetime.c
/trunk/src/main/dcf.c
/trunk/src/main/debug.c
/trunk/src/main/deparse.c
/trunk/src/main/devices.c
/trunk/src/main/dotcode.c
/trunk/src/main/dounzip.c
/trunk/src/main/dstruct.c
/trunk/src/main/duplicate.c
/trunk/src/main/engine.c
/trunk/src/main/envir.c
/trunk/src/main/errors.c
/trunk/src/main/eval.c
/trunk/src/main/format.c
/trunk/src/main/fourier.c
/trunk/src/main/gevents.c
/trunk/src/main/gram-ex.c
/trunk/src/main/graphics.c
/trunk/src/main/identical.c
/trunk/src/main/internet.c
/trunk/src/main/iosupport.c
/trunk/src/main/localecharset.c
/trunk/src/main/logic.c
/trunk/src/main/main.c
/trunk/src/main/mapply.c
/trunk/src/main/match.c
/trunk/src/main/memory.c
/trunk/src/main/mkdtemp.c
/trunk/src/main/model.c
/trunk/src/main/names.c
/trunk/src/main/objects.c
/trunk/src/main/optim.c
/trunk/src/main/options.c
/trunk/src/main/par-common.c
/trunk/src/main/par.c
/trunk/src/main/paste.c
/trunk/src/main/pcre.c
/trunk/src/main/platform.c
/trunk/src/main/plot.c
/trunk/src/main/plot3d.c
/trunk/src/main/plotmath.c
/trunk/src/main/print.c
/trunk/src/main/printarray.c
/trunk/src/main/printvector.c
/trunk/src/main/qsort-body.c
/trunk/src/main/qsort.c
/trunk/src/main/random.c
/trunk/src/main/registration.c
/trunk/src/main/rlocale.c
/trunk/src/main/rlocale_data.h
/trunk/src/main/saveload.c
/trunk/src/main/scan.c
/trunk/src/main/seq.c
/trunk/src/main/serialize.c
/trunk/src/main/size.c
/trunk/src/main/sort.c
/trunk/src/main/source.c
/trunk/src/main/sprintf.c
/trunk/src/main/startup.c
/trunk/src/main/subassign.c
/trunk/src/main/subscript.c
/trunk/src/main/subset.c
/trunk/src/main/summary.c
/trunk/src/main/sysutils.c
/trunk/src/main/unique.c
/trunk/src/main/unzip.h
/trunk/src/main/util.c
/trunk/src/main/version.c
/trunk/src/main/xspline.c
44091 6761 d 8 h ripley /trunk/src/ Use UTF-8 in collation, basename, dirname, Tcl/Tk strings
(not yet checked on Linux)
 
/trunk/src/gnuwin32/CHANGES
/trunk/src/gnuwin32/Rdll.hide
/trunk/src/gnuwin32/extra.c
/trunk/src/include/Defn.h
/trunk/src/library/tcltk/src/tcltk.c
/trunk/src/main/CConverters.c
/trunk/src/main/Rdynload.c
/trunk/src/main/apply.c
/trunk/src/main/builtin.c
/trunk/src/main/errors.c
/trunk/src/main/match.c
/trunk/src/main/model.c
/trunk/src/main/platform.c
/trunk/src/main/relop.c
/trunk/src/main/seq.c
/trunk/src/main/sort.c
/trunk/src/main/subset.c
/trunk/src/main/summary.c
/trunk/src/main/util.c
42992 6878 d 14 h ripley /trunk/src/main/ complete switching the default to [[exact=TRUE]]  
/trunk/src/main/subset.c
42981 6879 d 14 h ripley /trunk/ switch the default to [[exact=TRUE  
/trunk/NEWS
/trunk/src/library/base/R/dataframe.R
/trunk/src/library/base/man/Extract.Rd
/trunk/src/library/base/man/Extract.data.frame.Rd
/trunk/src/main/subset.c
42885 6888 d 12 h ripley /trunk/ deprecated -> defunct  
/trunk/share/R/firstlib.R
/trunk/share/R/nsrdaload.R
/trunk/src/gnuwin32/install-save.sh
/trunk/NEWS
/trunk/src/gnuwin32/MakePkg
/trunk/src/gnuwin32/fixed/bin/INSTALL
/trunk/src/gnuwin32/installer/Makefile
/trunk/src/main/subset.c
/trunk/src/scripts/INSTALL.in
/trunk/tests/reg-tests-1.R
42414 6932 d 14 h ripley /trunk/src/main/ layout issues  
/trunk/src/main/subscript.c
/trunk/src/main/subset.c
42307 6942 d 11 h ripley /trunk/src/ change reference to GPL  
/trunk/src/library/grDevices/src/devNull.c
/trunk/src/library/grDevices/src/devPS.c
/trunk/src/library/grDevices/src/devPicTeX.c
/trunk/src/library/grDevices/src/devQuartz.c
/trunk/src/library/grDevices/src/devWindows.c
/trunk/src/library/grDevices/src/grDevices.h
/trunk/src/library/grDevices/src/init.c
/trunk/src/library/grid/src/gpar.c
/trunk/src/library/grid/src/grid.c
/trunk/src/library/grid/src/grid.h
/trunk/src/library/grid/src/just.c
/trunk/src/library/grid/src/layout.c
/trunk/src/library/grid/src/matrix.c
/trunk/src/library/grid/src/register.c
/trunk/src/library/grid/src/state.c
/trunk/src/library/grid/src/unit.c
/trunk/src/library/grid/src/viewport.c
/trunk/src/library/methods/src/RSMethods.h
/trunk/src/library/methods/src/class_support.c
/trunk/src/library/methods/src/do_substitute_direct.c
/trunk/src/library/methods/src/init.c
/trunk/src/library/methods/src/methods.h
/trunk/src/library/methods/src/methods_list_dispatch.c
/trunk/src/library/methods/src/slot.c
/trunk/src/library/methods/src/tests.c
/trunk/src/library/splines/src/splines.c
/trunk/src/library/stats/src/HoltWinters.c
/trunk/src/library/stats/src/PPsum.c
/trunk/src/library/stats/src/Srunmed.c
/trunk/src/library/stats/src/Trunmed.c
/trunk/src/library/stats/src/arima.c
/trunk/src/library/stats/src/burg.c
/trunk/src/library/stats/src/ctest.h
/trunk/src/library/stats/src/distance.c
/trunk/src/library/stats/src/eureka.f
/trunk/src/library/stats/src/family.h
/trunk/src/library/stats/src/filter.c
/trunk/src/library/stats/src/init.c
/trunk/src/library/stats/src/isoreg.c
/trunk/src/library/stats/src/kmeans.c
/trunk/src/library/stats/src/ksmooth.c
/trunk/src/library/stats/src/mAR.c
/trunk/src/library/stats/src/modreg.h
/trunk/src/library/stats/src/mva.h
/trunk/src/library/stats/src/nls.c
/trunk/src/library/stats/src/pacf.c
/trunk/src/library/stats/src/port.c
/trunk/src/library/stats/src/port.h
/trunk/src/library/stats/src/prho.c
/trunk/src/library/stats/src/starma.c
/trunk/src/library/stats/src/stats.h
/trunk/src/library/stats/src/ts.h
/trunk/src/library/tcltk/src/init.c
/trunk/src/library/tools/src/Rmd5.c
/trunk/src/library/tools/src/init.c
/trunk/src/library/tools/src/text.c
/trunk/src/library/tools/src/tools.h
/trunk/src/main/CConverters.c
/trunk/src/main/CommandLineArgs.c
/trunk/src/main/RNG.c
/trunk/src/main/Rdynload.c
/trunk/src/main/Renviron.c
/trunk/src/main/Rmain.c
/trunk/src/main/Rregex.h
/trunk/src/main/Rstrptime.h
/trunk/src/main/apply.c
/trunk/src/main/arithmetic.c
/trunk/src/main/array.c
/trunk/src/main/attrib.c
/trunk/src/main/basedecl.h
/trunk/src/main/bind.c
/trunk/src/main/builtin.c
/trunk/src/main/character.c
/trunk/src/main/coerce.c
/trunk/src/main/colors.c
/trunk/src/main/complex.c
/trunk/src/main/connections.c
/trunk/src/main/context.c
/trunk/src/main/cov.c
/trunk/src/main/cum.c
/trunk/src/main/datetime.c
/trunk/src/main/dcf.c
/trunk/src/main/debug.c
/trunk/src/main/deparse.c
/trunk/src/main/deriv.c
/trunk/src/main/dotcode.c
/trunk/src/main/dounzip.c
/trunk/src/main/dstruct.c
/trunk/src/main/duplicate.c
/trunk/src/main/engine.c
/trunk/src/main/envir.c
/trunk/src/main/errors.c
/trunk/src/main/eval.c
/trunk/src/main/format.c
/trunk/src/main/fourier.c
/trunk/src/main/gevents.c
/trunk/src/main/gram-ex.c
/trunk/src/main/gram.c
/trunk/src/main/gram.y
/trunk/src/main/graphics.c
/trunk/src/main/identical.c
/trunk/src/main/inlined.c
/trunk/src/main/internet.c
/trunk/src/main/iosupport.c
/trunk/src/main/lapack.c
/trunk/src/main/list.c
/trunk/src/main/localecharset.c
/trunk/src/main/logic.c
/trunk/src/main/main.c
/trunk/src/main/mapply.c
/trunk/src/main/match.c
/trunk/src/main/memory.c
/trunk/src/main/mkdtemp.c
/trunk/src/main/model.c
/trunk/src/main/names.c
/trunk/src/main/objects.c
/trunk/src/main/optim.c
/trunk/src/main/optimize.c
/trunk/src/main/options.c
/trunk/src/main/par.c
/trunk/src/main/paste.c
/trunk/src/main/pcre.c
/trunk/src/main/platform.c
/trunk/src/main/plot.c
/trunk/src/main/plot3d.c
/trunk/src/main/plotmath.c
/trunk/src/main/print.c
/trunk/src/main/printarray.c
/trunk/src/main/printutils.c
/trunk/src/main/printvector.c
/trunk/src/main/qsort.c
/trunk/src/main/random.c
/trunk/src/main/regex.c
/trunk/src/main/registration.c
/trunk/src/main/relop.c
/trunk/src/main/rlocale.c
/trunk/src/main/rlocale_data.h
/trunk/src/main/saveload.c
/trunk/src/main/scan.c
/trunk/src/main/seq.c
/trunk/src/main/serialize.c
/trunk/src/main/size.c
/trunk/src/main/snprintf.c
/trunk/src/main/sort.c
/trunk/src/main/source.c
/trunk/src/main/split.c
/trunk/src/main/sprintf.c
/trunk/src/main/startup.c
/trunk/src/main/strdup.c
/trunk/src/main/strncasecmp.c
/trunk/src/main/subassign.c
/trunk/src/main/subscript.c
/trunk/src/main/subset.c
/trunk/src/main/summary.c
/trunk/src/main/sysutils.c
/trunk/src/main/unique.c
/trunk/src/main/util.c
/trunk/src/main/version.c
/trunk/src/main/vfonts.c
/trunk/src/modules/X11/dataentry.c
/trunk/src/modules/X11/devX11.c
/trunk/src/modules/X11/devX11.h
/trunk/src/modules/X11/rbitmap.c
/trunk/src/modules/internet/Rsock.c
/trunk/src/modules/internet/internet.c
/trunk/src/modules/internet/nanoftp.c
/trunk/src/modules/internet/nanohttp.c
/trunk/src/modules/internet/sock.c
/trunk/src/modules/internet/sock.h
/trunk/src/modules/internet/sockconn.c
/trunk/src/modules/lapack/Lapack.c

Show All