Merge pull request #7 from PacktPublishing/ch4-fix

chapter 4 source code fix

Author: rahul-raj

04_Building Convolutional Neural Networks/sourceCode/cookbookapp/.gitignore

@@ -6,4 +6,5 @@ cookbook-app.ipr
 cookbookapp.iml
 dependency-reduced-pom.xml
 model.zip
-LocalExecuteExample.csv
+LocalExecuteExample.csv
+cookbookapp-cnn.iml

04_Building Convolutional Neural Networks/sourceCode/cookbookapp/cnntrainedmodel.zip

@@ -37,7 +37,7 @@
  <archive>
  <manifest>
  <mainClass>
- com.javadeeplearningcookbook.examples.CustomerRetentionPredictionExample
+ com.javadeeplearningcookbook.examples.AnimalClassifier
  </mainClass>
  </manifest>
  </archive>
@@ -59,7 +59,7 @@
  implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer" />
  <transformer
  implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
- <mainClass>com.javadeeplearningcookbook.examples.CustomerRetentionPredictionExample</mainClass>
+ <mainClass>com.javadeeplearningcookbook.examples.AnimalClassifier</mainClass>
  </transformer>
  </transformers>
  </configuration>

04_Building Convolutional Neural Networks/sourceCode/cookbookapp/pom.xml

@@ -9,17 +9,19 @@
 import org.deeplearning4j.util.ModelSerializer;
 import org.nd4j.linalg.api.ndarray.INDArray;
 import org.nd4j.linalg.dataset.api.iterator.DataSetIterator;
+import org.nd4j.linalg.dataset.api.preprocessor.ImagePreProcessingScaler;
 import org.nd4j.linalg.dataset.api.preprocessor.NormalizerStandardize;
 
 import java.io.File;
 import java.io.IOException;
 
-public class AnimalClassifierAPI {
+public class ImageClassifierAPI {
  public static INDArray generateOutput(File file) throws IOException, InterruptedException {
- final File modelFile = new File("cnntrainedmodel.zip");
+ //retrieve the saved model
+ final File modelFile = new File("D:\\cnntrainedmodel.zip");
  final MultiLayerNetwork model = ModelSerializer.restoreMultiLayerNetwork(modelFile);
  final RecordReader imageRecordReader = generateReader(file);
- final NormalizerStandardize normalizerStandardize = ModelSerializer.restoreNormalizerFromFile(modelFile);
+ final ImagePreProcessingScaler normalizerStandardize = ModelSerializer.restoreNormalizerFromFile(modelFile);
  final DataSetIterator dataSetIterator = new RecordReaderDataSetIterator.Builder(imageRecordReader,1).build();
  normalizerStandardize.fit(dataSetIterator);
  dataSetIterator.setPreProcessor(normalizerStandardize);
@@ -34,10 +36,10 @@ private static RecordReader generateReader(File file) throws IOException, Interr
  }
 
  public static void main(String[] args) throws IOException, InterruptedException {
- final File file = new File("sample.png");
+ final File file = new File("D:\\dataset\\Beagle\\beagle_7.jpg");
  final INDArray results = generateOutput(file);
+ System.out.println(results);
  }
 }
 
 
-

04_Building Convolutional Neural Networks/sourceCode/cookbookapp/src/main/java/com/javadeeplearningcookbook/api/AnimalClassifierAPI.java renamed to 04_Building Convolutional Neural Networks/sourceCode/cookbookapp/src/main/java/com/javadeeplearningcookbook/api/ImageClassifierAPI.java

@@ -51,7 +51,7 @@ public static void main(String[] args) throws Exception {
  int batchSize=10;
 
  //load files and split
- File parentDir = new File("C:\\Users\\Admin\\dl4j-examples\\dl4j-examples\\src\\main\\resources\\animals");
+ File parentDir = new File("D:\\dataset");
  FileSplit fileSplit = new FileSplit(parentDir, NativeImageLoader.ALLOWED_FORMATS,new Random(42));
  int numLabels = fileSplit.getRootDir().listFiles(File::isDirectory).length;
 

04_Building Convolutional Neural Networks/sourceCode/cookbookapp/src/main/java/com/javadeeplearningcookbook/examples/AnimalClassifier.java

@@ -27,3 +27,15 @@ HELP.md
 
 ### VS Code ###
 .vscode/
+
+.idea
+*.tmp
+target
+cookbook-app.iml
+cookbook-app.iws
+cookbook-app.ipr
+cookbookapp.iml
+cookbookapp-cnn.iml
+dependency-reduced-pom.xml
+model.zip
+LocalExecuteExample.csv

04_Building Convolutional Neural Networks/sourceCode/cookbookapp/src/main/resources/cnntrainedmodel.zip

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 <modelVersion>4.0.0</modelVersion>
 <parent>
 <groupId>org.springframework.boot</groupId>
@@ -29,7 +29,7 @@
 </dependency>
 <dependency>
 <groupId>com.javadeeplearningcookbook.app</groupId>
-<artifactId>cookbookapp</artifactId>
+<artifactId>cookbookapp-cnn</artifactId>
 <version>1.0-SNAPSHOT</version>
 </dependency>
 

04_Building Convolutional Neural Networks/sourceCode/spring-dl4j/.gitignore

@@ -3,6 +3,7 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
+//Run this only after building project 'cookbookapp-cnn' and jar file is created.
 @SpringBootApplication
 public class SpringDl4jApplication {
 

04_Building Convolutional Neural Networks/sourceCode/spring-dl4j/pom.xml

@@ -1,12 +1,13 @@
 package com.springdl4j.springdl4j.service;
 
-import com.javadeeplearningcookbook.api.CustomerRetentionPredictionApi;
+import com.javadeeplearningcookbook.api.ImageClassifierAPI;
 import org.nd4j.linalg.api.ndarray.INDArray;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
 import java.io.IOException;
+import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -18,14 +19,16 @@ public List<String> generateStringOutput(MultipartFile multipartFile) throws IOE
  final List<String> results = new ArrayList<>();
  File convFile = File.createTempFile(multipartFile.getOriginalFilename(),null, new File(System.getProperty("user.dir")+"/"));
  multipartFile.transferTo(convFile);
- INDArray indArray = AnimalClassifierAPI.generateOutput(convFile);
+ INDArray indArray = ImageClassifierAPI.generateOutput(convFile);
+ DecimalFormat df2 = new DecimalFormat("#.####");
  for(int i=0; i<indArray.rows();i++){
- if(indArray.getDouble(i,0)>indArray.getDouble(i,1)){
- results.add("Customer "+(i+1)+"-> Happy Customer \n");
- }
- else{
- results.add("Customer "+(i+1)+"-> Unhappy Customer \n");
+ String result="Image "+String.valueOf(i)+"->>>>>";
+ for(int j=0;j<indArray.columns();j++){
+ result+="\n Category "+j+": "+df2.format(indArray.getDouble(i,j)*100)+"%, ";
  }
+ result+="\n\n";
+ results.add(result);
+
  }
  convFile.deleteOnExit();