Skip to content

Commit 106b3e1

Browse files
RuedigerLundeRuedigerLunde
committed
Code polished.
1 parent 268111c commit 106b3e1

File tree

9 files changed

+179
-174
lines changed

9 files changed

+179
-174
lines changed

‎aima-core/src/main/java/aima/core/environment/map/SimplifiedRoadMapOfPartOfRomania.java‎ renamed to ‎aima-core/src/main/java/aima/core/environment/map/SimplifiedRoadMapOfRomania.java‎

Lines changed: 97 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -1,97 +1,97 @@
1-
package aima.core.environment.map;
2-
3-
/**
4-
* Represents a simplified road map of Romania. The initialization method is
5-
* declared static. So it can also be used to initialize other specialized
6-
* subclasses of {@link ExtendableMap} with road map data from Romania. Location
7-
* names, road distances and directions have been extracted from Artificial
8-
* Intelligence A Modern Approach (2nd Edition), Figure 3.2, page 63. The
9-
* straight-line distances to Bucharest have been taken from Artificial
10-
* Intelligence A Modern Approach (2nd Edition), Figure 4.1, page 95.
11-
*
12-
* @author Ruediger Lunde
13-
*/
14-
public class SimplifiedRoadMapOfPartOfRomania extends ExtendableMap {
15-
16-
public SimplifiedRoadMapOfPartOfRomania() {
17-
initMap(this);
18-
}
19-
20-
// The different locations in the simplified map of part of Romania
21-
public static final String ORADEA = "Oradea";
22-
public static final String ZERIND = "Zerind";
23-
public static final String ARAD = "Arad";
24-
public static final String TIMISOARA = "Timisoara";
25-
public static final String LUGOJ = "Lugoj";
26-
public static final String MEHADIA = "Mehadia";
27-
public static final String DOBRETA = "Dobreta";
28-
public static final String SIBIU = "Sibiu";
29-
public static final String RIMNICU_VILCEA = "RimnicuVilcea";
30-
public static final String CRAIOVA = "Craiova";
31-
public static final String FAGARAS = "Fagaras";
32-
public static final String PITESTI = "Pitesti";
33-
public static final String GIURGIU = "Giurgiu";
34-
public static final String BUCHAREST = "Bucharest";
35-
public static final String NEAMT = "Neamt";
36-
public static final String URZICENI = "Urziceni";
37-
public static final String IASI = "Iasi";
38-
public static final String VASLUI = "Vaslui";
39-
public static final String HIRSOVA = "Hirsova";
40-
public static final String EFORIE = "Eforie";
41-
42-
/**
43-
* Initializes a map with a simplified road map of Romania.
44-
*/
45-
public static void initMap(ExtendableMap map) {
46-
// mapOfRomania
47-
map.clear();
48-
map.addBidirectionalLink(ORADEA, ZERIND, 71.0);
49-
map.addBidirectionalLink(ORADEA, SIBIU, 151.0);
50-
map.addBidirectionalLink(ZERIND, ARAD, 75.0);
51-
map.addBidirectionalLink(ARAD, TIMISOARA, 118.0);
52-
map.addBidirectionalLink(ARAD, SIBIU, 140.0);
53-
map.addBidirectionalLink(TIMISOARA, LUGOJ, 111.0);
54-
map.addBidirectionalLink(LUGOJ, MEHADIA, 70.0);
55-
map.addBidirectionalLink(MEHADIA, DOBRETA, 75.0);
56-
map.addBidirectionalLink(DOBRETA, CRAIOVA, 120.0);
57-
map.addBidirectionalLink(SIBIU, FAGARAS, 99.0);
58-
map.addBidirectionalLink(SIBIU, RIMNICU_VILCEA, 80.0);
59-
map.addBidirectionalLink(RIMNICU_VILCEA, PITESTI, 97.0);
60-
map.addBidirectionalLink(RIMNICU_VILCEA, CRAIOVA, 146.0);
61-
map.addBidirectionalLink(CRAIOVA, PITESTI, 138.0);
62-
map.addBidirectionalLink(FAGARAS, BUCHAREST, 211.0);
63-
map.addBidirectionalLink(PITESTI, BUCHAREST, 101.0);
64-
map.addBidirectionalLink(GIURGIU, BUCHAREST, 90.0);
65-
map.addBidirectionalLink(BUCHAREST, URZICENI, 85.0);
66-
map.addBidirectionalLink(NEAMT, IASI, 87.0);
67-
map.addBidirectionalLink(URZICENI, VASLUI, 142.0);
68-
map.addBidirectionalLink(URZICENI, HIRSOVA, 98.0);
69-
map.addBidirectionalLink(IASI, VASLUI, 92.0);
70-
// addBidirectionalLink(VASLUI - already all linked
71-
map.addBidirectionalLink(HIRSOVA, EFORIE, 86.0);
72-
// addBidirectionalLink(EFORIE - already all linked
73-
74-
// distances and directions
75-
// reference location: Bucharest
76-
map.setDistAndDirToRefLocation(ARAD, 366, 117);
77-
map.setDistAndDirToRefLocation(BUCHAREST, 0, 360);
78-
map.setDistAndDirToRefLocation(CRAIOVA, 160, 74);
79-
map.setDistAndDirToRefLocation(DOBRETA, 242, 82);
80-
map.setDistAndDirToRefLocation(EFORIE, 161, 282);
81-
map.setDistAndDirToRefLocation(FAGARAS, 176, 142);
82-
map.setDistAndDirToRefLocation(GIURGIU, 77, 25);
83-
map.setDistAndDirToRefLocation(HIRSOVA, 151, 260);
84-
map.setDistAndDirToRefLocation(IASI, 226, 202);
85-
map.setDistAndDirToRefLocation(LUGOJ, 244, 102);
86-
map.setDistAndDirToRefLocation(MEHADIA, 241, 92);
87-
map.setDistAndDirToRefLocation(NEAMT, 234, 181);
88-
map.setDistAndDirToRefLocation(ORADEA, 380, 131);
89-
map.setDistAndDirToRefLocation(PITESTI, 100, 116);
90-
map.setDistAndDirToRefLocation(RIMNICU_VILCEA, 193, 115);
91-
map.setDistAndDirToRefLocation(SIBIU, 253, 123);
92-
map.setDistAndDirToRefLocation(TIMISOARA, 329, 105);
93-
map.setDistAndDirToRefLocation(URZICENI, 80, 247);
94-
map.setDistAndDirToRefLocation(VASLUI, 199, 222);
95-
map.setDistAndDirToRefLocation(ZERIND, 374, 125);
96-
}
97-
}
1+
package aima.core.environment.map;
2+
3+
/**
4+
* Represents a simplified road map of Romania. The initialization method is
5+
* declared static. So it can also be used to initialize other specialized
6+
* subclasses of {@link ExtendableMap} with road map data from Romania. Location
7+
* names, road distances and directions have been extracted from Artificial
8+
* Intelligence A Modern Approach (2nd Edition), Figure 3.2, page 63. The
9+
* straight-line distances to Bucharest have been taken from Artificial
10+
* Intelligence A Modern Approach (2nd Edition), Figure 4.1, page 95.
11+
*
12+
* @author Ruediger Lunde
13+
*/
14+
public class SimplifiedRoadMapOfRomania extends ExtendableMap {
15+
16+
public SimplifiedRoadMapOfRomania() {
17+
initMap(this);
18+
}
19+
20+
// The different locations in the simplified map of part of Romania
21+
public static final String ORADEA = "Oradea";
22+
public static final String ZERIND = "Zerind";
23+
public static final String ARAD = "Arad";
24+
public static final String TIMISOARA = "Timisoara";
25+
public static final String LUGOJ = "Lugoj";
26+
public static final String MEHADIA = "Mehadia";
27+
public static final String DOBRETA = "Dobreta";
28+
public static final String SIBIU = "Sibiu";
29+
public static final String RIMNICU_VILCEA = "RimnicuVilcea";
30+
public static final String CRAIOVA = "Craiova";
31+
public static final String FAGARAS = "Fagaras";
32+
public static final String PITESTI = "Pitesti";
33+
public static final String GIURGIU = "Giurgiu";
34+
public static final String BUCHAREST = "Bucharest";
35+
public static final String NEAMT = "Neamt";
36+
public static final String URZICENI = "Urziceni";
37+
public static final String IASI = "Iasi";
38+
public static final String VASLUI = "Vaslui";
39+
public static final String HIRSOVA = "Hirsova";
40+
public static final String EFORIE = "Eforie";
41+
42+
/**
43+
* Initializes a map with a simplified road map of Romania.
44+
*/
45+
public static void initMap(ExtendableMap map) {
46+
// mapOfRomania
47+
map.clear();
48+
map.addBidirectionalLink(ORADEA, ZERIND, 71.0);
49+
map.addBidirectionalLink(ORADEA, SIBIU, 151.0);
50+
map.addBidirectionalLink(ZERIND, ARAD, 75.0);
51+
map.addBidirectionalLink(ARAD, TIMISOARA, 118.0);
52+
map.addBidirectionalLink(ARAD, SIBIU, 140.0);
53+
map.addBidirectionalLink(TIMISOARA, LUGOJ, 111.0);
54+
map.addBidirectionalLink(LUGOJ, MEHADIA, 70.0);
55+
map.addBidirectionalLink(MEHADIA, DOBRETA, 75.0);
56+
map.addBidirectionalLink(DOBRETA, CRAIOVA, 120.0);
57+
map.addBidirectionalLink(SIBIU, FAGARAS, 99.0);
58+
map.addBidirectionalLink(SIBIU, RIMNICU_VILCEA, 80.0);
59+
map.addBidirectionalLink(RIMNICU_VILCEA, PITESTI, 97.0);
60+
map.addBidirectionalLink(RIMNICU_VILCEA, CRAIOVA, 146.0);
61+
map.addBidirectionalLink(CRAIOVA, PITESTI, 138.0);
62+
map.addBidirectionalLink(FAGARAS, BUCHAREST, 211.0);
63+
map.addBidirectionalLink(PITESTI, BUCHAREST, 101.0);
64+
map.addBidirectionalLink(GIURGIU, BUCHAREST, 90.0);
65+
map.addBidirectionalLink(BUCHAREST, URZICENI, 85.0);
66+
map.addBidirectionalLink(NEAMT, IASI, 87.0);
67+
map.addBidirectionalLink(URZICENI, VASLUI, 142.0);
68+
map.addBidirectionalLink(URZICENI, HIRSOVA, 98.0);
69+
map.addBidirectionalLink(IASI, VASLUI, 92.0);
70+
// addBidirectionalLink(VASLUI - already all linked
71+
map.addBidirectionalLink(HIRSOVA, EFORIE, 86.0);
72+
// addBidirectionalLink(EFORIE - already all linked
73+
74+
// distances and directions
75+
// reference location: Bucharest
76+
map.setDistAndDirToRefLocation(ARAD, 366, 117);
77+
map.setDistAndDirToRefLocation(BUCHAREST, 0, 360);
78+
map.setDistAndDirToRefLocation(CRAIOVA, 160, 74);
79+
map.setDistAndDirToRefLocation(DOBRETA, 242, 82);
80+
map.setDistAndDirToRefLocation(EFORIE, 161, 282);
81+
map.setDistAndDirToRefLocation(FAGARAS, 176, 142);
82+
map.setDistAndDirToRefLocation(GIURGIU, 77, 25);
83+
map.setDistAndDirToRefLocation(HIRSOVA, 151, 260);
84+
map.setDistAndDirToRefLocation(IASI, 226, 202);
85+
map.setDistAndDirToRefLocation(LUGOJ, 244, 102);
86+
map.setDistAndDirToRefLocation(MEHADIA, 241, 92);
87+
map.setDistAndDirToRefLocation(NEAMT, 234, 181);
88+
map.setDistAndDirToRefLocation(ORADEA, 380, 131);
89+
map.setDistAndDirToRefLocation(PITESTI, 100, 116);
90+
map.setDistAndDirToRefLocation(RIMNICU_VILCEA, 193, 115);
91+
map.setDistAndDirToRefLocation(SIBIU, 253, 123);
92+
map.setDistAndDirToRefLocation(TIMISOARA, 329, 105);
93+
map.setDistAndDirToRefLocation(URZICENI, 80, 247);
94+
map.setDistAndDirToRefLocation(VASLUI, 199, 222);
95+
map.setDistAndDirToRefLocation(ZERIND, 374, 125);
96+
}
97+
}

