Skip to content
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

2.11 fix #11

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 6 additions & 2 deletions bench/Thyme.scala
Original file line number Diff line number Diff line change
Expand Up @@ -881,7 +881,7 @@ class Thyme(val accuracyTarget: Double = 0.03, watchLoads: Boolean = true, watch
}

/** Order handling. Packs functions into `Resource` automatically. (Args for `f` are `start`, `n`, `data`.) Returns a tuple containing a result from `f`; prints a benchmarking report. */
def porder[A,B](resource: Int => B)(f: (Int,Int,B) => A)(n0: Int, title: String = "", pr: String => Unit = Thyme.printer): A = {
def porder[A,B](resource: Int => B)(f: (Int,Int,B) => A)(n0: Int, title: String, pr: String => Unit): A = {
val bo = Thyme.Scaled.empty
val ans = order(Thyme.Resource(resource))(Thyme.Resource.inline(f))(bo, n0)
bo.title = title
Expand Down Expand Up @@ -1496,7 +1496,11 @@ object Thyme {
* Each degree of warming includes all the previous ones; the default is `HowWarm.Order` (everything).
*/
def warmed(accuracyTarget: Double = 0.03, verbose: (String => Unit) = null, warmth: HowWarm.Value = HowWarm.Order): Thyme = {
def done(dt: Double) = f"done in ${if (dt>=1) dt else dt*1e3}%.2f ${if (dt>=1) "s" else "ms"}\n"
def done(dt: Double) = {
val that = if (dt >=1 ) dt else dt * 1e3
val suffix = if (dt>=1) "s" else "ms"
f"done in $that%.2f $suffix\n"
}
def verb(ta: Double, tb: Double, msg: String) {
if (verbose != null) {
if (tb.finite && ta.finite) verbose(done(abs(tb-ta)*1e-9))
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name := "thyme"

version := "0.1.1"

scalaVersion := "2.10.3"
scalaVersion := "2.11.0"

unmanagedSourceDirectories in Compile := {val b = baseDirectory.value; Seq(b / "maths", b / "bench")}