Some deprecation warnings removed.

Author: RuedigerLunde

aima-core/src/main/java/aima/core/agent/impl/ObjectWithDynamicAttributes.java

@@ -10,7 +10,7 @@
  * @author Ciaran O'Reilly
  * @author Mike Stampone
  */
-public abstract class ObjectWithDynamicAttributes {
+public abstract class ObjectWithDynamicAttributes implements Cloneable {
 	private Map<Object, Object> attributes = new LinkedHashMap<>();
 
 	//
@@ -103,17 +103,17 @@ public void removeAttribute(Object key) {
 	/**
 	 * Creates and returns a copy of this ObjectWithDynamicAttributes
 	 */
-	public ObjectWithDynamicAttributes copy() {
-		ObjectWithDynamicAttributes copy = null;
-
+	public ObjectWithDynamicAttributes clone() {
 		try {
-			copy = getClass().newInstance();
-			copy.attributes.putAll(attributes);
+			ObjectWithDynamicAttributes result;
+			result = (ObjectWithDynamicAttributes) super.clone();
+			result.attributes = new LinkedHashMap<>();
+			result.attributes.putAll(attributes);
+			return result;
 		} catch (Exception ex) {
 			ex.printStackTrace();
 		}
-
-		return copy;
+		return null;
 	}
 
 	@Override

aima-core/src/main/java/aima/core/learning/framework/DataSetFactory.java

@@ -16,12 +16,11 @@
  */
 public class DataSetFactory {
 
-	public DataSet fromFile(String filename, DataSetSpecification spec,
-			String separator) throws Exception {
+	public DataSet fromFile(String filename, DataSetSpecification spec, String separator) throws Exception {
 		// assumed file in data directory and ends in .csv
 		DataSet ds = new DataSet(spec);
 
-		try(BufferedReader reader = new BufferedReader(new InputStreamReader(
+		try (BufferedReader reader = new BufferedReader(new InputStreamReader(
 				DataResource.class.getResourceAsStream(filename + ".csv")))) {
 
 			String line;

aima-core/src/main/java/aima/core/learning/neural/LayerSensitivity.java

@@ -62,10 +62,9 @@ public Layer getLayer() {
 	//
 
 	private Matrix createDerivativeMatrix(Vector lastInducedField) {
-		List<Double> lst = new ArrayList<Double>();
+		List<Double> lst = new ArrayList<>();
 		for (int i = 0; i < lastInducedField.size(); i++) {
-			lst.add(new Double(layer.getActivationFunction().deriv(
-					lastInducedField.getValue(i))));
+			lst.add(layer.getActivationFunction().deriv(lastInducedField.getValue(i)));
 		}
 		return Matrix.createDiagonalMatrix(lst);
 	}

aima-core/src/main/java/aima/core/learning/neural/NNExample.java

@@ -18,27 +18,17 @@ public NNExample(List<Double> normalizedInput, List<Double> normalizedTarget) {
 	}
 
 	public NNExample copyExample() {
-		List<Double> newInput = new ArrayList<Double>();
-		List<Double> newTarget = new ArrayList<Double>();
-		for (Double d : normalizedInput) {
-			newInput.add(new Double(d.doubleValue()));
-		}
-		for (Double d : normalizedTarget) {
-			newTarget.add(new Double(d.doubleValue()));
-		}
+		List<Double> newInput = new ArrayList<>(normalizedInput);
+		List<Double> newTarget = new ArrayList<>(normalizedTarget);
 		return new NNExample(newInput, newTarget);
 	}
 
 	public Vector getInput() {
-		Vector v = new Vector(normalizedInput);
-		return v;
-
+		return new Vector(normalizedInput);
 	}
 
 	public Vector getTarget() {
-		Vector v = new Vector(normalizedTarget);
-		return v;
-
+		return new Vector(normalizedTarget);
 	}
 
 	public boolean isCorrect(Vector prediction) {

aima-core/src/main/java/aima/core/probability/mdp/search/PolicyIteration.java

@@ -69,7 +69,7 @@ public PolicyIteration(PolicyEvaluation<S, A> policyEvaluation) {
 	public Policy<S, A> policyIteration(MarkovDecisionProcess<S, A> mdp) {
 		// local variables: U, a vector of utilities for states in S, initially
 		// zero
-		Map<S, Double> U = Util.create(mdp.states(), new Double(0));
+		Map<S, Double> U = Util.create(mdp.states(),0.0);
 		// &pi;, a policy vector indexed by state, initially random
 		Map<S, A> pi = initialPolicyVector(mdp);
 		boolean unchanged;

aima-core/src/main/java/aima/core/probability/mdp/search/ValueIteration.java

@@ -77,8 +77,8 @@ public Map<S, Double> valueIteration(MarkovDecisionProcess<S, A> mdp,
 		//
 		// local variables: U, U', vectors of utilities for states in S,
 		// initially zero
-		Map<S, Double> U = Util.create(mdp.states(), new Double(0));
-		Map<S, Double> Udelta = Util.create(mdp.states(), new Double(0));
+		Map<S, Double> U = Util.create(mdp.states(), 0.0);
+		Map<S, Double> Udelta = Util.create(mdp.states(), 0.0);
 		// &delta; the maximum change in the utility of any state in an
 		// iteration
 		double delta = 0;

aima-core/src/main/java/aima/core/probability/proposition/IntegerSumProposition.java

@@ -35,8 +35,7 @@ public IntegerSumProposition(String name, FiniteIntegerDomain sumsDomain,
 	//
 	// START-Proposition
 	public boolean holds(Map<RandomVariable, Object> possibleWorld) {
-		Integer sum = new Integer(0);
-
+		Integer sum = 0;
 		for (RandomVariable rv : sumVars) {
 			Object o = possibleWorld.get(rv);
 			if (o instanceof Integer) {

aima-core/src/test/java/aima/test/core/unit/environment/map/MapTest.java

@@ -67,16 +67,16 @@ public void testLocationsLinkedTo() {
 
 	@Test
 	public void testDistances() {
-		Assert.assertEquals(new Double(5), aMap.getDistance("A", "B"));
-		Assert.assertEquals(new Double(6), aMap.getDistance("A", "C"));
-		Assert.assertEquals(new Double(4), aMap.getDistance("B", "C"));
-		Assert.assertEquals(new Double(7), aMap.getDistance("C", "D"));
-		Assert.assertEquals(new Double(14), aMap.getDistance("B", "E"));
+		Assert.assertEquals((Double) 5.0, aMap.getDistance("A", "B"));
+		Assert.assertEquals((Double) 6.0, aMap.getDistance("A", "C"));
+		Assert.assertEquals((Double) 4.0, aMap.getDistance("B", "C"));
+		Assert.assertEquals((Double) 7.0, aMap.getDistance("C", "D"));
+		Assert.assertEquals((Double) 14.0, aMap.getDistance("B", "E"));
 		//
-		Assert.assertEquals(new Double(5), aMap.getDistance("B", "A"));
-		Assert.assertEquals(new Double(6), aMap.getDistance("C", "A"));
-		Assert.assertEquals(new Double(4), aMap.getDistance("C", "B"));
-		Assert.assertEquals(new Double(7), aMap.getDistance("D", "C"));
+		Assert.assertEquals((Double) 5.0, aMap.getDistance("B", "A"));
+		Assert.assertEquals((Double) 6.0, aMap.getDistance("C", "A"));
+		Assert.assertEquals((Double) 4.0, aMap.getDistance("C", "B"));
+		Assert.assertEquals((Double) 7.0, aMap.getDistance("D", "C"));
 
 		// No distances should be returned if links not established or locations
 		// do not exist

aima-core/src/test/java/aima/test/core/unit/logic/propositional/parsing/ListTest.java

@@ -28,8 +28,8 @@ public void testListOfSymbolsClone() {
 
 	@Test
 	public void testListRemove() {
-		List<Integer> one = new ArrayList<Integer>();
-		one.add(new Integer(1));
+		List<Integer> one = new ArrayList<>();
+		one.add(1);
 		Assert.assertEquals(1, one.size());
 		one.remove(0);
 		Assert.assertEquals(0, one.size());

aima-core/src/test/java/aima/test/core/unit/util/SetOpsTest.java

@@ -18,16 +18,16 @@ public class SetOpsTest {
 
 	@Before
 	public void setUp() {
-		s1 = new HashSet<Integer>();
-		s1.add(new Integer(1));
-		s1.add(new Integer(2));
-		s1.add(new Integer(3));
-		s1.add(new Integer(4));
+		s1 = new HashSet<>();
+		s1.add(1);
+		s1.add(2);
+		s1.add(3);
+		s1.add(4);
 
-		s2 = new HashSet<Integer>();
-		s2.add(new Integer(4));
-		s2.add(new Integer(5));
-		s2.add(new Integer(6));
+		s2 = new HashSet<>();
+		s2.add(4);
+		s2.add(5);
+		s2.add(6);
 	}
 
 	@Test
@@ -37,7 +37,7 @@ public void testUnion() {
 		Assert.assertEquals(4, s1.size());
 		Assert.assertEquals(3, s2.size());
 
-		s1.remove(new Integer(1));
+		s1.remove(1);
 		Assert.assertEquals(6, union.size());
 		Assert.assertEquals(3, s1.size());
 		Assert.assertEquals(3, s2.size());
@@ -50,7 +50,7 @@ public void testIntersection() {
 		Assert.assertEquals(4, s1.size());
 		Assert.assertEquals(3, s2.size());
 
-		s1.remove(new Integer(1));
+		s1.remove(1);
 		Assert.assertEquals(1, intersection.size());
 		Assert.assertEquals(3, s1.size());
 		Assert.assertEquals(3, s2.size());
@@ -60,17 +60,17 @@ public void testIntersection() {
 	public void testDifference() {
 		Set<Integer> difference = SetOps.difference(s1, s2);
 		Assert.assertEquals(3, difference.size());
-		Assert.assertTrue(difference.contains(new Integer(1)));
-		Assert.assertTrue(difference.contains(new Integer(2)));
-		Assert.assertTrue(difference.contains(new Integer(3)));
+		Assert.assertTrue(difference.contains(1));
+		Assert.assertTrue(difference.contains(2));
+		Assert.assertTrue(difference.contains(3));
 	}
 
 	@Test
 	public void testDifference2() {
-		Set<Integer> one = new HashSet<Integer>();
-		Set<Integer> two = new HashSet<Integer>();
-		one.add(new Integer(1));
-		two.add(new Integer(1));
+		Set<Integer> one = new HashSet<>();
+		Set<Integer> two = new HashSet<>();
+		one.add(1);
+		two.add(1);
 		Set<Integer> difference = SetOps.difference(one, two);
 		Assert.assertTrue(difference.isEmpty());
 	}