Skip to content

Commit f480915

Browse files
committed
fixed few examples, many of themneeds to get fixed after last changes...
1 parent 0f28676 commit f480915

File tree

7 files changed

+27
-47
lines changed

7 files changed

+27
-47
lines changed

pom.xml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,19 @@
1616
<dependencies>
1717
<dependency>
1818
<groupId>javax.visrec</groupId>
19+
<artifactId>jsr381-examples</artifactId>
20+
<version>1</version>
21+
<type>jar</type>
22+
</dependency>
23+
<dependency>
24+
<groupId>${project.groupId}</groupId>
1925
<artifactId>visrec-api</artifactId>
20-
<version>1.0.1</version>
26+
<version>1.0.1-SNAPSHOT</version>
2127
</dependency>
2228
<dependency>
23-
<groupId>javax.visrec</groupId>
29+
<groupId>${project.groupId}</groupId>
2430
<artifactId>visrec-ri</artifactId>
25-
<version>1.0.1</version>
31+
<version>1.0.2-SNAPSHOT</version>
2632
</dependency>
2733
</dependencies>
2834

src/main/java/jsr381/example/CatDogRecognition.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@
88
import java.util.Map;
99

1010
import javax.imageio.ImageIO;
11-
import javax.visrec.ml.ClassifierCreationException;
11+
1212
import javax.visrec.ml.classification.ImageClassifier;
1313
import javax.visrec.ml.classification.NeuralNetImageClassifier;
14+
import javax.visrec.ml.model.ModelCreationException;
1415

1516
import jsr381.example.util.DataSetExamples;
1617

@@ -19,7 +20,7 @@
1920
*
2021
*/
2122
public class CatDogRecognition {
22-
public static void main(String[] args) throws ClassifierCreationException, IOException {
23+
public static void main(String[] args) throws IOException, ModelCreationException {
2324
// Download the dataset and calculate how much time it took
2425
long start = System.currentTimeMillis();
2526
DataSetExamples.ExampleDataSet dataSet = DataSetExamples.getCatDogDataSet();
@@ -28,8 +29,8 @@ public static void main(String[] args) throws ClassifierCreationException, IOExc
2829

2930
// Configuration to train the model
3031
ImageClassifier<BufferedImage> classifier = NeuralNetImageClassifier.builder().inputClass(BufferedImage.class)
31-
.imageHeight(128).imageWidth(128).labelsFile(dataSet.getLabelsFile())
32-
.trainingFile(dataSet.getTrainingFile())
32+
.imageHeight(128).imageWidth(128).labelsFile(dataSet.getLabelsFile().toPath())
33+
.trainingFile(dataSet.getTrainingFile().toPath())
3334
//.trainingFile(new File("catdog_arch.json"))
3435
.exportModel(Paths.get("catdog.dnet")).maxError(0.03f).maxEpochs(1000).learningRate(0.01f).build();
3536

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,16 @@
44
import java.io.IOException;
55
import java.net.URL;
66

7-
import javax.visrec.ml.ClassifierCreationException;
87
import javax.visrec.ml.classification.BinaryClassifier;
8+
import javax.visrec.ml.classification.Classifiable;
99
import javax.visrec.ml.classification.NeuralNetBinaryClassifier;
1010

11-
import jsr381.example.spam.Classifiable;
12-
1311
/**
1412
* @author Nishant
1513
*
1614
*/
1715
public class CreditCardFraudDetection {
18-
public static void main(String[] args) throws IOException, ClassifierCreationException {
16+
public static void main(String[] args) throws IOException {
1917
// create data set from specified file
2018
URL fraudCsvResource = CreditCardFraudDetection.class.getClassLoader().getResource("creditcard.csv");
2119
if (fraudCsvResource == null) {
@@ -25,7 +23,7 @@ public static void main(String[] args) throws IOException, ClassifierCreationExc
2523
// Build binary classifer based on neural network
2624
BinaryClassifier<float[]> fraudClassifier = NeuralNetBinaryClassifier.builder().inputClass(float[].class)
2725
.inputsNum(29).hiddenLayers(29, 15).maxError(0.03f).maxEpochs(15000).learningRate(0.001f)
28-
.trainingFile(new File(fraudCsvResource.getFile())).build();
26+
.trainingPath((new File(fraudCsvResource.getFile()))).build();
2927
Float result = fraudClassifier.classify(new CreditCardFraud().getClassifierInput());
3028
System.out.println(result);
3129
}

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import java.io.IOException;
1212
import java.nio.file.Paths;
1313
import java.util.Map;
14+
import javax.visrec.ml.model.ModelCreationException;
1415

1516
/**
1617
* Hand written digit recognition using MNIST data set - image classification hello world.
@@ -19,16 +20,16 @@
1920
*/
2021
public class Duke {
2122

22-
public static void main(String[] args) throws IOException, ClassifierCreationException, ClassificationException {
23+
public static void main(String[] args) throws IOException, ModelCreationException {
2324

2425
// Configure and train ML model to classify images
2526
ImageClassifier<BufferedImage> classifier = NeuralNetImageClassifier.builder()
2627
.inputClass(BufferedImage.class)
2728
.imageHeight(64)
2829
.imageWidth(64)
29-
.labelsFile(new File("datasets/duke_and_nonduke/labels.txt")) // category labels
30-
.trainingFile(new File("datasets/duke_and_nonduke/index.txt")) // list of images
31-
.networkArchitecture(new File("src/main/resources/duke_net.json"))
30+
.labelsFile(Paths.get("datasets/duke_and_nonduke/labels.txt")) // category labels
31+
.trainingFile(Paths.get("datasets/duke_and_nonduke/index.txt")) // list of images
32+
.networkArchitecture(Paths.get("src/main/resources/duke_net.json"))
3233
.exportModel(Paths.get("duke.dnet"))
3334
.maxError(0.05f)
3435
.maxEpochs(1000)

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

Lines changed: 0 additions & 28 deletions
This file was deleted.

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

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

3+
import javax.visrec.ml.classification.Classifiable;
4+
35
/**
46
* Example Email class that implements Classifiable interface in order to enable classification of its instances.
57
* It should wrap instance of some email, and provide interface that will allow building classifiers.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ public static void main(String[] args) throws IOException, ClassificationExcepti
4040
Float result = spamClassifier.classify(testEmail);
4141
System.out.println(result);
4242

43-
Email email2=null;
44-
BinaryClassifier<Email> spamClassifier2 =null;
45-
float spamProbability = spamClassifier2.classify(email2);
43+
Email email2=new Email("Some email string ...");
44+
//BinaryClassifier<Email> spamClassifier2 =null;
45+
float spamProbability = spamClassifier.classify(email2.getClassifierInput());
4646
}
4747

4848
static float[] getExampleEmailToClassify() {

0 commit comments

Comments
 (0)