Skip to content

Commit

Permalink
fix to R 3.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
edzer committed Sep 19, 2014
0 parents commit 5c56ec1
Show file tree
Hide file tree
Showing 62 changed files with 4,577 additions and 0 deletions.
17 changes: 17 additions & 0 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
Package: intervals
Version: 0.15.0
Date: 2014-09-19
Type: Package
Title: Tools for working with points and intervals
Author: Richard Bourgon <[email protected]>
Maintainer: Edzer Pebesma <[email protected]>
Depends: R (>= 2.9.0), methods
Suggests:
Description: Tools for working with and comparing sets of points and intervals.
License: Artistic-2.0
LazyLoad: yes
URL: http://github.com/edzer/intervals
Packaged: 2013-11-03 17:10:26 UTC; hornik
NeedsCompilation: yes
Repository: CRAN
Date/Publication: 2013-11-03 18:23:55
62 changes: 62 additions & 0 deletions MD5
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
e3b52f25c29216dab4411db63fc9924d *DESCRIPTION
8fad5c1380be8ac95292709b667580c0 *NAMESPACE
395419ebcf2325cd51382cf869b7ce5c *NEWS
5d3f4dfbcb8c9119dd1562ccbc412467 *R/Intervals-class.R
b324268152a9423e6c65c0c988d6c54b *R/as.matrix.R
38bfefc3e9a840c8c923c89880c1587c *R/c.R
34cd12ab4fe68a81147862e97b15949f *R/close_intervals-methods.R
b3eb24412f49233d264cfa4b59d7e2e4 *R/closed-methods.R
ff9d706b9f496d57e129b6900b73f897 *R/clusters.R
bf6fd3b2e3d8a0423e0d5cc56886861b *R/distance_to_nearest-methods.R
eab17d98c078805adf0e123cb637cc15 *R/empty-methods.R
fc7e40041f4ae6b2796830c2fa03fd59 *R/expand-methods.R
af2a9dcabf565023997fdd01481ebd1c *R/head-methods.R
36b33045bde48137c282a6019157e0c9 *R/interval_complement-methods.R
90cc9b22d5562826c992b7e8afb189d6 *R/interval_difference-methods.R
521baba587949ec360abde100182c525 *R/interval_included-methods.R
1564356296f5c31f7f4b8e2af3f81198 *R/interval_intersection-methods.R
22e0554a7dd6017d28ed6af0b739a005 *R/interval_overlap-methods.R
c4db0a892e9af14025c7140d24cbc146 *R/interval_union-methods.R
606491d4aac135785542a9ccfc8a3070 *R/is.na-methods.R
c0676ed4c23fb7e3ddbc2943706e449e *R/plot.Intervals_virtual.R
c98be2c3ff6e8bb290722d3b0d7cb40f *R/reduce-methods.R
dd2d5638db27a01280f3ba7b51499ca2 *R/show-methods.R
9fb026e61d588212f18e5ce675e25b6d *R/size-methods.R
f60a5d3db5f7ffdc7b2e2f89ad73aa8e *R/split.R
1f063de2558da95b89939fe6ded3cb17 *R/t-methods.R
269d9904ee4f9077977318a06c0ea80b *R/type-methods.R
68f0dd826dd4eacc4f1dd5b9563ca0a6 *R/which_nearest-methods.R
27f6ca46de01553328e15e76bebe5643 *build/vignette.rds
92331b5a7c5d0c6c690134be22d279fd *data/sgd.rdata
a2f1dae28510f0ca5a3cb5089741ff79 *inst/doc/intervals_overview.R
61b77aed42f5d4a9517527dfd20dcd9f *inst/doc/intervals_overview.Rnw
746f4bf572ae118beddaa1361890addd *inst/doc/intervals_overview.pdf
35de4238afd3ef852acdffeaee785700 *man/Intervals-class.Rd
0177e9e1b85eacda57458bfe8298c35c *man/Intervals_virtual-class.Rd
e3e3202f6d824d8f23a435eb9ebf58d1 *man/Intervals_virtual_or_numeric-class.Rd
fa157f068564f9751e7a820fd76113cc *man/as.matrix.Intervals.Rd
fbfe10a5da6b8e08f574a14e7f6a3e5e *man/c.Intervals.Rd
90ca50aa8682d0b5d29a7296a7ae6452 *man/close_intervals-methods.Rd
2abf435889e72a82124c8500f4be5c98 *man/clusters-methods.Rd
75da89fdf7d4e884ff0d8d194d6e1f01 *man/distance_to_nearest-methods.Rd
1dba3b2837c85159bbaf2688ae0adbad *man/empty-methods.Rd
e382cd554673c0068670a67278c6115a *man/expand-methods.Rd
096699acb78d27aa015bfcf956f4f557 *man/interval_complement-methods.Rd
d5e010258d8a735cf40deb9f5a46dfaf *man/interval_difference-methods.Rd
f294dea1388f4faa935666279c852ceb *man/interval_included-methods.Rd
5795101b91efd8d1858b2a883716d9da *man/interval_intersection-methods.Rd
0800a00a632882b9723a3df5d80d3160 *man/interval_overlap-methods.Rd
8c3d9577d7b5ee414115951dc669f921 *man/interval_union-methods.Rd
e4fe3b5b457265fdfc8bf6b6ff82ae8b *man/intervals-package.Rd
a0f85d87af5844eb046f54e67d62331a *man/plot.Intervals.Rd
5c627704aac7e9dcaea89534d6a7a6fe *man/reduce-methods.Rd
27dce9eb576a05a2deaa48fd10c8c4d2 *man/sgd.Rd
c02935db7a4e097bf4316e967f41cb67 *man/size-methods.Rd
4a9e6b81bd312461016f35fa3b3909b0 *man/split.Intervals_virtual.Rd
32a4b517594cd57c13e31a54ce542808 *man/which_nearest-methods.Rd
8e00c2c424c18850880d2273098bfa60 *src/Endpoint.cpp
7a32b00c4f944861c37a65658958b93c *src/Endpoint.h
21e3c6ce0a8cb6f07ce6e0e0cc049316 *src/plot_overlap.cpp
07904a7e49cad3fa6b13cb957818460b *src/reduce.cpp
5419ee07a71faefc60ec68a9dd67d451 *src/which_nearest.cpp
477a72cf673ae334fb367f84bc7870e0 *tests/intervals_test_code.R
65 changes: 65 additions & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
######## Compiled code

