Skip to content

Commit f6ef810

Browse files
deepnettsdeepnetts
deepnetts
authored and
deepnetts
committed
fixed all the examples, after last refactoring
1 parent f480915 commit f6ef810

7 files changed

+23
-23
lines changed

src/main/java/jsr381/example/CreditCardFraudDetection.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,19 @@
33
import java.io.File;
44
import java.io.IOException;
55
import java.net.URL;
6+
import java.nio.file.Paths;
67

78
import javax.visrec.ml.classification.BinaryClassifier;
89
import javax.visrec.ml.classification.Classifiable;
910
import javax.visrec.ml.classification.NeuralNetBinaryClassifier;
11+
import javax.visrec.ml.model.ModelCreationException;
1012

1113
/**
1214
* @author Nishant
1315
*
1416
*/
1517
public class CreditCardFraudDetection {
16-
public static void main(String[] args) throws IOException {
18+
public static void main(String[] args) throws IOException, ModelCreationException {
1719
// create data set from specified file
1820
URL fraudCsvResource = CreditCardFraudDetection.class.getClassLoader().getResource("creditcard.csv");
1921
if (fraudCsvResource == null) {
@@ -23,7 +25,7 @@ public static void main(String[] args) throws IOException {
2325
// Build binary classifer based on neural network
2426
BinaryClassifier<float[]> fraudClassifier = NeuralNetBinaryClassifier.builder().inputClass(float[].class)
2527
.inputsNum(29).hiddenLayers(29, 15).maxError(0.03f).maxEpochs(15000).learningRate(0.001f)
26-
.trainingPath((new File(fraudCsvResource.getFile()))).build();
28+
.trainingPath(Paths.get(fraudCsvResource.getFile())).build();
2729
Float result = fraudClassifier.classify(new CreditCardFraud().getClassifierInput());
2830
System.out.println(result);
2931
}

src/main/java/jsr381/example/Duke.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33

44
import javax.imageio.ImageIO;
5-
import javax.visrec.ml.ClassificationException;
6-
import javax.visrec.ml.ClassifierCreationException;
75
import javax.visrec.ml.classification.ImageClassifier;
86
import javax.visrec.ml.classification.NeuralNetImageClassifier;
97
import java.awt.image.BufferedImage;

src/main/java/jsr381/example/IrisFlowersClassificationExample.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,14 @@
33
import deepnetts.data.DataSets;
44
import jsr381.example.util.DataSetExamples;
55

6-
import javax.visrec.ml.ClassificationException;
76
import javax.visrec.ml.classification.MultiClassClassifier;
87
import javax.visrec.ml.data.DataSet;
98
import javax.visrec.ri.ml.classification.MultiClassClassifierNetwork;
109
import java.io.IOException;
1110
import java.util.Map;
1211

1312
public class IrisFlowersClassificationExample {
14-
public static void main(String[] args) throws IOException, ClassificationException {
13+
public static void main(String[] args) throws IOException {
1514

1615
// Load iris data set
1716
DataSet dataSet = DataSetExamples.getIrisClassificationDataSet();

src/main/java/jsr381/example/LogisticRegressionExample.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
import jsr381.example.util.DataSetExamples;
55
import javax.visrec.ri.ml.regression.LogisticRegressionNetwork;
66

7-
import javax.visrec.ml.ClassificationException;
7+
88
import javax.visrec.ml.data.DataSet;
9-
import javax.visrec.ml.regression.LogisticRegression;
109
import java.io.IOException;
1110
import java.util.Map;
11+
import javax.visrec.ml.classification.LogisticRegression;
1212

1313
/**
1414
* This example shows how to instantiate, train, evaluate and use Logistic Regression using Machine Learning Layer from VisRec API.
@@ -17,7 +17,7 @@
1717
*/
1818
public class LogisticRegressionExample {
1919

20-
public static void main(String[] args) throws IOException, ClassificationException {
20+
public static void main(String[] args) throws IOException{
2121

2222
// Get the DataSet from file location
2323
DataSet dataSet = DataSetExamples.getSonarDataSet();

src/main/java/jsr381/example/MnistExample.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
import jsr381.example.util.DataSetExamples;
44

5-
import javax.visrec.ml.ClassificationException;
6-
import javax.visrec.ml.ClassifierCreationException;
75
import javax.visrec.ml.classification.ImageClassifier;
86
import javax.visrec.ml.classification.NeuralNetImageClassifier;
97
import java.awt.image.BufferedImage;
@@ -12,6 +10,8 @@
1210
import java.net.URL;
1311
import java.util.HashMap;
1412
import java.util.Map;
13+
import javax.imageio.ImageIO;
14+
import javax.visrec.ml.model.ModelCreationException;
1515

1616
/**
1717
* Handwritten digit recognition using MNIST data set - image classification hello world.
@@ -21,7 +21,7 @@
2121
@Deprecated
2222
public class MnistExample {
2323

24-
public static void main(String[] args) throws IOException, ClassificationException, ClassifierCreationException {
24+
public static void main(String[] args) throws IOException, ModelCreationException {
2525
// Download the dataset and calculate how much time it took
2626
long start = System.currentTimeMillis();
2727
DataSetExamples.ExampleDataSet dataSet = DataSetExamples.getMnistDataSet();
@@ -57,7 +57,9 @@ public static void main(String[] args) throws IOException, ClassificationExcepti
5757
if (input == null) {
5858
throw new IOException("Input file not found in resources");
5959
}
60-
Map<String, Float> results = imageClassifier.classify(new File(input.getFile()));
60+
61+
BufferedImage testImg = ImageIO.read(new File(input.getFile()));
62+
Map<String, Float> results = imageClassifier.classify(testImg);
6163

6264
// Print the outcome
6365
System.out.println(results);

src/main/java/jsr381/example/MnistWithBuildingBlocksExample.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
import jsr381.example.util.DataSetExamples;
44

55
import javax.imageio.ImageIO;
6-
import javax.visrec.ml.ClassificationException;
7-
import javax.visrec.ml.ClassifierCreationException;
86
import javax.visrec.ml.classification.ImageClassifier;
97
import javax.visrec.ml.classification.NeuralNetImageClassifier;
108
import java.awt.image.BufferedImage;
@@ -13,6 +11,7 @@
1311
import java.net.URL;
1412
import java.nio.file.Paths;
1513
import java.util.Map;
14+
import javax.visrec.ml.model.ModelCreationException;
1615

1716
/**
1817
* Hand written digit recognition using MNIST data set - image classification hello world.
@@ -21,7 +20,7 @@
2120
*/
2221
public class MnistWithBuildingBlocksExample {
2322

24-
public static void main(String[] args) throws IOException, ClassifierCreationException, ClassificationException {
23+
public static void main(String[] args) throws IOException, ModelCreationException {
2524
// Download the dataset and calculate how much time it took
2625
long start = System.currentTimeMillis();
2726
DataSetExamples.ExampleDataSet dataSet = DataSetExamples.getMnistDataSet();
@@ -32,9 +31,9 @@ public static void main(String[] args) throws IOException, ClassifierCreationExc
3231
.inputClass(BufferedImage.class)
3332
.imageHeight(28)
3433
.imageWidth(28)
35-
.labelsFile(dataSet.getLabelsFile())
36-
.trainingFile(dataSet.getTrainingFile())
37-
.networkArchitecture(new File("src/main/resources/mnist_arch.json")) //change this not in data set but from jsin file in resources folder?
34+
.labelsFile(dataSet.getLabelsFile().toPath())
35+
.trainingFile(dataSet.getTrainingFile().toPath())
36+
.networkArchitecture(Paths.get("src/main/resources/mnist_arch.json")) //change this not in data set but from jsin file in resources folder?
3837
.exportModel(Paths.get("mnist.dnet"))
3938
.maxError(0.05f)
4039
.maxEpochs(3)

src/main/java/jsr381/example/spam/SpamClassificationExample.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package jsr381.example.spam;
22

3-
import javax.visrec.ml.ClassificationException;
4-
import javax.visrec.ml.ClassifierCreationException;
53
import javax.visrec.ml.classification.BinaryClassifier;
64
import javax.visrec.ml.classification.NeuralNetBinaryClassifier;
75
import java.io.File;
86
import java.io.IOException;
97
import java.net.URL;
8+
import java.nio.file.Paths;
9+
import javax.visrec.ml.model.ModelCreationException;
1010

1111
/**
1212
* Minimum example for creating binary classifier from CSV file.
@@ -16,7 +16,7 @@
1616
*/
1717
public class SpamClassificationExample {
1818

19-
public static void main(String[] args) throws IOException, ClassificationException, ClassifierCreationException {
19+
public static void main(String[] args) throws IOException, ModelCreationException {
2020

2121
// create data set from specified file
2222
URL spamCsvResource = SpamClassificationExample.class.getClassLoader().getResource("spam.csv");
@@ -32,7 +32,7 @@ public static void main(String[] args) throws IOException, ClassificationExcepti
3232
.maxError(0.03f)
3333
.maxEpochs(15000)
3434
.learningRate(0.01f)
35-
.trainingFile(new File(spamCsvResource.getFile()))
35+
.trainingPath(Paths.get(spamCsvResource.getFile()))
3636
.build();
3737

3838
// using trained classifier

0 commit comments

Comments
 (0)