Upgrade to latest scalafmt (#305)

Author: sritchie

.scalafmt.conf

@@ -1,5 +1,6 @@
-version=2.3.2
-maxColumn = 110
+version=3.9.4
+runner.dialect = scala212
+maxColumn = 100
 newlines.penalizeSingleSelectMultiArgList = false
 align.openParenCallSite = false
 rewrite.rules = [AvoidInfix, SortImports, RedundantBraces, RedundantParens, PreferCurlyFors]

build.sbt

@@ -112,9 +112,7 @@ lazy val noPublishSettings = Seq(
   publishArtifact := false
 )
 
-/**
-  * This returns the previous jar I've released that is compatible
-  * with the current.
+/** This returns the previous jar I've released that is compatible with the current.
   */
 val noBinaryCompatCheck = Set[String]("core")
 
@@ -133,7 +131,9 @@ lazy val rl = Project(id = "scala-rl", base = file("."))
 def module(name: String) = {
   val id = "scala-rl-%s".format(name)
   Project(id = id, base = file(id))
-    .settings(sharedSettings ++ Seq(Keys.name := id, mimaPreviousArtifacts := previousVersion(name).toSet))
+    .settings(
+      sharedSettings ++ Seq(Keys.name := id, mimaPreviousArtifacts := previousVersion(name).toSet)
+    )
 }
 
 lazy val rlCore = module("core").settings(
@@ -192,7 +192,8 @@ implicit val evaluator: Numeric[Real] = new Evaluator(Map.empty)
   )
   .dependsOn(rlCore, rlPlot, rlWorld)
 
-lazy val docsMappingsAPIDir = settingKey[String]("Name of subdirectory in site target directory for api docs")
+lazy val docsMappingsAPIDir =
+  settingKey[String]("Name of subdirectory in site target directory for api docs")
 
 lazy val docSettings = Seq(
   micrositeName := "ScalaRL",
@@ -217,7 +218,10 @@ lazy val docSettings = Seq(
       )
   ),
   micrositeEditButton := Some(
-    MicrositeEditButton("Help us improve this page", "/edit/develop/docs/src/main/tut/{{ page.path }}")
+    MicrositeEditButton(
+      "Help us improve this page",
+      "/edit/develop/docs/src/main/tut/{{ page.path }}"
+    )
   ),
   micrositeHighlightTheme := "atom-one-light",
   micrositePalette := Map(
@@ -239,7 +243,8 @@ lazy val docSettings = Seq(
   // Don't kill the cname redirect.
   excludeFilter in ghpagesCleanSite :=
     new FileFilter {
-      def accept(f: File) = (ghpagesRepository.value / "CNAME").getCanonicalPath == f.getCanonicalPath
+      def accept(f: File) =
+        (ghpagesRepository.value / "CNAME").getCanonicalPath == f.getCanonicalPath
     } || "versions.html",
   fork in tut := true,
   fork in (ScalaUnidoc, unidoc) := true,
@@ -263,5 +268,7 @@ lazy val docs = project
   .settings(sharedSettings)
   .settings(noPublishSettings)
   .settings(docSettings)
-  .settings((scalacOptions in Tut) ~= (_.filterNot(Set("-Ywarn-unused-import", "-Ywarn-dead-code"))))
+  .settings(
+    (scalacOptions in Tut) ~= (_.filterNot(Set("-Ywarn-unused-import", "-Ywarn-dead-code")))
+  )
   .dependsOn(rlCore, rlPlot, rlBook, rlWorld)

project/plugins.sbt

@@ -1,6 +1,9 @@
 resolvers ++= Seq(
   "jgit-repo".at("https://download.eclipse.org/jgit/maven"),
-  Resolver.url("bintray-sbt-plugin-releases", url("https://dl.bintray.com/content/sbt/sbt-plugin-releases"))(
+  Resolver.url(
+    "bintray-sbt-plugin-releases",
+    url("https://dl.bintray.com/content/sbt/sbt-plugin-releases")
+  )(
     Resolver.ivyStylePatterns
   )
 )
@@ -11,7 +14,7 @@ addSbtPlugin("com.github.sbt" % "sbt-release" % "1.0.15")
 addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.2")
 addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4")
 addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3")
-addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.3.0")
+addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4")
 addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1")
 addSbtPlugin("org.wartremover" % "sbt-wartremover" % "3.3.2")
 addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.8.1")

scala-rl-book/src/main/scala/com/scalarl/book/Chapter2.scala

@@ -13,36 +13,32 @@ import com.scalarl.policy.bandit.Greedy
 import com.scalarl.rainier.Categorical
 import com.scalarl.world.Bandit
 
-/**
-  # Introduction to Chapter 2
-
-  This chapter is about Bandits. These are markov processes that know about a
-  single state, really. The trick here is going to be getting the stuff that
-  plays these particular states to be more general, and work with the same
-  machinery that rolls states forward.
-
-
-  * What we REALLY NEED here is both the top and bottom graphs,
-  * getting it done.
+/** # Introduction to Chapter 2
+  *
+  * This chapter is about Bandits. These are markov processes that know about a single state,
+  * really. The trick here is going to be getting the stuff that plays these particular states to be
+  * more general, and work with the same machinery that rolls states forward.
+  *
+  * What we REALLY NEED here is both the top and bottom graphs, getting it done.
   *
   * The top graph is the average reward across GAMES per step.
   *
-  * So we really want to march them ALL forward and grab the average
-  * reward...
+  * So we really want to march them ALL forward and grab the average reward...
   */
 object Chapter2 {
   import Bandit.Arm
   import Episode.Moment
 
-  /**
-    * These are needed to actually call get on anything.
+  /** These are needed to actually call get on anything.
     */
   implicit val rng: RNG = RNG.default
   implicit val evaluator: Numeric[Real] = new Evaluator(Map.empty)
 
   // Implementing it the way it does in the book.
   def average(s: Iterable[Double]): Double = {
-    val (sum, n) = s.foldLeft((0.0, 0)) { case ((sum, n), i) => (sum + i, n + 1) }
+    val (sum, n) = s.foldLeft((0.0, 0)) { case ((sum, n), i) =>
+      (sum + i, n + 1)
+    }
     sum / n
   }
 
@@ -67,13 +63,14 @@ object Chapter2 {
 
     val elapsed = Stopwatch.start()
     val rewardSeq = rewardSeqGen.get
-    println(s"Time to play $nRuns runs of $timeSteps time steps each: ${elapsed()}")
+    println(
+      s"Time to play $nRuns runs of $timeSteps time steps each: ${elapsed()}"
+    )
 
     rewardSeq
   }
 
-  /**
-    * Generates the n-armed testbed.
+  /** Generates the n-armed testbed.
     */
   def nArmedTestbed(
       nArms: Int,
@@ -85,8 +82,7 @@ object Chapter2 {
       .map(mean => Normal(mean, stdDev).generator)
   )
 
-  /**
-    * Generates a non-stationary distribution.
+  /** Generates a non-stationary distribution.
     */
   def nonStationaryTestbed(
       nArms: Int,

scala-rl-book/src/main/scala/com/scalarl/book/Chapter3.scala

@@ -1,8 +1,7 @@
-/**
-  This chapter plays a couple of gridworld games. Current goal is to get this
-  all building, and printing nicely.
-
-  This chapter introduces the idea of the Markov Decision Process.
+/** This chapter plays a couple of gridworld games. Current goal is to get this all building, and
+  * printing nicely.
+  *
+  * This chapter introduces the idea of the Markov Decision Process.
   */
 package com.scalarl
 package book
@@ -36,11 +35,9 @@ object Chapter3 {
   def notConverging(iterations: Long, allowed: Long): Boolean =
     iterations >= allowed
 
-  /**
-    Note... this version, following the python code, checks that the sum of all
-    differences is less than epsilon. In the next chapter we use the max
-    function instead here to get this working, to check that the maximum delta
-    is less than epsilon.
+  /** Note... this version, following the python code, checks that the sum of all differences is
+    * less than epsilon. In the next chapter we use the max function instead here to get this
+    * working, to check that the maximum delta is less than epsilon.
     */
   def valueFunctionConverged[Obs, T: ToDouble](
       l: StateValueFn[Obs, T],
@@ -55,7 +52,10 @@ object Chapter3 {
     notConverging(iterations, allowedIterations) ||
       valueFunctionConverged(l, r)
 
-  def toTable(conf: GridWorld.Config, f: Position => Double): Iterable[Iterable[Double]] =
+  def toTable(
+      conf: GridWorld.Config,
+      f: Position => Double
+  ): Iterable[Iterable[Double]] =
     Grid
       .allStates(conf.bounds)
       .map(g => f(g.position))
@@ -71,14 +71,16 @@ object Chapter3 {
   ): Unit = {
     val (valueFn, iterations) = pair
     println(s"${title}:")
-    println(Tabulator.format(toTable(conf, p => ToDouble[T].apply(valueFn.stateValue(p)))))
+    println(
+      Tabulator.format(
+        toTable(conf, p => ToDouble[T].apply(valueFn.stateValue(p)))
+      )
+    )
     println(s"That took $iterations iterations, for the record.")
   }
 
-  /**
-    * This is Figure 3.2, with proper stopping conditions and
-    * everything. Lots of work to go.
-    *   */
+  /** This is Figure 3.2, with proper stopping conditions and everything. Lots of work to go.
+    */
   def threeTwo: (StateValueFn[Position, DecayState[Double]], Long) =
     Sweep.sweepUntil[Position, Move, Double, DecayState[Double], Cat, Id](
       emptyFn,
@@ -90,8 +92,7 @@ object Chapter3 {
       valueIteration = false
     )
 
-  /**
-    * This is Figure 3.5. This is currently working!
+  /** This is Figure 3.5. This is currently working!
     */
   def threeFive: (StateValueFn[Position, DecayState[Double]], Long) = {
     implicit val dm = DecayState.decayStateModule(gamma)
@@ -114,9 +115,7 @@ object Chapter3 {
     )
   }
 
-  /**
-    * This currently works, and displays rough tables for each of the required
-    * bits.
+  /** This currently works, and displays rough tables for each of the required bits.
     */
   def main(items: Array[String]): Unit = {
     printFigure(gridConf, threeTwo, "Figure 3.2")