useDynLib( "intervals" )

######## Imports

# Class, method, and regular imports from the methods package are not listed
# here, since we depend on the package.

import("methods")

importFrom( "utils", "head", "tail" )

######## Exports

export( "Intervals", "Intervals_full" )

S3method( "split", "Intervals_virtual" )
S3method( "as.matrix", "Intervals_virtual" )
S3method( "c", "Intervals" )
S3method( "c", "Intervals_full" )
S3method( "plot", "Intervals" )
S3method( "plot", "Intervals_full" )
exportClasses(
"Intervals",
"Intervals_full",
"Intervals_virtual",
"Intervals_virtual_or_numeric"
)

exportMethods(
"[",
"[<-",
"as.matrix",
"adjust_closure",
"close_intervals",
"closed",
"closed<-",
"clusters",
"coerce",
"contract",
"distance_to_nearest",
"empty",
"expand",
"head",
"initialize",
"interval_complement",
"interval_difference",
"interval_included",
"interval_intersection",
"interval_overlap",
"interval_union",
"is.na",
"open_intervals",
"plot",
"reduce",
"show",
"size",
"split",
"t",
"tail",
"type",
"type<-",
"which_nearest"
)
74 changes: 74 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
******** VERSION 0.13.3 ********

BUG FIXES

- The S3 plot() method for class Intervals was ignoring the y argument. (The
method for class Intervals_full did, however, use the argument properly.)
This has been fixed.

******** VERSION 0.13.2 ********

BUG FIXES

- The initialization method for the Intervals class threw errors when empty
objects were created. This has been fixed.

******** VERSION 0.13.0 ********
NEW FEATURES

- New interval_included methods, similar to interval_overlap, but requiring
full inclusion.

******** VERSION 0.12.3 ********
NEW FEATURES

- S3 as.matrix methods for Intervals and Intervals_full objects.

******** VERSION 0.12.0 ********
NEW FEATURES

- S3 plot methods for Intervals and Intervals_full objects.

******** VERSION 0.11.1 ********

SIGNIFICANT USER-VISIBLE CHANGES

- The interval_overlap and distance_to_nearest methods are now just wrappers
for which_nearest. Because of this, the argument names for interval_overlap,
have been changed from 'target' and 'query' to 'from' and 'to',
respectively, in order to match the other two functions. Argument order is
the same as before, but functions which call arguments by name and use the
old names will now generate an (informative) error message.

BUG FIXES

- The C++ code for interval_overlap correctly handles all varieties of
endpoint closure, but does not handle cases like (0,2) vs. (1,3) over
Z. (These intervals do not overlap, even though the right endpoint of the
first interval is nominally after the left endpoint of the second interval.)
This should have been handled by the R wrapper -- by applying
close_intervals before passing on to compiled code -- but this step had
previously been omitted. This is now fixed.

NEW FEATURES

- The interval_overlap, which_nearest, and distance_to_nearest methods now all
accept a numeric vector in both the 'from' and 'to' arguments.

IMPROVEMENTS

- The distance_to_nearest methods were previously based on old code using
approxfun(). They now work of the same algorithm used for interval_overlap
and which_nearest. This algorithm simultaneously generates all three types
of information: identity of overlaps and nearest neighbors, as well as
distance to nearest neighbors.

******** VERSION 0.11.0 ********

NEW FEATURES

- Adding a NEWS file!

- Added which_nearest methods, as a complement to distance_to_nearest. The C++
code previously used for interval_overlap calculations was augmented to
provide this functionality.
Loading

0 comments on commit 5c56ec1

Please sign in to comment.