Skip to content

Commit 694eed6

Browse files
BusyByteBusyByte
committed
updating a few dependencies and formatting code
1 parent 13fef12 commit 694eed6

File tree

12 files changed

+115
-114
lines changed

12 files changed

+115
-114
lines changed

‎.scalafmt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
--style defaultWithAlign
2-
--maxColumn 120
1+
style = defaultWithAlign
2+
maxColumn = 120

‎build.sbt‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
1+
import org.scalafmt.sbt.ScalaFmtPlugin.autoImport._
2+
13
lazy val commonSettings = Seq(
2-
organization := "com.github.aimacode.aima-scala",
3-
version := "0.1.0-SNAPSHOT",
4-
scalaVersion := "2.11.8",
5-
scalafmtConfig := Some(file(".scalafmt")),
6-
addCompilerPlugin("org.psywerx.hairyfotr" %% "linter" % "0.1.14"),
7-
coverageEnabled := true,
8-
coverageMinimum := 70,
9-
coverageFailOnMinimum := false
10-
)
4+
organization := "com.github.aimacode.aima-scala",
5+
version := "0.1.0-SNAPSHOT",
6+
scalaVersion := "2.11.8",
7+
scalafmtConfig := Some(file(".scalafmt")),
8+
addCompilerPlugin("org.psywerx.hairyfotr" %% "linter" % "0.1.15"),
9+
coverageEnabled := true,
10+
coverageMinimum := 70,
11+
coverageFailOnMinimum := false,
12+
autoCompilerPlugins := true
13+
) ++ reformatOnCompileSettings
1114

1215
lazy val librarySettings = Seq(
13-
"org.specs2" %% "specs2-core" % "3.8.4" % "test",
14-
"org.specs2" %% "specs2-scalacheck" % "3.8.4" % "test",
15-
"org.scalacheck" %% "scalacheck" % "1.13.0" % "test"
16+
"org.specs2" %% "specs2-core" % "3.8.4" % "test",
17+
"org.specs2" %% "specs2-scalacheck" % "3.8.4" % "test",
18+
"org.scalacheck" %% "scalacheck" % "1.13.0" % "test"
1619
)
1720

18-
lazy val root = (project in file("."))
19-
.settings(commonSettings: _*)
20-
.aggregate(core)
21+
lazy val root = (project in file(".")).settings(commonSettings: _*).aggregate(core)
2122

2223
lazy val core = (project in file("core"))
2324
.settings(commonSettings: _*)

