Skip to content

Commit dc35abb

Browse files
committed
Merge pull request #238.
Moving aima-core up to JDK 8.
1 parent ad87372 commit dc35abb

File tree

82 files changed

+7089
-160
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+7089
-160
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# ![](https://github.com/aimacode/aima-java/blob/gh-pages/aima3e/images/aima3e.jpg)AIMA3e-Java (JDK 7+) [![Build Status](https://travis-ci.org/aimacode/aima-java.svg?branch=AIMA3e)](https://travis-ci.org/aimacode/aima-java)
1+
# ![](https://github.com/aimacode/aima-java/blob/gh-pages/aima3e/images/aima3e.jpg)AIMA3e-Java (JDK 8+) [![Build Status](https://travis-ci.org/aimacode/aima-java.svg?branch=AIMA3e)](https://travis-ci.org/aimacode/aima-java)
22
Java implementation of algorithms from [Russell](http://www.cs.berkeley.edu/~russell/) and [Norvig's](http://www.norvig.com/) [Artificial Intelligence - A Modern Approach 3rd Edition](http://aima.cs.berkeley.edu/). You can use this in conjunction with a course on AI, or for study on your own. We're loooking for [solid contributors](https://github.com/aimacode/aima-java/wiki/AIMAJava-Contributing) to help.
33

44
### Getting Started Links
@@ -117,4 +117,4 @@ Java implementation of algorithms from [Russell](http://www.cs.berkeley.edu/~rus
117117
|21.8|844|Q-Learning-Agent|[QLearningAgent](/aima-core/src/main/java/aima/core/learning/reinforcement/agent/QLearningAgent.java)|
118118
|22.1|871|HITS|[HITS](/aima-core/src/main/java/aima/core/nlp/ranking/HITS.java)|
119119
|23.5|894|CYK-Parse|[CYK](/aima-core/src/main/java/aima/core/nlp/parsing/CYK.java)|
120-
|25.9|982|Monte-Carlo-Localization|---|
120+
|25.9|982|Monte-Carlo-Localization|[MonteCarloLocalization](/aima-core/src/main/java/aima/core/robotics/MonteCarloLocalization.java)|

aima-core/.classpath

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<classpathentry kind="src" path="src/main/resources"/>
55
<classpathentry kind="src" path="src/main/javadoc"/>
66
<classpathentry kind="src" path="src/test/java"/>
7+
<classpathentry kind="src" path="src/test/resources"/>
78
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
89
<classpathentry kind="lib" path="lib/junit/junit-4.11.jar"/>
910
<classpathentry kind="lib" path="lib/junit/hamcrest-core-1.3.jar"/>
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
eclipse.preferences.version=1
22
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
33
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
4-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
4+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
55
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
6-
org.eclipse.jdt.core.compiler.compliance=1.7
6+
org.eclipse.jdt.core.compiler.compliance=1.8
77
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
88
org.eclipse.jdt.core.compiler.debug.localVariable=generate
99
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
1010
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
1111
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
12-
org.eclipse.jdt.core.compiler.source=1.7
12+
org.eclipse.jdt.core.compiler.source=1.8

aima-core/README.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
= AIMA-CORE =
22

33
== Requirements ==
4-
# JDK 1.7 - is the baseline JDK against which this project is developed.
4+
# JDK 1.8 - is the baseline JDK against which this project is developed.
55

66
== Current Release: 0.11.1-Chp7-Complete ==
77
0.11.1-Chp7-Complete : Mar 15 2015 :<br>

aima-core/build.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ aima-core.dir.build.release=${aima-core.dir.build}/release
2020
# COMPILER VALUES
2121
aima-core.compiler.debug=true
2222
aima-core.compiler.debuglevel=source,lines,vars
23-
aima-core.compiler.source=1.7
24-
aima-core.compiler.target=1.7
23+
aima-core.compiler.source=1.8
24+
aima-core.compiler.target=1.8

aima-core/build.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@
7979
<attribute name="Implementation-Version" value="${aima-core.version}" />
8080
<attribute name="AIMA-CORE-Version" value="${aima-core.version}" />
8181
</manifest>
82-
<fileset dir="${aima-core.dir.build.bin}/main" />
83-
<fileset dir="${aima-core.dir.src}/main/resources" excludes="**/*.git, .gitignore" />
82+
<fileset dir="${aima-core.dir.build.bin}/main" />
83+
<fileset dir="${aima-core.dir.src}/main/resources" excludes="**/*.git, .gitignore" />
8484
</jar>
8585
</target>
8686

aima-core/src/main/java/aima/core/environment/map/ExtendableMap.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
import aima.core.util.Util;
88
import aima.core.util.datastructure.LabeledGraph;
9-
import aima.core.util.datastructure.Point2D;
9+
import aima.core.util.math.geom.shapes.Point2D;
1010

1111
/**
1212
* Implements a map with locations, distance labeled links between the

aima-core/src/main/java/aima/core/environment/map/Map.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import java.util.List;
44

5-
import aima.core.util.datastructure.Point2D;
5+
import aima.core.util.math.geom.shapes.Point2D;
66

77
/**
88
* Provides a general interface for maps.

aima-core/src/main/java/aima/core/environment/map/StraightLineDistanceHeuristicFunction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package aima.core.environment.map;
22

3-
import aima.core.util.datastructure.Point2D;
3+
import aima.core.util.math.geom.shapes.Point2D;
44

55
/**
66
* @author Ruediger Lunde
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
package aima.core.robotics;
2+
3+
import aima.core.robotics.datatypes.IMclMove;
4+
import aima.core.robotics.datatypes.IMclPose;
5+
import aima.core.robotics.datatypes.IMclRangeReading;
6+
import aima.core.robotics.datatypes.IMclVector;
7+
8+
/**
9+
* This interface defines functionality for a map of an environment for a robot (agent) to perform Monte-Carlo-Localization in.
10+
*
11+
* @author Arno von Borries
12+
* @author Jan Phillip Kretzschmar
13+
* @author Andreas Walscheid
14+
*
15+
* @param <P> a pose implementing {@link IMclPose}.
16+
* @param <V> an n-1-dimensional vector implementing {@link IMclVector}, where n is the dimensionality of the environment.
17+
* @param <M> a movement (or sequence of movements) of the robot, implementing {@link IMclMove}.
18+
* @param <R> a range measurement, implementing {@link IMclRangeReading}.
19+
*/
20+
public interface IMclMap<P extends IMclPose<P,V,M>, V extends IMclVector, M extends IMclMove<M>, R extends IMclRangeReading<R,V>> {
21+
/**
22+
* Generates a random valid pose on the map.
23+
* @return a random valid pose on the map.
24+
*/
25+
P randomPose();
26+
/**
27+
* Calculates the length of a ray in a direction defined by a pose.
28+
* @param pose the pose from which the ray is to be cast.
29+
* @return the length of the ray as a range reading.
30+
*/
31+
R rayCast(P pose);
32+
/**
33+
* Verifies whether a pose is valid, that is inside the map boundaries and not within an obstacle.
34+
* @param pose the pose which is to be evaluated.
35+
* @return true if the pose is valid.
36+
*/
37+
boolean isPoseValid(P pose);
38+
}

0 commit comments

Comments
 (0)