-
Notifications
You must be signed in to change notification settings - Fork 79
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fixes #78 #79
Merged
xuwei-k
merged 1 commit into
nscala-time:master
from
wookietreiber:wip-interval-to-collection
Nov 27, 2014
Merged
fixes #78 #79
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
39 changes: 39 additions & 0 deletions
39
src/main/scala/com/github/nscala_time/time/RichInterval.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
package com.github.nscala_time.time | ||
|
||
import JodaImplicits._ | ||
import com.github.nscala_time.PimpedType | ||
import org.joda.time._ | ||
import scala.collection.generic.CanBuildFrom | ||
|
||
class RichInterval(val underlying: Interval) extends Super with PimpedType[Interval] { | ||
|
||
/** Returns a collection containing every instance between the interval, `period` time apart. | ||
* | ||
* {{{ | ||
* scala> val start = DateTime.now | ||
* start: org.joda.time.DateTime = 2014-11-27T00:24:54.714+01:00 | ||
* | ||
* scala> val end = start + 1.day | ||
* end: org.joda.time.DateTime = 2014-11-28T00:24:54.714+01:00 | ||
* | ||
* scala> start to end by 1.minute | ||
* res0: scala.collection.immutable.IndexedSeq[org.joda.time.DateTime] = Vector(2014-11-27T00:24:54.714+01:00, ...) | ||
* | ||
* scala> val coll: Iterator[DateTime] = start to end by 1.minute | ||
* coll: Iterator[com.github.nscala_time.time.Imports.DateTime] = non-empty iterator | ||
* }}} | ||
*/ | ||
def by[CC[_]](period: ReadablePeriod)(implicit cbf: CanBuildFrom[Nothing, DateTime, CC[DateTime]]): CC[DateTime] = { | ||
val builder = cbf() | ||
|
||
var x = underlying.getStart | ||
|
||
while (x < underlying.getEnd) { | ||
builder += x | ||
x += period | ||
} | ||
|
||
builder.result | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
package com.github.nscala_time.time | ||
|
||
import org.scalacheck._ | ||
import org.scalacheck.Prop._ | ||
|
||
object RichIntervalSpec extends Properties("RichInterval") with Imports { | ||
|
||
property("by") = forAll(Gen.choose(1,1440)) { n => | ||
val start = DateTime.now | ||
val end = start + 1.day | ||
|
||
val coll = start to end by n.minute | ||
|
||
coll forall { date => | ||
start <= date && | ||
date <= end | ||
} | ||
} | ||
|
||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When using
1 to 3
in Scala, I expect it give meSeq(1, 2, 3)
, which includes the last value.Hence I would expect the
to
here will give me the last value, too.Would it be better to use
while (x <= underlying.getEnd)
here?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You, are right. I have opened a separate issue for this: #83.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
But intervals are more like
start until end
, instead ofstart to end
.For
interval contains interval.end
isfalse
.And this method will return a collection contains a point which is not in the original interval.
@pishen @wookietreiber