Merge pull request aimacode#300 from epidemia/fixed-method-may-fail-to-close-stream

fixed method may fail close stream

Author: ctjoreilly

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

@@ -20,15 +20,19 @@ 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);
-		BufferedReader reader = new BufferedReader(new InputStreamReader(
-				DataResource.class.getResourceAsStream(filename + ".csv")));
-		String line;
-		while ((line = reader.readLine()) != null) {
-			ds.add(exampleFromString(line, spec, separator));
+
+		try(BufferedReader reader = new BufferedReader(new InputStreamReader(
+				DataResource.class.getResourceAsStream(filename + ".csv")))) {
+
+			String line;
+
+			while ((line = reader.readLine()) != null) {
+				ds.add(exampleFromString(line, spec, separator));
+			}
+
 		}
 
 		return ds;
-
 	}
 
 	public static Example exampleFromString(String data,

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

@@ -66,11 +66,14 @@ public void createNormalizedDataFromFile(String filename) throws Exception {
 		List<List<Double>> rds = new ArrayList<List<Double>>();
 
 		// create raw data set
-		BufferedReader reader = new BufferedReader(new InputStreamReader(
-				DataResource.class.getResourceAsStream(filename + ".csv")));
-		String line;
-		while ((line = reader.readLine()) != null) {
-			rds.add(exampleFromString(line, ","));
+		try (BufferedReader reader = new BufferedReader(new InputStreamReader(
+				DataResource.class.getResourceAsStream(filename + ".csv")))) {
+
+			String line;
+
+			while ((line = reader.readLine()) != null) {
+				rds.add(exampleFromString(line, ","));
+			}
 		}
 
 		// normalize raw dataset