Repository: ignite Updated Branches: refs/heads/ignite-7573 4724a5f9d -> fde86683c
IGNITE-7567: Fixed bug with datasest in examples this closes #3453 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b42a5c59 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b42a5c59 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b42a5c59 Branch: refs/heads/ignite-7573 Commit: b42a5c59733cdbab68cda952f30f897fee9021fc Parents: 394019e Author: zaleslaw <[email protected]> Authored: Tue Jan 30 17:25:08 2018 +0300 Committer: Yury Babak <[email protected]> Committed: Tue Jan 30 17:25:08 2018 +0300 ---------------------------------------------------------------------- .../KNNClassificationExample.java | 17 +- .../ignite/examples/ml/knn/datasets/README.md | 2 - .../ml/knn/datasets/cleared_machines.txt | 209 ------------------- .../ignite/examples/ml/knn/datasets/iris.txt | 150 ------------- .../ml/knn/regression/KNNRegressionExample.java | 18 +- examples/src/main/resources/datasets/README.md | 2 + .../resources/datasets/cleared_machines.txt | 209 +++++++++++++++++++ examples/src/main/resources/datasets/iris.txt | 150 +++++++++++++ parent/pom.xml | 4 +- 9 files changed, 378 insertions(+), 383 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b42a5c59/examples/src/main/java/org/apache/ignite/examples/ml/knn/classification/KNNClassificationExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/knn/classification/KNNClassificationExample.java b/examples/src/main/java/org/apache/ignite/examples/ml/knn/classification/KNNClassificationExample.java index 0e1a52f..6532ac5 100644 --- a/examples/src/main/java/org/apache/ignite/examples/ml/knn/classification/KNNClassificationExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/ml/knn/classification/KNNClassificationExample.java @@ -17,15 +17,14 @@ package org.apache.ignite.examples.ml.knn.classification; +import java.io.File; import java.io.IOException; -import java.net.URISyntaxException; -import java.net.URL; import java.nio.file.Path; -import java.nio.file.Paths; import java.util.Arrays; import org.apache.ignite.Ignite; import org.apache.ignite.Ignition; import org.apache.ignite.examples.ExampleNodeStartup; +import org.apache.ignite.internal.util.IgniteUtils; import org.apache.ignite.ml.knn.models.KNNModel; import org.apache.ignite.ml.knn.models.KNNStrategy; import org.apache.ignite.ml.math.distances.EuclideanDistance; @@ -53,7 +52,7 @@ public class KNNClassificationExample { private static final String SEPARATOR = "\t"; /** Path to the Iris dataset. */ - private static final String KNN_IRIS_TXT = "../datasets/iris.txt"; + private static final String KNN_IRIS_TXT = "examples/src/main/resources/datasets/iris.txt"; /** * Executes example. @@ -71,11 +70,11 @@ public class KNNClassificationExample { try { // Prepare path to read - URL url = KNNClassificationExample.class.getResource(KNN_IRIS_TXT); - if (url == null) - throw new RuntimeException("Can't get URL for: " + KNN_IRIS_TXT); + File file = IgniteUtils.resolveIgnitePath(KNN_IRIS_TXT); + if (file == null) + throw new RuntimeException("Can't find file: " + KNN_IRIS_TXT); - Path path = Paths.get(url.toURI()); + Path path = file.toPath(); // Read dataset from file LabeledDataset dataset = LabeledDatasetLoader.loadFromTxtFile(path, SEPARATOR, true, false); @@ -138,7 +137,7 @@ public class KNNClassificationExample { } } - catch (URISyntaxException | IOException e) { + catch (IOException e) { e.printStackTrace(); System.out.println("\n>>> Unexpected exception, check resources: " + e); } http://git-wip-us.apache.org/repos/asf/ignite/blob/b42a5c59/examples/src/main/java/org/apache/ignite/examples/ml/knn/datasets/README.md ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/knn/datasets/README.md b/examples/src/main/java/org/apache/ignite/examples/ml/knn/datasets/README.md deleted file mode 100644 index 2f9c5ec..0000000 --- a/examples/src/main/java/org/apache/ignite/examples/ml/knn/datasets/README.md +++ /dev/null @@ -1,2 +0,0 @@ -iris.txt and cleared_machines are from Lichman, M. (2013). UCI Machine Learning Repository [http://archive.ics.uci.edu/ml]. Irvine, CA: University of California, School of Information and Computer Science. -Read more about machine dataset http://archive.ics.uci.edu/ml/machine-learning-databases/cpu-performance/machine.names \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/b42a5c59/examples/src/main/java/org/apache/ignite/examples/ml/knn/datasets/cleared_machines.txt ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/knn/datasets/cleared_machines.txt b/examples/src/main/java/org/apache/ignite/examples/ml/knn/datasets/cleared_machines.txt deleted file mode 100644 index cf8b6b0..0000000 --- a/examples/src/main/java/org/apache/ignite/examples/ml/knn/datasets/cleared_machines.txt +++ /dev/null @@ -1,209 +0,0 @@ -199,125,256,6000,256,16,128 -253,29,8000,32000,32,8,32 -253,29,8000,32000,32,8,32 -253,29,8000,32000,32,8,32 -132,29,8000,16000,32,8,16 -290,26,8000,32000,64,8,32 -381,23,16000,32000,64,16,32 -381,23,16000,32000,64,16,32 -749,23,16000,64000,64,16,32 -1238,23,32000,64000,128,32,64 -23,400,1000,3000,0,1,2 -24,400,512,3500,4,1,6 -70,60,2000,8000,65,1,8 -117,50,4000,16000,65,1,8 -15,350,64,64,0,1,4 -64,200,512,16000,0,4,32 -23,167,524,2000,8,4,15 -29,143,512,5000,0,7,32 -22,143,1000,2000,0,5,16 -124,110,5000,5000,142,8,64 -35,143,1500,6300,0,5,32 -39,143,3100,6200,0,5,20 -40,143,2300,6200,0,6,64 -45,110,3100,6200,0,6,64 -28,320,128,6000,0,1,12 -21,320,512,2000,4,1,3 -28,320,256,6000,0,1,6 -22,320,256,3000,4,1,3 -28,320,512,5000,4,1,5 -27,320,256,5000,4,1,6 -102,25,1310,2620,131,12,24 -102,25,1310,2620,131,12,24 -74,50,2620,10480,30,12,24 -74,50,2620,10480,30,12,24 -138,56,5240,20970,30,12,24 -136,64,5240,20970,30,12,24 -23,50,500,2000,8,1,4 -29,50,1000,4000,8,1,5 -44,50,2000,8000,8,1,5 -30,50,1000,4000,8,3,5 -41,50,1000,8000,8,3,5 -74,50,2000,16000,8,3,5 -74,50,2000,16000,8,3,6 -74,50,2000,16000,8,3,6 -54,133,1000,12000,9,3,12 -41,133,1000,8000,9,3,12 -18,810,512,512,8,1,1 -28,810,1000,5000,0,1,1 -36,320,512,8000,4,1,5 -38,200,512,8000,8,1,8 -34,700,384,8000,0,1,1 -19,700,256,2000,0,1,1 -72,140,1000,16000,16,1,3 -36,200,1000,8000,0,1,2 -30,110,1000,4000,16,1,2 -56,110,1000,12000,16,1,2 -42,220,1000,8000,16,1,2 -34,800,256,8000,0,1,4 -34,800,256,8000,0,1,4 -34,800,256,8000,0,1,4 -34,800,256,8000,0,1,4 -34,800,256,8000,0,1,4 -19,125,512,1000,0,8,20 -75,75,2000,8000,64,1,38 -113,75,2000,16000,64,1,38 -157,75,2000,16000,128,1,38 -18,90,256,1000,0,3,10 -20,105,256,2000,0,3,10 -28,105,1000,4000,0,3,24 -33,105,2000,4000,8,3,19 -47,75,2000,8000,8,3,24 -54,75,3000,8000,8,3,48 -20,175,256,2000,0,3,24 -23,300,768,3000,0,6,24 -25,300,768,3000,6,6,24 -52,300,768,12000,6,6,24 -27,300,768,4500,0,1,24 -50,300,384,12000,6,1,24 -18,300,192,768,6,6,24 -53,180,768,12000,6,1,31 -23,330,1000,3000,0,2,4 -30,300,1000,4000,8,3,64 -73,300,1000,16000,8,2,112 -20,330,1000,2000,0,1,2 -25,330,1000,4000,0,3,6 -28,140,2000,4000,0,3,6 -29,140,2000,4000,0,4,8 -32,140,2000,4000,8,1,20 -175,140,2000,32000,32,1,20 -57,140,2000,8000,32,1,54 -181,140,2000,32000,32,1,54 -181,140,2000,32000,32,1,54 -32,140,2000,4000,8,1,20 -82,57,4000,16000,1,6,12 -171,57,4000,24000,64,12,16 -361,26,16000,32000,64,16,24 -350,26,16000,32000,64,8,24 -220,26,8000,32000,0,8,24 -113,26,8000,16000,0,8,16 -15,480,96,512,0,1,1 -21,203,1000,2000,0,1,5 -35,115,512,6000,16,1,6 -18,1100,512,1500,0,1,1 -20,1100,768,2000,0,1,1 -20,600,768,2000,0,1,1 -28,400,2000,4000,0,1,1 -45,400,4000,8000,0,1,1 -18,900,1000,1000,0,1,2 -17,900,512,1000,0,1,2 -26,900,1000,4000,4,1,2 -28,900,1000,4000,8,1,2 -28,900,2000,4000,0,3,6 -31,225,2000,4000,8,3,6 -31,225,2000,4000,8,3,6 -42,180,2000,8000,8,1,6 -76,185,2000,16000,16,1,6 -76,180,2000,16000,16,1,6 -26,225,1000,4000,2,3,6 -59,25,2000,12000,8,1,4 -65,25,2000,12000,16,3,5 -101,17,4000,16000,8,6,12 -116,17,4000,16000,32,6,12 -18,1500,768,1000,0,0,0 -20,1500,768,2000,0,0,0 -20,800,768,2000,0,0,0 -30,50,2000,4000,0,3,6 -44,50,2000,8000,8,3,6 -44,50,2000,8000,8,1,6 -82,50,2000,16000,24,1,6 -82,50,2000,16000,24,1,6 -128,50,8000,16000,48,1,10 -37,100,1000,8000,0,2,6 -46,100,1000,8000,24,2,6 -46,100,1000,8000,24,3,6 -80,50,2000,16000,12,3,16 -88,50,2000,16000,24,6,16 -88,50,2000,16000,24,6,16 -33,150,512,4000,0,8,128 -46,115,2000,8000,16,1,3 -29,115,2000,4000,2,1,5 -53,92,2000,8000,32,1,6 -53,92,2000,8000,32,1,6 -41,92,2000,8000,4,1,6 -86,75,4000,16000,16,1,6 -95,60,4000,16000,32,1,6 -107,60,2000,16000,64,5,8 -117,60,4000,16000,64,5,8 -119,50,4000,16000,64,5,10 -120,72,4000,16000,64,8,16 -48,72,2000,8000,16,6,8 -126,40,8000,16000,32,8,16 -266,40,8000,32000,64,8,24 -270,35,8000,32000,64,8,24 -426,38,16000,32000,128,16,32 -151,48,4000,24000,32,8,24 -267,38,8000,32000,64,8,24 -603,30,16000,32000,256,16,24 -19,112,1000,1000,0,1,4 -21,84,1000,2000,0,1,6 -26,56,1000,4000,0,1,6 -35,56,2000,6000,0,1,8 -41,56,2000,8000,0,1,8 -47,56,4000,8000,0,1,8 -62,56,4000,12000,0,1,8 -78,56,4000,16000,0,1,8 -80,38,4000,8000,32,16,32 -80,38,4000,8000,32,16,32 -142,38,8000,16000,64,4,8 -281,38,8000,24000,160,4,8 -190,38,4000,16000,128,16,32 -21,200,1000,2000,0,1,2 -25,200,1000,4000,0,1,4 -67,200,2000,8000,64,1,5 -24,250,512,4000,0,1,7 -24,250,512,4000,0,4,7 -64,250,1000,16000,1,1,8 -25,160,512,4000,2,1,5 -20,160,512,2000,2,3,8 -29,160,1000,4000,8,1,14 -43,160,1000,8000,16,1,14 -53,160,2000,8000,32,1,13 -19,240,512,1000,8,1,3 -22,240,512,2000,8,1,5 -31,105,2000,4000,8,3,8 -41,105,2000,6000,16,6,16 -47,105,2000,8000,16,4,14 -99,52,4000,16000,32,4,12 -67,70,4000,12000,8,6,8 -81,59,4000,12000,32,6,12 -149,59,8000,16000,64,12,24 -183,26,8000,24000,32,8,16 -275,26,8000,32000,64,12,16 -382,26,8000,32000,128,24,32 -56,116,2000,8000,32,5,28 -182,50,2000,32000,24,6,26 -227,50,2000,32000,48,26,52 -341,50,2000,32000,112,52,104 -360,50,4000,32000,112,52,104 -919,30,8000,64000,96,12,176 -978,30,8000,64000,128,12,176 -24,180,262,4000,0,1,3 -24,180,512,4000,0,1,3 -24,180,262,4000,0,1,3 -24,180,512,4000,0,1,3 -37,124,1000,8000,0,1,8 -50,98,1000,8000,32,2,8 -41,125,2000,8000,0,2,14 -47,480,512,8000,32,0,0 -25,480,1000,4000,0,0,0 http://git-wip-us.apache.org/repos/asf/ignite/blob/b42a5c59/examples/src/main/java/org/apache/ignite/examples/ml/knn/datasets/iris.txt ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/knn/datasets/iris.txt b/examples/src/main/java/org/apache/ignite/examples/ml/knn/datasets/iris.txt deleted file mode 100644 index 18f5f7c..0000000 --- a/examples/src/main/java/org/apache/ignite/examples/ml/knn/datasets/iris.txt +++ /dev/null @@ -1,150 +0,0 @@ -1.0 5.1 3.5 1.4 0.2 -1.0 4.9 3.0 1.4 0.2 -1.0 4.7 3.2 1.3 0.2 -1.0 4.6 3.1 1.5 0.2 -1.0 5.0 3.6 1.4 0.2 -1.0 5.4 3.9 1.7 0.4 -1.0 4.6 3.4 1.4 0.3 -1.0 5.0 3.4 1.5 0.2 -1.0 4.4 2.9 1.4 0.2 -1.0 4.9 3.1 1.5 0.1 -1.0 5.4 3.7 1.5 0.2 -1.0 4.8 3.4 1.6 0.2 -1.0 4.8 3.0 1.4 0.1 -1.0 4.3 3.0 1.1 0.1 -1.0 5.8 4.0 1.2 0.2 -1.0 5.7 4.4 1.5 0.4 -1.0 5.4 3.9 1.3 0.4 -1.0 5.1 3.5 1.4 0.3 -1.0 5.7 3.8 1.7 0.3 -1.0 5.1 3.8 1.5 0.3 -1.0 5.4 3.4 1.7 0.2 -1.0 5.1 3.7 1.5 0.4 -1.0 4.6 3.6 1.0 0.2 -1.0 5.1 3.3 1.7 0.5 -1.0 4.8 3.4 1.9 0.2 -1.0 5.0 3.0 1.6 0.2 -1.0 5.0 3.4 1.6 0.4 -1.0 5.2 3.5 1.5 0.2 -1.0 5.2 3.4 1.4 0.2 -1.0 4.7 3.2 1.6 0.2 -1.0 4.8 3.1 1.6 0.2 -1.0 5.4 3.4 1.5 0.4 -1.0 5.2 4.1 1.5 0.1 -1.0 5.5 4.2 1.4 0.2 -1.0 4.9 3.1 1.5 0.1 -1.0 5.0 3.2 1.2 0.2 -1.0 5.5 3.5 1.3 0.2 -1.0 4.9 3.1 1.5 0.1 -1.0 4.4 3.0 1.3 0.2 -1.0 5.1 3.4 1.5 0.2 -1.0 5.0 3.5 1.3 0.3 -1.0 4.5 2.3 1.3 0.3 -1.0 4.4 3.2 1.3 0.2 -1.0 5.0 3.5 1.6 0.6 -1.0 5.1 3.8 1.9 0.4 -1.0 4.8 3.0 1.4 0.3 -1.0 5.1 3.8 1.6 0.2 -1.0 4.6 3.2 1.4 0.2 -1.0 5.3 3.7 1.5 0.2 -1.0 5.0 3.3 1.4 0.2 -2.0 7.0 3.2 4.7 1.4 -2.0 6.4 3.2 4.5 1.5 -2.0 6.9 3.1 4.9 1.5 -2.0 5.5 2.3 4.0 1.3 -2.0 6.5 2.8 4.6 1.5 -2.0 5.7 2.8 4.5 1.3 -2.0 6.3 3.3 4.7 1.6 -2.0 4.9 2.4 3.3 1.0 -2.0 6.6 2.9 4.6 1.3 -2.0 5.2 2.7 3.9 1.4 -2.0 5.0 2.0 3.5 1.0 -2.0 5.9 3.0 4.2 1.5 -2.0 6.0 2.2 4.0 1.0 -2.0 6.1 2.9 4.7 1.4 -2.0 5.6 2.9 3.6 1.3 -2.0 6.7 3.1 4.4 1.4 -2.0 5.6 3.0 4.5 1.5 -2.0 5.8 2.7 4.1 1.0 -2.0 6.2 2.2 4.5 1.5 -2.0 5.6 2.5 3.9 1.1 -2.0 5.9 3.2 4.8 1.8 -2.0 6.1 2.8 4.0 1.3 -2.0 6.3 2.5 4.9 1.5 -2.0 6.1 2.8 4.7 1.2 -2.0 6.4 2.9 4.3 1.3 -2.0 6.6 3.0 4.4 1.4 -2.0 6.8 2.8 4.8 1.4 -2.0 6.7 3.0 5.0 1.7 -2.0 6.0 2.9 4.5 1.5 -2.0 5.7 2.6 3.5 1.0 -2.0 5.5 2.4 3.8 1.1 -2.0 5.5 2.4 3.7 1.0 -2.0 5.8 2.7 3.9 1.2 -2.0 6.0 2.7 5.1 1.6 -2.0 5.4 3.0 4.5 1.5 -2.0 6.0 3.4 4.5 1.6 -2.0 6.7 3.1 4.7 1.5 -2.0 6.3 2.3 4.4 1.3 -2.0 5.6 3.0 4.1 1.3 -2.0 5.5 2.5 4.0 1.3 -2.0 5.5 2.6 4.4 1.2 -2.0 6.1 3.0 4.6 1.4 -2.0 5.8 2.6 4.0 1.2 -2.0 5.0 2.3 3.3 1.0 -2.0 5.6 2.7 4.2 1.3 -2.0 5.7 3.0 4.2 1.2 -2.0 5.7 2.9 4.2 1.3 -2.0 6.2 2.9 4.3 1.3 -2.0 5.1 2.5 3.0 1.1 -2.0 5.7 2.8 4.1 1.3 -3.0 6.3 3.3 6.0 2.5 -3.0 5.8 2.7 5.1 1.9 -3.0 7.1 3.0 5.9 2.1 -3.0 6.3 2.9 5.6 1.8 -3.0 6.5 3.0 5.8 2.2 -3.0 7.6 3.0 6.6 2.1 -3.0 4.9 2.5 4.5 1.7 -3.0 7.3 2.9 6.3 1.8 -3.0 6.7 2.5 5.8 1.8 -3.0 7.2 3.6 6.1 2.5 -3.0 6.5 3.2 5.1 2.0 -3.0 6.4 2.7 5.3 1.9 -3.0 6.8 3.0 5.5 2.1 -3.0 5.7 2.5 5.0 2.0 -3.0 5.8 2.8 5.1 2.4 -3.0 6.4 3.2 5.3 2.3 -3.0 6.5 3.0 5.5 1.8 -3.0 7.7 3.8 6.7 2.2 -3.0 7.7 2.6 6.9 2.3 -3.0 6.0 2.2 5.0 1.5 -3.0 6.9 3.2 5.7 2.3 -3.0 5.6 2.8 4.9 2.0 -3.0 7.7 2.8 6.7 2.0 -3.0 6.3 2.7 4.9 1.8 -3.0 6.7 3.3 5.7 2.1 -3.0 7.2 3.2 6.0 1.8 -3.0 6.2 2.8 4.8 1.8 -3.0 6.1 3.0 4.9 1.8 -3.0 6.4 2.8 5.6 2.1 -3.0 7.2 3.0 5.8 1.6 -3.0 7.4 2.8 6.1 1.9 -3.0 7.9 3.8 6.4 2.0 -3.0 6.4 2.8 5.6 2.2 -3.0 6.3 2.8 5.1 1.5 -3.0 6.1 2.6 5.6 1.4 -3.0 7.7 3.0 6.1 2.3 -3.0 6.3 3.4 5.6 2.4 -3.0 6.4 3.1 5.5 1.8 -3.0 6.0 3.0 4.8 1.8 -3.0 6.9 3.1 5.4 2.1 -3.0 6.7 3.1 5.6 2.4 -3.0 6.9 3.1 5.1 2.3 -3.0 5.8 2.7 5.1 1.9 -3.0 6.8 3.2 5.9 2.3 -3.0 6.7 3.3 5.7 2.5 -3.0 6.7 3.0 5.2 2.3 -3.0 6.3 2.5 5.0 1.9 -3.0 6.5 3.0 5.2 2.0 -3.0 6.2 3.4 5.4 2.3 -3.0 5.9 3.0 5.1 1.8 http://git-wip-us.apache.org/repos/asf/ignite/blob/b42a5c59/examples/src/main/java/org/apache/ignite/examples/ml/knn/regression/KNNRegressionExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/knn/regression/KNNRegressionExample.java b/examples/src/main/java/org/apache/ignite/examples/ml/knn/regression/KNNRegressionExample.java index b52613a..ba079cc 100644 --- a/examples/src/main/java/org/apache/ignite/examples/ml/knn/regression/KNNRegressionExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/ml/knn/regression/KNNRegressionExample.java @@ -17,15 +17,13 @@ package org.apache.ignite.examples.ml.knn.regression; +import java.io.File; import java.io.IOException; -import java.net.URISyntaxException; -import java.net.URL; import java.nio.file.Path; -import java.nio.file.Paths; import org.apache.ignite.Ignite; import org.apache.ignite.Ignition; import org.apache.ignite.examples.ExampleNodeStartup; -import org.apache.ignite.examples.ml.knn.classification.KNNClassificationExample; +import org.apache.ignite.internal.util.IgniteUtils; import org.apache.ignite.ml.knn.models.KNNStrategy; import org.apache.ignite.ml.knn.regression.KNNMultipleLinearRegression; import org.apache.ignite.ml.math.distances.ManhattanDistance; @@ -54,7 +52,7 @@ public class KNNRegressionExample { private static final String SEPARATOR = ","; /** */ - private static final String KNN_CLEARED_MACHINES_TXT = "../datasets/cleared_machines.txt"; + private static final String KNN_CLEARED_MACHINES_TXT = "examples/src/main/resources/datasets/cleared_machines.txt"; /** * Executes example. @@ -72,11 +70,11 @@ public class KNNRegressionExample { try { // Prepare path to read - URL url = KNNClassificationExample.class.getResource(KNN_CLEARED_MACHINES_TXT); - if (url == null) - throw new RuntimeException("Can't get URL for: " + KNN_CLEARED_MACHINES_TXT); + File file = IgniteUtils.resolveIgnitePath(KNN_CLEARED_MACHINES_TXT); + if (file == null) + throw new RuntimeException("Can't find file: " + KNN_CLEARED_MACHINES_TXT); - Path path = Paths.get(url.toURI()); + Path path = file.toPath(); // Read dataset from file LabeledDataset dataset = LabeledDatasetLoader.loadFromTxtFile(path, SEPARATOR, false, false); @@ -141,7 +139,7 @@ public class KNNRegressionExample { System.out.println("\n>>> R^2 " + detCf); } - catch (URISyntaxException | IOException e) { + catch (IOException e) { e.printStackTrace(); System.out.println("\n>>> Unexpected exception, check resources: " + e); } http://git-wip-us.apache.org/repos/asf/ignite/blob/b42a5c59/examples/src/main/resources/datasets/README.md ---------------------------------------------------------------------- diff --git a/examples/src/main/resources/datasets/README.md b/examples/src/main/resources/datasets/README.md new file mode 100644 index 0000000..2f9c5ec --- /dev/null +++ b/examples/src/main/resources/datasets/README.md @@ -0,0 +1,2 @@ +iris.txt and cleared_machines are from Lichman, M. (2013). UCI Machine Learning Repository [http://archive.ics.uci.edu/ml]. Irvine, CA: University of California, School of Information and Computer Science. +Read more about machine dataset http://archive.ics.uci.edu/ml/machine-learning-databases/cpu-performance/machine.names \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/b42a5c59/examples/src/main/resources/datasets/cleared_machines.txt ---------------------------------------------------------------------- diff --git a/examples/src/main/resources/datasets/cleared_machines.txt b/examples/src/main/resources/datasets/cleared_machines.txt new file mode 100644 index 0000000..cf8b6b0 --- /dev/null +++ b/examples/src/main/resources/datasets/cleared_machines.txt @@ -0,0 +1,209 @@ +199,125,256,6000,256,16,128 +253,29,8000,32000,32,8,32 +253,29,8000,32000,32,8,32 +253,29,8000,32000,32,8,32 +132,29,8000,16000,32,8,16 +290,26,8000,32000,64,8,32 +381,23,16000,32000,64,16,32 +381,23,16000,32000,64,16,32 +749,23,16000,64000,64,16,32 +1238,23,32000,64000,128,32,64 +23,400,1000,3000,0,1,2 +24,400,512,3500,4,1,6 +70,60,2000,8000,65,1,8 +117,50,4000,16000,65,1,8 +15,350,64,64,0,1,4 +64,200,512,16000,0,4,32 +23,167,524,2000,8,4,15 +29,143,512,5000,0,7,32 +22,143,1000,2000,0,5,16 +124,110,5000,5000,142,8,64 +35,143,1500,6300,0,5,32 +39,143,3100,6200,0,5,20 +40,143,2300,6200,0,6,64 +45,110,3100,6200,0,6,64 +28,320,128,6000,0,1,12 +21,320,512,2000,4,1,3 +28,320,256,6000,0,1,6 +22,320,256,3000,4,1,3 +28,320,512,5000,4,1,5 +27,320,256,5000,4,1,6 +102,25,1310,2620,131,12,24 +102,25,1310,2620,131,12,24 +74,50,2620,10480,30,12,24 +74,50,2620,10480,30,12,24 +138,56,5240,20970,30,12,24 +136,64,5240,20970,30,12,24 +23,50,500,2000,8,1,4 +29,50,1000,4000,8,1,5 +44,50,2000,8000,8,1,5 +30,50,1000,4000,8,3,5 +41,50,1000,8000,8,3,5 +74,50,2000,16000,8,3,5 +74,50,2000,16000,8,3,6 +74,50,2000,16000,8,3,6 +54,133,1000,12000,9,3,12 +41,133,1000,8000,9,3,12 +18,810,512,512,8,1,1 +28,810,1000,5000,0,1,1 +36,320,512,8000,4,1,5 +38,200,512,8000,8,1,8 +34,700,384,8000,0,1,1 +19,700,256,2000,0,1,1 +72,140,1000,16000,16,1,3 +36,200,1000,8000,0,1,2 +30,110,1000,4000,16,1,2 +56,110,1000,12000,16,1,2 +42,220,1000,8000,16,1,2 +34,800,256,8000,0,1,4 +34,800,256,8000,0,1,4 +34,800,256,8000,0,1,4 +34,800,256,8000,0,1,4 +34,800,256,8000,0,1,4 +19,125,512,1000,0,8,20 +75,75,2000,8000,64,1,38 +113,75,2000,16000,64,1,38 +157,75,2000,16000,128,1,38 +18,90,256,1000,0,3,10 +20,105,256,2000,0,3,10 +28,105,1000,4000,0,3,24 +33,105,2000,4000,8,3,19 +47,75,2000,8000,8,3,24 +54,75,3000,8000,8,3,48 +20,175,256,2000,0,3,24 +23,300,768,3000,0,6,24 +25,300,768,3000,6,6,24 +52,300,768,12000,6,6,24 +27,300,768,4500,0,1,24 +50,300,384,12000,6,1,24 +18,300,192,768,6,6,24 +53,180,768,12000,6,1,31 +23,330,1000,3000,0,2,4 +30,300,1000,4000,8,3,64 +73,300,1000,16000,8,2,112 +20,330,1000,2000,0,1,2 +25,330,1000,4000,0,3,6 +28,140,2000,4000,0,3,6 +29,140,2000,4000,0,4,8 +32,140,2000,4000,8,1,20 +175,140,2000,32000,32,1,20 +57,140,2000,8000,32,1,54 +181,140,2000,32000,32,1,54 +181,140,2000,32000,32,1,54 +32,140,2000,4000,8,1,20 +82,57,4000,16000,1,6,12 +171,57,4000,24000,64,12,16 +361,26,16000,32000,64,16,24 +350,26,16000,32000,64,8,24 +220,26,8000,32000,0,8,24 +113,26,8000,16000,0,8,16 +15,480,96,512,0,1,1 +21,203,1000,2000,0,1,5 +35,115,512,6000,16,1,6 +18,1100,512,1500,0,1,1 +20,1100,768,2000,0,1,1 +20,600,768,2000,0,1,1 +28,400,2000,4000,0,1,1 +45,400,4000,8000,0,1,1 +18,900,1000,1000,0,1,2 +17,900,512,1000,0,1,2 +26,900,1000,4000,4,1,2 +28,900,1000,4000,8,1,2 +28,900,2000,4000,0,3,6 +31,225,2000,4000,8,3,6 +31,225,2000,4000,8,3,6 +42,180,2000,8000,8,1,6 +76,185,2000,16000,16,1,6 +76,180,2000,16000,16,1,6 +26,225,1000,4000,2,3,6 +59,25,2000,12000,8,1,4 +65,25,2000,12000,16,3,5 +101,17,4000,16000,8,6,12 +116,17,4000,16000,32,6,12 +18,1500,768,1000,0,0,0 +20,1500,768,2000,0,0,0 +20,800,768,2000,0,0,0 +30,50,2000,4000,0,3,6 +44,50,2000,8000,8,3,6 +44,50,2000,8000,8,1,6 +82,50,2000,16000,24,1,6 +82,50,2000,16000,24,1,6 +128,50,8000,16000,48,1,10 +37,100,1000,8000,0,2,6 +46,100,1000,8000,24,2,6 +46,100,1000,8000,24,3,6 +80,50,2000,16000,12,3,16 +88,50,2000,16000,24,6,16 +88,50,2000,16000,24,6,16 +33,150,512,4000,0,8,128 +46,115,2000,8000,16,1,3 +29,115,2000,4000,2,1,5 +53,92,2000,8000,32,1,6 +53,92,2000,8000,32,1,6 +41,92,2000,8000,4,1,6 +86,75,4000,16000,16,1,6 +95,60,4000,16000,32,1,6 +107,60,2000,16000,64,5,8 +117,60,4000,16000,64,5,8 +119,50,4000,16000,64,5,10 +120,72,4000,16000,64,8,16 +48,72,2000,8000,16,6,8 +126,40,8000,16000,32,8,16 +266,40,8000,32000,64,8,24 +270,35,8000,32000,64,8,24 +426,38,16000,32000,128,16,32 +151,48,4000,24000,32,8,24 +267,38,8000,32000,64,8,24 +603,30,16000,32000,256,16,24 +19,112,1000,1000,0,1,4 +21,84,1000,2000,0,1,6 +26,56,1000,4000,0,1,6 +35,56,2000,6000,0,1,8 +41,56,2000,8000,0,1,8 +47,56,4000,8000,0,1,8 +62,56,4000,12000,0,1,8 +78,56,4000,16000,0,1,8 +80,38,4000,8000,32,16,32 +80,38,4000,8000,32,16,32 +142,38,8000,16000,64,4,8 +281,38,8000,24000,160,4,8 +190,38,4000,16000,128,16,32 +21,200,1000,2000,0,1,2 +25,200,1000,4000,0,1,4 +67,200,2000,8000,64,1,5 +24,250,512,4000,0,1,7 +24,250,512,4000,0,4,7 +64,250,1000,16000,1,1,8 +25,160,512,4000,2,1,5 +20,160,512,2000,2,3,8 +29,160,1000,4000,8,1,14 +43,160,1000,8000,16,1,14 +53,160,2000,8000,32,1,13 +19,240,512,1000,8,1,3 +22,240,512,2000,8,1,5 +31,105,2000,4000,8,3,8 +41,105,2000,6000,16,6,16 +47,105,2000,8000,16,4,14 +99,52,4000,16000,32,4,12 +67,70,4000,12000,8,6,8 +81,59,4000,12000,32,6,12 +149,59,8000,16000,64,12,24 +183,26,8000,24000,32,8,16 +275,26,8000,32000,64,12,16 +382,26,8000,32000,128,24,32 +56,116,2000,8000,32,5,28 +182,50,2000,32000,24,6,26 +227,50,2000,32000,48,26,52 +341,50,2000,32000,112,52,104 +360,50,4000,32000,112,52,104 +919,30,8000,64000,96,12,176 +978,30,8000,64000,128,12,176 +24,180,262,4000,0,1,3 +24,180,512,4000,0,1,3 +24,180,262,4000,0,1,3 +24,180,512,4000,0,1,3 +37,124,1000,8000,0,1,8 +50,98,1000,8000,32,2,8 +41,125,2000,8000,0,2,14 +47,480,512,8000,32,0,0 +25,480,1000,4000,0,0,0 http://git-wip-us.apache.org/repos/asf/ignite/blob/b42a5c59/examples/src/main/resources/datasets/iris.txt ---------------------------------------------------------------------- diff --git a/examples/src/main/resources/datasets/iris.txt b/examples/src/main/resources/datasets/iris.txt new file mode 100644 index 0000000..18f5f7c --- /dev/null +++ b/examples/src/main/resources/datasets/iris.txt @@ -0,0 +1,150 @@ +1.0 5.1 3.5 1.4 0.2 +1.0 4.9 3.0 1.4 0.2 +1.0 4.7 3.2 1.3 0.2 +1.0 4.6 3.1 1.5 0.2 +1.0 5.0 3.6 1.4 0.2 +1.0 5.4 3.9 1.7 0.4 +1.0 4.6 3.4 1.4 0.3 +1.0 5.0 3.4 1.5 0.2 +1.0 4.4 2.9 1.4 0.2 +1.0 4.9 3.1 1.5 0.1 +1.0 5.4 3.7 1.5 0.2 +1.0 4.8 3.4 1.6 0.2 +1.0 4.8 3.0 1.4 0.1 +1.0 4.3 3.0 1.1 0.1 +1.0 5.8 4.0 1.2 0.2 +1.0 5.7 4.4 1.5 0.4 +1.0 5.4 3.9 1.3 0.4 +1.0 5.1 3.5 1.4 0.3 +1.0 5.7 3.8 1.7 0.3 +1.0 5.1 3.8 1.5 0.3 +1.0 5.4 3.4 1.7 0.2 +1.0 5.1 3.7 1.5 0.4 +1.0 4.6 3.6 1.0 0.2 +1.0 5.1 3.3 1.7 0.5 +1.0 4.8 3.4 1.9 0.2 +1.0 5.0 3.0 1.6 0.2 +1.0 5.0 3.4 1.6 0.4 +1.0 5.2 3.5 1.5 0.2 +1.0 5.2 3.4 1.4 0.2 +1.0 4.7 3.2 1.6 0.2 +1.0 4.8 3.1 1.6 0.2 +1.0 5.4 3.4 1.5 0.4 +1.0 5.2 4.1 1.5 0.1 +1.0 5.5 4.2 1.4 0.2 +1.0 4.9 3.1 1.5 0.1 +1.0 5.0 3.2 1.2 0.2 +1.0 5.5 3.5 1.3 0.2 +1.0 4.9 3.1 1.5 0.1 +1.0 4.4 3.0 1.3 0.2 +1.0 5.1 3.4 1.5 0.2 +1.0 5.0 3.5 1.3 0.3 +1.0 4.5 2.3 1.3 0.3 +1.0 4.4 3.2 1.3 0.2 +1.0 5.0 3.5 1.6 0.6 +1.0 5.1 3.8 1.9 0.4 +1.0 4.8 3.0 1.4 0.3 +1.0 5.1 3.8 1.6 0.2 +1.0 4.6 3.2 1.4 0.2 +1.0 5.3 3.7 1.5 0.2 +1.0 5.0 3.3 1.4 0.2 +2.0 7.0 3.2 4.7 1.4 +2.0 6.4 3.2 4.5 1.5 +2.0 6.9 3.1 4.9 1.5 +2.0 5.5 2.3 4.0 1.3 +2.0 6.5 2.8 4.6 1.5 +2.0 5.7 2.8 4.5 1.3 +2.0 6.3 3.3 4.7 1.6 +2.0 4.9 2.4 3.3 1.0 +2.0 6.6 2.9 4.6 1.3 +2.0 5.2 2.7 3.9 1.4 +2.0 5.0 2.0 3.5 1.0 +2.0 5.9 3.0 4.2 1.5 +2.0 6.0 2.2 4.0 1.0 +2.0 6.1 2.9 4.7 1.4 +2.0 5.6 2.9 3.6 1.3 +2.0 6.7 3.1 4.4 1.4 +2.0 5.6 3.0 4.5 1.5 +2.0 5.8 2.7 4.1 1.0 +2.0 6.2 2.2 4.5 1.5 +2.0 5.6 2.5 3.9 1.1 +2.0 5.9 3.2 4.8 1.8 +2.0 6.1 2.8 4.0 1.3 +2.0 6.3 2.5 4.9 1.5 +2.0 6.1 2.8 4.7 1.2 +2.0 6.4 2.9 4.3 1.3 +2.0 6.6 3.0 4.4 1.4 +2.0 6.8 2.8 4.8 1.4 +2.0 6.7 3.0 5.0 1.7 +2.0 6.0 2.9 4.5 1.5 +2.0 5.7 2.6 3.5 1.0 +2.0 5.5 2.4 3.8 1.1 +2.0 5.5 2.4 3.7 1.0 +2.0 5.8 2.7 3.9 1.2 +2.0 6.0 2.7 5.1 1.6 +2.0 5.4 3.0 4.5 1.5 +2.0 6.0 3.4 4.5 1.6 +2.0 6.7 3.1 4.7 1.5 +2.0 6.3 2.3 4.4 1.3 +2.0 5.6 3.0 4.1 1.3 +2.0 5.5 2.5 4.0 1.3 +2.0 5.5 2.6 4.4 1.2 +2.0 6.1 3.0 4.6 1.4 +2.0 5.8 2.6 4.0 1.2 +2.0 5.0 2.3 3.3 1.0 +2.0 5.6 2.7 4.2 1.3 +2.0 5.7 3.0 4.2 1.2 +2.0 5.7 2.9 4.2 1.3 +2.0 6.2 2.9 4.3 1.3 +2.0 5.1 2.5 3.0 1.1 +2.0 5.7 2.8 4.1 1.3 +3.0 6.3 3.3 6.0 2.5 +3.0 5.8 2.7 5.1 1.9 +3.0 7.1 3.0 5.9 2.1 +3.0 6.3 2.9 5.6 1.8 +3.0 6.5 3.0 5.8 2.2 +3.0 7.6 3.0 6.6 2.1 +3.0 4.9 2.5 4.5 1.7 +3.0 7.3 2.9 6.3 1.8 +3.0 6.7 2.5 5.8 1.8 +3.0 7.2 3.6 6.1 2.5 +3.0 6.5 3.2 5.1 2.0 +3.0 6.4 2.7 5.3 1.9 +3.0 6.8 3.0 5.5 2.1 +3.0 5.7 2.5 5.0 2.0 +3.0 5.8 2.8 5.1 2.4 +3.0 6.4 3.2 5.3 2.3 +3.0 6.5 3.0 5.5 1.8 +3.0 7.7 3.8 6.7 2.2 +3.0 7.7 2.6 6.9 2.3 +3.0 6.0 2.2 5.0 1.5 +3.0 6.9 3.2 5.7 2.3 +3.0 5.6 2.8 4.9 2.0 +3.0 7.7 2.8 6.7 2.0 +3.0 6.3 2.7 4.9 1.8 +3.0 6.7 3.3 5.7 2.1 +3.0 7.2 3.2 6.0 1.8 +3.0 6.2 2.8 4.8 1.8 +3.0 6.1 3.0 4.9 1.8 +3.0 6.4 2.8 5.6 2.1 +3.0 7.2 3.0 5.8 1.6 +3.0 7.4 2.8 6.1 1.9 +3.0 7.9 3.8 6.4 2.0 +3.0 6.4 2.8 5.6 2.2 +3.0 6.3 2.8 5.1 1.5 +3.0 6.1 2.6 5.6 1.4 +3.0 7.7 3.0 6.1 2.3 +3.0 6.3 3.4 5.6 2.4 +3.0 6.4 3.1 5.5 1.8 +3.0 6.0 3.0 4.8 1.8 +3.0 6.9 3.1 5.4 2.1 +3.0 6.7 3.1 5.6 2.4 +3.0 6.9 3.1 5.1 2.3 +3.0 5.8 2.7 5.1 1.9 +3.0 6.8 3.2 5.9 2.3 +3.0 6.7 3.3 5.7 2.5 +3.0 6.7 3.0 5.2 2.3 +3.0 6.3 2.5 5.0 1.9 +3.0 6.5 3.0 5.2 2.0 +3.0 6.2 3.4 5.4 2.3 +3.0 5.9 3.0 5.1 1.8 http://git-wip-us.apache.org/repos/asf/ignite/blob/b42a5c59/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index c937227..0d6729e 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -844,9 +844,7 @@ <exclude>src/main/java/org/apache/ignite/examples/streaming/wordcount/*.txt</exclude><!--books examples--> <exclude>examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/*.txt</exclude><!--books examples--> <exclude>src/main/resources/person.csv</exclude><!--CacheLoadOnlyStoreExample csv--> - <exclude>**/resources/datasets/knn/*</exclude><!--Dataset examples in ml module--> - <exclude>**/resources/datasets/regression/*</exclude><!--Dataset examples in ml module--> - <exclude>**/ml/knn/datasets/*</exclude><!--Datasets for ML KNN in examples module--> + <exclude>**/resources/datasets/**/*</exclude><!--KNN Datasets in ml module--> <exclude>examples/src/main/resources/person.csv</exclude><!--CacheLoadOnlyStoreExample csv--> <exclude>src/main/java/org/jetbrains/annotations/*.java</exclude><!--copyright--> <exclude>dev-tools/IGNITE-*.patch</exclude>
