Skip to content

Force posNum and negNum generators to always return values #569

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Sep 27, 2019
Merged

Force posNum and negNum generators to always return values #569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d917be0
Make posNum and negNum retry until they produce legal values
zakpatterson Sep 26, 2019
80c0662
Update changelog
zakpatterson Sep 26, 2019
7f9edf3
Fix posNum to avoid retries using case split on numeric instance
zakpatterson Sep 27, 2019
7d0ac41
Remove unnecessary type argument
zakpatterson Sep 27, 2019
a9c5345
Fix changelog per review
zakpatterson Sep 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# ScalaCheck CHANGELOG

### Fixed

* Ensure posNum and negNum always return values
[#568](https://github.com/typelevel/scalacheck/issues/568)

## 1.14.2 (2019-09-25)

* Binary compatible with 1.14.1 version of ScalaCheck.
Expand Down
10 changes: 5 additions & 5 deletions src/main/scala/org/scalacheck/Gen.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -863,15 +863,15 @@ object Gen extends GenArities with GenVersionSpecific {
* upper bound of the generation size parameter. */
def posNum[T](implicit num: Numeric[T], c: Choose[T]): Gen[T] = {
import num._
sized(n => c.choose(zero, max(fromInt(n), one)).suchThat(_ != zero))
num match {
case _: Fractional[_] => sized(n => c.choose(zero, max(fromInt(n), one)).suchThat(_ != zero))
case _ => sized(n => c.choose(one, max(fromInt(n), one)))
}
}

/** Generates negative numbers of uniform distribution, with an
* lower bound of the negated generation size parameter. */
def negNum[T](implicit num: Numeric[T], c: Choose[T]): Gen[T] = {
import num._
sized(n => c.choose(min(-fromInt(n), -one), zero).suchThat(_ != zero))
}
def negNum[T](implicit num: Numeric[T], c: Choose[T]): Gen[T] = posNum.map(num.negate _)

/** Generates numbers within the given inclusive range, with
* extra weight on zero, +/- unity, both extremities, and any special
Expand Down