‎core/src/main/scala/aima/core/environment/vacuum/VacuumEnvironment.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ case class VacuumMap(nodes: Vector[VacuumMapNode] = Vector.fill(2)(VacuumMapNode
7474

7575
def moveAgent(agent: Agent, direction: MoveAction): VacuumMap = {
7676
removeAgent(agent).updateByIndex(directionToMapIndex(direction))(vacuumMapNode =>
77-
vacuumMapNode.copy(maybeAgent = Some(agent)))
77+
vacuumMapNode.copy(maybeAgent = Some(agent)))
7878
}
7979

8080
private[this] def updateByAgent(target: Agent)(f: VacuumMapNode => VacuumMapNode): VacuumMap = {

‎core/src/main/scala/aima/core/environment/vacuum/actions.scala‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
package aima.core.environment.vacuum
1+
package aima.core.environment.vacuum
22

3-
import aima.core.agent.Action
3+
import aima.core.agent.Action
44
import aima.core.util.{DefaultRandomness, SetRandomness}
55

6-
/**
7-
* @author Shawn Garner
8-
*/
9-
sealed trait MoveAction extends Action
10-
case object LeftMoveAction extends MoveAction
11-
case object RightMoveAction extends MoveAction
6+
/**
7+
* @author Shawn Garner
8+
*/
9+
sealed trait MoveAction extends Action
10+
case object LeftMoveAction extends MoveAction
11+
case object RightMoveAction extends MoveAction
1212

1313
object MoveAction extends SetRandomness[MoveAction] with DefaultRandomness {
1414
lazy val valueSet: Set[MoveAction] = Set(LeftMoveAction, RightMoveAction)
1515
}
1616

17-
sealed trait SuckerAction extends Action
18-
case object Suck extends SuckerAction
17+
sealed trait SuckerAction extends Action
18+
case object Suck extends SuckerAction
1919

2020
object SuckerAction extends SetRandomness[SuckerAction] with DefaultRandomness {
2121
lazy val valueSet: Set[SuckerAction] = Set(Suck)

‎core/src/main/scala/aima/core/environment/vacuum/actuators.scala‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
package aima.core.environment.vacuum
1+
package aima.core.environment.vacuum
22

33
import aima.core.agent.{Environment, Action, UnreliableActuator, Agent}
4-
import aima.core.util.DefaultRandomness
4+
import aima.core.util.DefaultRandomness
55

6-
/**
7-
* @author Shawn Garner
8-
*/
9-
class SuckerActuator(val agent: Agent) extends UnreliableActuator with DefaultRandomness { self =>
6+
/**
7+
* @author Shawn Garner
8+
*/
9+
class SuckerActuator(val agent: Agent) extends UnreliableActuator with DefaultRandomness { self =>
1010
def act(action: Action, environment: Environment): Environment = {
1111
unreliably(environment) {
1212
environment.actuate(self, action)
1313
}
1414
}
1515
}
16-
class MoveActuator(val agent: Agent) extends UnreliableActuator with DefaultRandomness { self =>
16+
class MoveActuator(val agent: Agent) extends UnreliableActuator with DefaultRandomness { self =>
1717
def act(action: Action, environment: Environment): Environment = {
1818
unreliably(environment) {
1919
environment.actuate(self, action)

‎core/src/main/scala/aima/core/environment/vacuum/percepts.scala‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
package aima.core.environment.vacuum
1+
package aima.core.environment.vacuum
22

3-
import aima.core.agent.Percept
3+
import aima.core.agent.Percept
44
import aima.core.util.{DefaultRandomness, SetRandomness}
55

6-
/**
7-
* @author Shawn Garner
8-
*/
9-
sealed trait LocationPercept extends Percept
10-
case object LocationAPercept extends LocationPercept
11-
case object LocationBPercept extends LocationPercept
6+
/**
7+
* @author Shawn Garner
8+
*/
9+
sealed trait LocationPercept extends Percept
10+
case object LocationAPercept extends LocationPercept
11+
case object LocationBPercept extends LocationPercept
1212

1313
object LocationPercept extends SetRandomness[LocationPercept] with DefaultRandomness {
1414
lazy val valueSet: Set[LocationPercept] = Set(LocationAPercept, LocationBPercept)
1515
}
1616

17-
sealed trait DirtPercept extends Percept
18-
case object CleanPercept extends DirtPercept
19-
case object DirtyPercept extends DirtPercept
17+
sealed trait DirtPercept extends Percept
18+
case object CleanPercept extends DirtPercept
19+
case object DirtyPercept extends DirtPercept
2020

2121
object DirtPercept extends SetRandomness[DirtPercept] with DefaultRandomness {
2222
lazy val valueSet: Set[DirtPercept] = Set(CleanPercept, DirtyPercept)

‎core/src/main/scala/aima/core/environment/vacuum/sensors.scala‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
package aima.core.environment.vacuum
1+
package aima.core.environment.vacuum
22

33
import aima.core.agent.{Percept, Environment, UnreliableSensor, Agent}
4-
import aima.core.util.DefaultRandomness
4+
import aima.core.util.DefaultRandomness
55

6-
/**
7-
* @author Shawn Garner
8-
*/
9-
class AgentLocationSensor(val agent: Agent) extends UnreliableSensor with DefaultRandomness { self =>
6+
/**
7+
* @author Shawn Garner
8+
*/
9+
class AgentLocationSensor(val agent: Agent) extends UnreliableSensor with DefaultRandomness { self =>
1010
def perceive(environment: Environment): Percept = unreliably() {
1111
environment.perceive(self)
1212
}
1313
}
1414

15-
class DirtSensor(val agent: Agent) extends UnreliableSensor with DefaultRandomness { self =>
15+
class DirtSensor(val agent: Agent) extends UnreliableSensor with DefaultRandomness { self =>
1616
def perceive(environment: Environment): Percept = unreliably() {
1717
environment.perceive(self)
1818
}

‎core/src/main/scala/aima/core/search/problems/romania.scala‎

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -32,52 +32,52 @@ object Romania {
3232
val Eforie = City("Eforie")
3333

3434
val roadsFromCity: Map[City, List[Road]] = List(
35-
Road(Arad, Zerind, 75),
36-
Road(Arad, Timisoara, 118),
37-
Road(Arad, Sibiu, 140), //Arad Edges
38-
Road(Zerind, Arad, 75),
39-
Road(Zerind, Oradea, 71), //Zerind Edges
40-
Road(Oradea, Zerind, 71),
41-
Road(Oradea, Sibiu, 151), //Oradea Edges
42-
Road(Sibiu, Arad, 140),
43-
Road(Sibiu, Oradea, 151),
44-
Road(Sibiu, Fagaras, 99),
45-
Road(Sibiu, RimnicuVilcea, 80), //Sibiu Edges
46-
Road(Timisoara, Arad, 118),
47-
Road(Timisoara, Lugoj, 111), //Timisoara Edges
48-
Road(Lugoj, Timisoara, 111),
49-
Road(Lugoj, Mehadia, 70), //Lugoj Edges
50-
Road(Mehadia, Lugoj, 70),
51-
Road(Mehadia, Drobeta, 75), //Mehadia Edges
52-
Road(Drobeta, Mehadia, 75),
53-
Road(Drobeta, Craiova, 120), //Drobeta Edges
54-
Road(RimnicuVilcea, Sibiu, 80),
55-
Road(RimnicuVilcea, Craiova, 146),
56-
Road(RimnicuVilcea, Pitesti, 97), //Rimnicu Vilcea Edges
57-
Road(Craiova, Drobeta, 120),
58-
Road(Craiova, RimnicuVilcea, 146),
59-
Road(Craiova, Pitesti, 138), //Craiova Edges
60-
Road(Fagaras, Sibiu, 99),
61-
Road(Fagaras, Bucharest, 211), //Fagaras Edges
62-
Road(Pitesti, Craiova, 138),
63-
Road(Pitesti, RimnicuVilcea, 97),
64-
Road(Pitesti, Bucharest, 101), //Pitesti Edges
65-
Road(Bucharest, Pitesti, 101),
66-
Road(Bucharest, Fagaras, 211),
67-
Road(Bucharest, Urziceni, 85),
68-
Road(Bucharest, Giurgiu, 90), //Bucharest Edges
69-
Road(Giurgiu, Bucharest, 90), //Giurgiu Edges
70-
Road(Urziceni, Bucharest, 85),
71-
Road(Urziceni, Vaslui, 142),
72-
Road(Urziceni, Hirsova, 98), //Urziceni Edges
73-
Road(Neamt, Iasi, 87), //Neamt Edges
74-
Road(Iasi, Neamt, 87),
75-
Road(Iasi, Vaslui, 92), //Iasi Edges
76-
Road(Vaslui, Iasi, 92),
77-
Road(Vaslui, Urziceni, 142), //Vaslui Edges
78-
Road(Hirsova, Urziceni, 98),
79-
Road(Hirsova, Eforie, 86), //Hirsova Edges
80-
Road(Eforie, Hirsova, 86) //Eforie Edges
35+
Road(Arad, Zerind, 75),
36+
Road(Arad, Timisoara, 118),
37+
Road(Arad, Sibiu, 140), //Arad Edges
38+
Road(Zerind, Arad, 75),
39+
Road(Zerind, Oradea, 71), //Zerind Edges
40+
Road(Oradea, Zerind, 71),
41+
Road(Oradea, Sibiu, 151), //Oradea Edges
42+
Road(Sibiu, Arad, 140),
43+
Road(Sibiu, Oradea, 151),
44+
Road(Sibiu, Fagaras, 99),
45+
Road(Sibiu, RimnicuVilcea, 80), //Sibiu Edges
46+
Road(Timisoara, Arad, 118),
47+
Road(Timisoara, Lugoj, 111), //Timisoara Edges
48+
Road(Lugoj, Timisoara, 111),
49+
Road(Lugoj, Mehadia, 70), //Lugoj Edges
50+
Road(Mehadia, Lugoj, 70),
51+
Road(Mehadia, Drobeta, 75), //Mehadia Edges
52+
Road(Drobeta, Mehadia, 75),
53+
Road(Drobeta, Craiova, 120), //Drobeta Edges
54+
Road(RimnicuVilcea, Sibiu, 80),
55+
Road(RimnicuVilcea, Craiova, 146),
56+
Road(RimnicuVilcea, Pitesti, 97), //Rimnicu Vilcea Edges
57+
Road(Craiova, Drobeta, 120),
58+
Road(Craiova, RimnicuVilcea, 146),
59+
Road(Craiova, Pitesti, 138), //Craiova Edges
60+
Road(Fagaras, Sibiu, 99),
61+
Road(Fagaras, Bucharest, 211), //Fagaras Edges
62+
Road(Pitesti, Craiova, 138),
63+
Road(Pitesti, RimnicuVilcea, 97),
64+
Road(Pitesti, Bucharest, 101), //Pitesti Edges
65+
Road(Bucharest, Pitesti, 101),
66+
Road(Bucharest, Fagaras, 211),
67+
Road(Bucharest, Urziceni, 85),
68+
Road(Bucharest, Giurgiu, 90), //Bucharest Edges
69+
Road(Giurgiu, Bucharest, 90), //Giurgiu Edges
70+
Road(Urziceni, Bucharest, 85),
71+
Road(Urziceni, Vaslui, 142),
72+
Road(Urziceni, Hirsova, 98), //Urziceni Edges
73+
Road(Neamt, Iasi, 87), //Neamt Edges
74+
Road(Iasi, Neamt, 87),
75+
Road(Iasi, Vaslui, 92), //Iasi Edges
76+
Road(Vaslui, Iasi, 92),
77+
Road(Vaslui, Urziceni, 142), //Vaslui Edges
78+
Road(Hirsova, Urziceni, 98),
79+
Road(Hirsova, Eforie, 86), //Hirsova Edges
80+
Road(Eforie, Hirsova, 86) //Eforie Edges
8181
).foldLeft(Map.empty[City, List[Road]]) { (acc, road) =>
8282
val from = road.from
8383
val listForEdge = acc.getOrElse(from, List.empty[Road])
@@ -87,7 +87,7 @@ object Romania {
8787
sealed trait RomaniaState extends State
8888
case class In(city: City) extends RomaniaState
8989

90-
sealed trait RomaniaAction extends Action
90+
sealed trait RomaniaAction extends Action
9191
case class GoTo(city: City) extends RomaniaAction
9292

9393
class RomaniaRoadProblem(val initialState: RomaniaState, val goalState: RomaniaState) extends Problem {

‎core/src/main/scala/aima/core/search/uninformed/GraphSearch.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ trait GraphSearch extends ProblemSearch with FrontierSearch {
2323
action <- problem.actions(leaf.state)
2424
childNode = newChildNode(problem, leaf, action)
2525
if !(updatedExploredSet.contains(childNode.state)
26-
|| updatedFrontier.contains(childNode.state))
26+
|| updatedFrontier.contains(childNode.state))
2727
} yield childNode
2828

2929
val frontierWithChildNodes = updatedFrontier.addAll(childNodes)

‎core/src/main/scala/aima/core/search/uninformed/UniformCostSearch.scala‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ trait UniformCostSearch extends ProblemSearch with FrontierSearch {
5454
def newChildNode(problem: Problem, parent: CostNode, action: Action): CostNode = {
5555
val childState = problem.result(parent.state, action)
5656
CostNode(
57-
state = childState,
58-
cost = parent.cost + problem.stepCost(parent.state, action, childState),
59-
action = action,
60-
parent = Some(parent)
57+
state = childState,
58+
cost = parent.cost + problem.stepCost(parent.state, action, childState),
59+
action = action,
60+
parent = Some(parent)
6161
)
6262
}
6363
}

0 commit comments

Comments
 (0)