‎aima-core/src/test/java/aima/test/core/unit/search/framework/SolutionTesterTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import aima.core.environment.map.Map;
44
import aima.core.environment.map.MapFunctions;
55
import aima.core.environment.map.MoveToAction;
6-
import aima.core.environment.map.SimplifiedRoadMapOfPartOfRomania;
6+
import aima.core.environment.map.SimplifiedRoadMapOfRomania;
77
import aima.core.search.framework.Node;
88
import aima.core.search.agent.SearchAgent;
99
import aima.core.search.framework.SearchForActions;
@@ -24,13 +24,13 @@ public class SolutionTesterTest {
2424

2525
@Test
2626
public void testMultiGoalProblem() throws Exception {
27-
Map romaniaMap = new SimplifiedRoadMapOfPartOfRomania();
27+
Map romaniaMap = new SimplifiedRoadMapOfRomania();
2828

2929
Problem<String, MoveToAction> problem = new GeneralProblem<String, MoveToAction>
30-
(SimplifiedRoadMapOfPartOfRomania.ARAD,
30+
(SimplifiedRoadMapOfRomania.ARAD,
3131
MapFunctions.createActionsFunction(romaniaMap), MapFunctions.createResultFunction(),
32-
Predicate.<String>isEqual(SimplifiedRoadMapOfPartOfRomania.BUCHAREST).or
33-
(Predicate.isEqual(SimplifiedRoadMapOfPartOfRomania.HIRSOVA)),
32+
Predicate.<String>isEqual(SimplifiedRoadMapOfRomania.BUCHAREST).or
33+
(Predicate.isEqual(SimplifiedRoadMapOfRomania.HIRSOVA)),
3434
MapFunctions.createDistanceStepCostFunction(romaniaMap)) {
3535
@Override
3636
public boolean testSolution(Node<String, MoveToAction> node) {

‎aima-core/src/test/java/aima/test/core/unit/search/informed/AStarSearchTest.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -54,16 +54,16 @@ public void testAStarSearch() {
5454

5555
@Test
5656
public void testAIMA3eFigure3_15() throws Exception {
57-
Map romaniaMap = new SimplifiedRoadMapOfPartOfRomania();
57+
Map romaniaMap = new SimplifiedRoadMapOfRomania();
5858
Problem<String, MoveToAction> problem = new GeneralProblem<>(
59-
SimplifiedRoadMapOfPartOfRomania.SIBIU,
59+
SimplifiedRoadMapOfRomania.SIBIU,
6060
MapFunctions.createActionsFunction(romaniaMap),
6161
MapFunctions.createResultFunction(),
62-
Predicate.isEqual(SimplifiedRoadMapOfPartOfRomania.BUCHAREST),
62+
Predicate.isEqual(SimplifiedRoadMapOfRomania.BUCHAREST),
6363
MapFunctions.createDistanceStepCostFunction(romaniaMap));
6464

6565
SearchForActions<String, MoveToAction> search = new AStarSearch<>(new GraphSearch<>(),
66-
MapFunctions.createSLDHeuristicFunction(SimplifiedRoadMapOfPartOfRomania.BUCHAREST, romaniaMap));
66+
MapFunctions.createSLDHeuristicFunction(SimplifiedRoadMapOfRomania.BUCHAREST, romaniaMap));
6767
SearchAgent<Object, String, MoveToAction> agent = new SearchAgent<>(problem, search);
6868

6969
List<MoveToAction> actions = agent.getActions();
@@ -77,16 +77,16 @@ public void testAIMA3eFigure3_15() throws Exception {
7777

7878
@Test
7979
public void testAIMA3eFigure3_24() throws Exception {
80-
Map romaniaMap = new SimplifiedRoadMapOfPartOfRomania();
80+
Map romaniaMap = new SimplifiedRoadMapOfRomania();
8181
Problem<String, MoveToAction> problem = new GeneralProblem<>(
82-
SimplifiedRoadMapOfPartOfRomania.ARAD,
82+
SimplifiedRoadMapOfRomania.ARAD,
8383
MapFunctions.createActionsFunction(romaniaMap),
8484
MapFunctions.createResultFunction(),
85-
Predicate.isEqual(SimplifiedRoadMapOfPartOfRomania.BUCHAREST),
85+
Predicate.isEqual(SimplifiedRoadMapOfRomania.BUCHAREST),
8686
MapFunctions.createDistanceStepCostFunction(romaniaMap));
8787

8888
SearchForActions<String, MoveToAction> search = new AStarSearch<>(new TreeSearch<>(),
89-
MapFunctions.createSLDHeuristicFunction(SimplifiedRoadMapOfPartOfRomania.BUCHAREST, romaniaMap));
89+
MapFunctions.createSLDHeuristicFunction(SimplifiedRoadMapOfRomania.BUCHAREST, romaniaMap));
9090
SearchAgent<Object, String, MoveToAction> agent = new SearchAgent<>(problem, search);
9191
Assert.assertEquals(
9292
"[Action[name=moveTo, location=Sibiu], Action[name=moveTo, location=RimnicuVilcea], Action[name=moveTo, location=Pitesti], Action[name=moveTo, location=Bucharest]]",
@@ -102,16 +102,16 @@ public void testAIMA3eFigure3_24() throws Exception {
102102

103103
@Test
104104
public void testAIMA3eFigure3_24_using_GraphSearch() throws Exception {
105-
Map romaniaMap = new SimplifiedRoadMapOfPartOfRomania();
105+
Map romaniaMap = new SimplifiedRoadMapOfRomania();
106106
Problem<String, MoveToAction> problem = new GeneralProblem<>(
107-
SimplifiedRoadMapOfPartOfRomania.ARAD,
107+
SimplifiedRoadMapOfRomania.ARAD,
108108
MapFunctions.createActionsFunction(romaniaMap),
109109
MapFunctions.createResultFunction(),
110-
Predicate.isEqual(SimplifiedRoadMapOfPartOfRomania.BUCHAREST),
110+
Predicate.isEqual(SimplifiedRoadMapOfRomania.BUCHAREST),
111111
MapFunctions.createDistanceStepCostFunction(romaniaMap));
112112

113113
SearchForActions<String, MoveToAction> search = new AStarSearch<>(new GraphSearch<>(),
114-
MapFunctions.createSLDHeuristicFunction(SimplifiedRoadMapOfPartOfRomania.BUCHAREST, romaniaMap));
114+
MapFunctions.createSLDHeuristicFunction(SimplifiedRoadMapOfRomania.BUCHAREST, romaniaMap));
115115
SearchAgent<Object, String, MoveToAction> agent = new SearchAgent<>(problem, search);
116116
Assert.assertEquals(
117117
"[Action[name=moveTo, location=Sibiu], Action[name=moveTo, location=RimnicuVilcea], Action[name=moveTo, location=Pitesti], Action[name=moveTo, location=Bucharest]]",

‎aima-core/src/test/java/aima/test/core/unit/search/informed/GreedyBestFirstSearchTest.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import aima.core.environment.eightpuzzle.EightPuzzleBoard;
1212
import aima.core.environment.eightpuzzle.EightPuzzleFunctions;
1313
import aima.core.environment.map.Map;
14-
import aima.core.environment.map.SimplifiedRoadMapOfPartOfRomania;
14+
import aima.core.environment.map.SimplifiedRoadMapOfRomania;
1515
import aima.core.search.framework.QueueBasedSearch;
1616
import aima.core.search.agent.SearchAgent;
1717
import aima.core.search.framework.SearchForActions;
@@ -78,14 +78,14 @@ public void testGreedyBestFirstSearchReducedFrontier() {
7878

7979
@Test
8080
public void testAIMA3eFigure3_23() throws Exception {
81-
Map romaniaMap = new SimplifiedRoadMapOfPartOfRomania();
82-
Problem<String, MoveToAction> problem = new GeneralProblem<>(SimplifiedRoadMapOfPartOfRomania.ARAD,
81+
Map romaniaMap = new SimplifiedRoadMapOfRomania();
82+
Problem<String, MoveToAction> problem = new GeneralProblem<>(SimplifiedRoadMapOfRomania.ARAD,
8383
MapFunctions.createActionsFunction(romaniaMap), MapFunctions.createResultFunction(),
84-
Predicate.isEqual(SimplifiedRoadMapOfPartOfRomania.BUCHAREST),
84+
Predicate.isEqual(SimplifiedRoadMapOfRomania.BUCHAREST),
8585
MapFunctions.createDistanceStepCostFunction(romaniaMap));
8686

8787
SearchForActions<String, MoveToAction> search = new GreedyBestFirstSearch<>(new TreeSearch<>(),
88-
MapFunctions.createSLDHeuristicFunction(SimplifiedRoadMapOfPartOfRomania.BUCHAREST, romaniaMap));
88+
MapFunctions.createSLDHeuristicFunction(SimplifiedRoadMapOfRomania.BUCHAREST, romaniaMap));
8989
SearchAgent<Object, String, MoveToAction> agent = new SearchAgent<>(problem, search);
9090
Assert.assertEquals(
9191
"[Action[name=moveTo, location=Sibiu], Action[name=moveTo, location=Fagaras], Action[name=moveTo, location=Bucharest]]",
@@ -98,14 +98,14 @@ public void testAIMA3eFigure3_23() throws Exception {
9898

9999
@Test
100100
public void testAIMA3eFigure3_23_using_GraphSearch() throws Exception {
101-
Map romaniaMap = new SimplifiedRoadMapOfPartOfRomania();
102-
Problem<String, MoveToAction> problem = new GeneralProblem<>(SimplifiedRoadMapOfPartOfRomania.ARAD,
101+
Map romaniaMap = new SimplifiedRoadMapOfRomania();
102+
Problem<String, MoveToAction> problem = new GeneralProblem<>(SimplifiedRoadMapOfRomania.ARAD,
103103
MapFunctions.createActionsFunction(romaniaMap), MapFunctions.createResultFunction(),
104-
Predicate.isEqual(SimplifiedRoadMapOfPartOfRomania.BUCHAREST),
104+
Predicate.isEqual(SimplifiedRoadMapOfRomania.BUCHAREST),
105105
MapFunctions.createDistanceStepCostFunction(romaniaMap));
106106

107107
SearchForActions<String, MoveToAction> search = new GreedyBestFirstSearch<>(new GraphSearch<>(),
108-
MapFunctions.createSLDHeuristicFunction(SimplifiedRoadMapOfPartOfRomania.BUCHAREST, romaniaMap));
108+
MapFunctions.createSLDHeuristicFunction(SimplifiedRoadMapOfRomania.BUCHAREST, romaniaMap));
109109
SearchAgent<Object, String, MoveToAction> agent = new SearchAgent<>(problem, search);
110110
Assert.assertEquals(
111111
"[Action[name=moveTo, location=Sibiu], Action[name=moveTo, location=Fagaras], Action[name=moveTo, location=Bucharest]]",

‎aima-core/src/test/java/aima/test/core/unit/search/informed/RecursiveBestFirstSearchTest.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ public class RecursiveBestFirstSearchTest {
3030
@Before
3131
public void setUp() {
3232
envChanges = new StringBuffer();
33-
aMap = new SimplifiedRoadMapOfPartOfRomania();
33+
aMap = new SimplifiedRoadMapOfRomania();
3434

3535
ToDoubleFunction<Node<String, MoveToAction>> heuristicFunction = (node) -> {
3636
Point2D pt1 = aMap.getPosition((String) node.getState());
37-
Point2D pt2 = aMap.getPosition(SimplifiedRoadMapOfPartOfRomania.BUCHAREST);
37+
Point2D pt2 = aMap.getPosition(SimplifiedRoadMapOfRomania.BUCHAREST);
3838
return pt1.distance(pt2);
3939
};
4040

@@ -48,9 +48,9 @@ public void setUp() {
4848
public void testStartingAtGoal() {
4949
MapEnvironment me = new MapEnvironment(aMap);
5050
SimpleMapAgent ma = new SimpleMapAgent(me.getMap(), recursiveBestFirstSearch,
51-
SimplifiedRoadMapOfPartOfRomania.BUCHAREST).setNotifier(me);
51+
SimplifiedRoadMapOfRomania.BUCHAREST).setNotifier(me);
5252

53-
me.addAgent(ma, SimplifiedRoadMapOfPartOfRomania.BUCHAREST);
53+
me.addAgent(ma, SimplifiedRoadMapOfRomania.BUCHAREST);
5454
me.addEnvironmentListener(new TestEnvironmentView());
5555
me.stepUntilDone();
5656

@@ -63,9 +63,9 @@ public void testStartingAtGoal() {
6363
public void testAIMA3eFigure3_27() {
6464
MapEnvironment me = new MapEnvironment(aMap);
6565
SimpleMapAgent ma = new SimpleMapAgent(me.getMap(), recursiveBestFirstSearch,
66-
SimplifiedRoadMapOfPartOfRomania.BUCHAREST).setNotifier(me);
66+
SimplifiedRoadMapOfRomania.BUCHAREST).setNotifier(me);
6767

68-
me.addAgent(ma, SimplifiedRoadMapOfPartOfRomania.ARAD);
68+
me.addAgent(ma, SimplifiedRoadMapOfRomania.ARAD);
6969
me.addEnvironmentListener(new TestEnvironmentView());
7070
me.stepUntilDone();
7171

@@ -78,9 +78,9 @@ public void testAIMA3eFigure3_27() {
7878
public void testAIMA3eAradNeamtA() {
7979
MapEnvironment me = new MapEnvironment(aMap);
8080
SimpleMapAgent ma = new SimpleMapAgent(me.getMap(), recursiveBestFirstSearch,
81-
SimplifiedRoadMapOfPartOfRomania.NEAMT).setNotifier(me);
81+
SimplifiedRoadMapOfRomania.NEAMT).setNotifier(me);
8282

83-
me.addAgent(ma, SimplifiedRoadMapOfPartOfRomania.ARAD);
83+
me.addAgent(ma, SimplifiedRoadMapOfRomania.ARAD);
8484
me.addEnvironmentListener(new TestEnvironmentView());
8585
me.stepUntilDone();
8686

@@ -93,9 +93,9 @@ public void testAIMA3eAradNeamtA() {
9393
public void testAIMA3eAradNeamtB() {
9494
MapEnvironment me = new MapEnvironment(aMap);
9595
SimpleMapAgent ma = new SimpleMapAgent(me.getMap(), recursiveBestFirstSearchAvoidingLoops,
96-
SimplifiedRoadMapOfPartOfRomania.NEAMT).setNotifier(me);
96+
SimplifiedRoadMapOfRomania.NEAMT).setNotifier(me);
9797

98-
me.addAgent(ma, SimplifiedRoadMapOfPartOfRomania.ARAD);
98+
me.addAgent(ma, SimplifiedRoadMapOfRomania.ARAD);
9999
me.addEnvironmentListener(new TestEnvironmentView());
100100
me.stepUntilDone();
101101

0 commit comments

Comments
 (0)