wip.

Signed-off-by: Robert Altena <[email protected]>

Author: RobAltena

dl4j-examples/src/main/java/org/deeplearning4j/examples/convolution/Cifar.java

@@ -1,4 +1,4 @@
-/*******************************************************************************
+/* *****************************************************************************
  * Copyright (c) 2015-2019 Skymind, Inc.
  *
  * This program and the accompanying materials are made available under the
@@ -43,8 +43,6 @@
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
-import java.io.IOException;
-
 
 /**
  * train model by cifar
@@ -55,8 +53,8 @@
  */
 
 //@Slf4j
+@SuppressWarnings("FieldCanBeLocal")
 public class Cifar {
-    private static final File DATA_PATH = new File(System.getProperty("user.dir"));
     protected static final Logger log = LoggerFactory.getLogger(Cifar.class);
 
     private static int height = 32;
@@ -89,7 +87,7 @@ public static void main(String[] args) throws Exception {
     }
 
 
-    public MultiLayerNetwork getModel() throws IOException {
+    public MultiLayerNetwork getModel()  {
         log.info("Building simple convolutional network...");
         MultiLayerConfiguration conf = new NeuralNetConfiguration.Builder()
             .seed(seed)

dl4j-examples/src/main/java/org/deeplearning4j/examples/convolution/LenetMnistExample.java

@@ -1,4 +1,4 @@
-/*******************************************************************************
+/* *****************************************************************************
  * Copyright (c) 2015-2019 Skymind, Inc.
  *
  * This program and the accompanying materials are made available under the

dl4j-examples/src/main/java/org/deeplearning4j/examples/dataexamples/BasicCSVClassifier.java

@@ -1,4 +1,4 @@
-/*******************************************************************************
+/* *****************************************************************************
  * Copyright (c) 2015-2019 Skymind, Inc.
  *
  * This program and the accompanying materials are made available under the
@@ -70,6 +70,7 @@ public class BasicCSVClassifier {
 
     public static String dataLocalPath;
 
+    @SuppressWarnings("DuplicatedCode")
     public static void main(String[] args) throws Exception {
         dataLocalPath = DownloaderUtility.DATAEXAMPLES.Download();
         eats = readEnumCSV("animals/eats.csv");
@@ -141,12 +142,12 @@ public static void main(String[] args) throws Exception {
         logAnimals(animals);
     }
 
-    public static void logAnimals(Map<Integer, Map<String, Object>> animals) {
+    private static void logAnimals(Map<Integer, Map<String, Object>> animals) {
         for (Map<String, Object> a : animals.values())
             log.info(a.toString());
     }
 
-    public static void setFittedClassifiers(INDArray output, Map<Integer, Map<String, Object>> animals) {
+    private static void setFittedClassifiers(INDArray output, Map<Integer, Map<String, Object>> animals) {
         for (int i = 0; i < output.rows(); i++) {
 
             // set the classification from the fitted results
@@ -159,11 +160,8 @@ public static void setFittedClassifiers(INDArray output, Map<Integer, Map<String
      * This method is to show how to convert the INDArray to a float array. This is to
      * provide some more examples on how to convert INDArray to types that are more java
      * centric.
-     *
-     * @param rowSlice
-     * @return
      */
-    public static float[] getFloatArrayFromSlice(INDArray rowSlice) {
+    private static float[] getFloatArrayFromSlice(INDArray rowSlice) {
         float[] result = new float[rowSlice.columns()];
         for (int i = 0; i < rowSlice.columns(); i++) {
             result[i] = rowSlice.getFloat(i);
@@ -174,11 +172,8 @@ public static float[] getFloatArrayFromSlice(INDArray rowSlice) {
     /**
      * find the maximum item index. This is used when the data is fitted and we
      * want to determine which class to assign the test row to
-     *
-     * @param vals
-     * @return
      */
-    public static int maxIndex(float[] vals) {
+    private static int maxIndex(float[] vals) {
         int maxIndex = 0;
         for (int i = 1; i < vals.length; i++) {
             float newnumber = vals[i];
@@ -192,17 +187,14 @@ public static int maxIndex(float[] vals) {
     /**
      * take the dataset loaded for the matric and make the record model out of it so
      * we can correlate the fitted classifier to the record.
-     *
-     * @param testData
-     * @return
      */
-    public static Map<Integer, Map<String, Object>> makeAnimalsForTesting(DataSet testData) {
+    private static Map<Integer, Map<String, Object>> makeAnimalsForTesting(DataSet testData) {
         Map<Integer, Map<String, Object>> animals = new HashMap<>();
 
         INDArray features = testData.getFeatures();
         for (int i = 0; i < features.rows(); i++) {
             INDArray slice = features.slice(i);
-            Map<String, Object> animal = new HashMap();
+            Map<String, Object> animal = new HashMap<>();
 
             //set the attributes
             animal.put("yearsLived", slice.getInt(0));
@@ -216,7 +208,7 @@ public static Map<Integer, Map<String, Object>> makeAnimalsForTesting(DataSet te
     }
 
 
-    public static Map<Integer, String> readEnumCSV(String csvFileClasspath) {
+    private static Map<Integer, String> readEnumCSV(String csvFileClasspath) {
         try {
             List<String> lines = IOUtils.readLines(new FileInputStream(new File(dataLocalPath, csvFileClasspath)), StandardCharsets.UTF_8);
             Map<Integer, String> enums = new HashMap<>();
@@ -232,15 +224,7 @@ public static Map<Integer, String> readEnumCSV(String csvFileClasspath) {
     }
 
     /**
-     * used for testing and training
-     *
-     * @param csvFileClasspath
-     * @param batchSize
-     * @param labelIndex
-     * @param numClasses
-     * @return
-     * @throws IOException
-     * @throws InterruptedException
+     * used for testing and training*
      */
     private static DataSet readCSVDataset(
         String csvFileClasspath, int batchSize, int labelIndex, int numClasses)

dl4j-examples/src/main/java/org/deeplearning4j/examples/dataexamples/CSVExample.java

@@ -1,4 +1,4 @@
-/*******************************************************************************
+/* *****************************************************************************
  * Copyright (c) 2015-2019 Skymind, Inc.
  *
  * This program and the accompanying materials are made available under the
@@ -20,7 +20,6 @@
 import org.datavec.api.records.reader.impl.csv.CSVRecordReader;
 import org.datavec.api.split.FileSplit;
 import org.deeplearning4j.datasets.datavec.RecordReaderDataSetIterator;
-import org.deeplearning4j.eval.Evaluation;
 import org.deeplearning4j.examples.download.DownloaderUtility;
 import org.deeplearning4j.nn.conf.MultiLayerConfiguration;
 import org.deeplearning4j.nn.conf.NeuralNetConfiguration;
@@ -29,6 +28,7 @@
 import org.deeplearning4j.nn.multilayer.MultiLayerNetwork;
 import org.deeplearning4j.nn.weights.WeightInit;
 import org.deeplearning4j.optimize.listeners.ScoreIterationListener;
+import org.nd4j.evaluation.classification.Evaluation;
 import org.nd4j.linalg.activations.Activation;
 import org.nd4j.linalg.api.ndarray.INDArray;
 import org.nd4j.linalg.dataset.DataSet;
@@ -46,6 +46,7 @@
 /**
  * @author Adam Gibson
  */
+@SuppressWarnings("DuplicatedCode")
 public class CSVExample {
 
     private static Logger log = LoggerFactory.getLogger(CSVExample.class);

dl4j-examples/src/main/java/org/deeplearning4j/examples/dataexamples/CSVExampleEvaluationMetaData.java

@@ -1,4 +1,4 @@
-/*******************************************************************************
+/* *****************************************************************************
  * Copyright (c) 2015-2019 Skymind, Inc.
  *
  * This program and the accompanying materials are made available under the
@@ -23,7 +23,6 @@
 import org.datavec.api.split.FileSplit;
 import org.datavec.api.writable.Writable;
 import org.deeplearning4j.datasets.datavec.RecordReaderDataSetIterator;
-import org.deeplearning4j.eval.Evaluation;
 import org.deeplearning4j.examples.download.DownloaderUtility;
 import org.deeplearning4j.nn.conf.MultiLayerConfiguration;
 import org.deeplearning4j.nn.conf.NeuralNetConfiguration;
@@ -32,6 +31,7 @@
 import org.deeplearning4j.nn.multilayer.MultiLayerNetwork;
 import org.deeplearning4j.nn.weights.WeightInit;
 import org.deeplearning4j.optimize.listeners.ScoreIterationListener;
+import org.nd4j.evaluation.classification.Evaluation;
 import org.nd4j.evaluation.meta.Prediction;
 import org.nd4j.linalg.activations.Activation;
 import org.nd4j.linalg.api.ndarray.INDArray;
@@ -55,6 +55,7 @@
  */
 public class CSVExampleEvaluationMetaData {
 
+    @SuppressWarnings("unused")
     public static void main(String[] args) throws  Exception {
         //First: get the dataset using the record reader. This is as per CSV example - see that example for details
         RecordReader recordReader = new CSVRecordReader(0, ',');

dl4j-examples/src/main/java/org/deeplearning4j/examples/dataexamples/CSVPlotter.java

@@ -1,4 +1,4 @@
-/*******************************************************************************
+/* *****************************************************************************
  * Copyright (c) 2015-2019 Skymind, Inc.
  *
  * This program and the accompanying materials are made available under the
@@ -185,6 +185,7 @@ private static void plotDataset(ArrayList<DataSet> DataSetList) {
         boolean legend = false;
         boolean tooltips = false;
         boolean urls = false;
+        //noinspection ConstantConditions
         JFreeChart chart = ChartFactory.createScatterPlot(title, xAxisLabel, yAxisLabel, c, orientation, legend, tooltips, urls);
         JPanel panel = new ChartPanel(chart);
 

dl4j-examples/src/main/java/org/deeplearning4j/examples/dataexamples/ImagePipelineExample.java

@@ -1,4 +1,4 @@
-/*******************************************************************************
+/* *****************************************************************************
  * Copyright (c) 2015-2019 Skymind, Inc.
  *
  * This program and the accompanying materials are made available under the

dl4j-examples/src/main/java/org/deeplearning4j/examples/dataexamples/KFoldIteratorExample.java

@@ -1,4 +1,4 @@
-/*******************************************************************************
+/* *****************************************************************************
  * Copyright (c) 2015-2019 Skymind, Inc.
  *
  * This program and the accompanying materials are made available under the

dl4j-examples/src/main/java/org/deeplearning4j/examples/dataexamples/MapFileConversion.java

@@ -1,4 +1,4 @@
-/*******************************************************************************
+/* *****************************************************************************
  * Copyright (c) 2015-2019 Skymind, Inc.
  *
  * This program and the accompanying materials are made available under the

dl4j-examples/src/main/java/org/deeplearning4j/examples/dataexamples/MnistImagePipelineExample.java

@@ -1,4 +1,4 @@
-/*******************************************************************************
+/* *****************************************************************************
  * Copyright (c) 2015-2019 Skymind, Inc.
  *
  * This program and the accompanying materials are made available under the
@@ -62,14 +62,15 @@
  * handwritten image 3 (for example) was read from directory 3, has a matrix with the shown values,
  * has a label value corresponding to 3
  */
+@SuppressWarnings("ResultOfMethodCallIgnored")
 public class MnistImagePipelineExample {
   private static Logger log = LoggerFactory.getLogger(MnistImagePipelineExample.class);
 
   /** Data URL for downloading */
-  public static final String DATA_URL = "http://github.com/myleott/mnist_png/raw/master/mnist_png.tar.gz";
+  private static final String DATA_URL = "http://github.com/myleott/mnist_png/raw/master/mnist_png.tar.gz";
 
   /** Location to save and extract the training/testing data */
-  public static final String DATA_PATH = FilenameUtils.concat(System.getProperty("java.io.tmpdir"), "dl4j_Mnist/");
+  private static final String DATA_PATH = FilenameUtils.concat(System.getProperty("java.io.tmpdir"), "dl4j_Mnist/");
 
   public static void main(String[] args) throws Exception {
     /*
@@ -142,7 +143,7 @@ The classes downloadData, getMnistPNG(),
   and extractTarGz are for downloading and extracting the data
   */
 
-  protected static void downloadData() throws Exception {
+  static void downloadData() throws Exception {
     // Create directory if required
     File directory = new File(DATA_PATH);
     if (!directory.exists())
@@ -171,7 +172,8 @@ protected static void downloadData() throws Exception {
     }
   }
 
-  public static void getMnistPNG() throws IOException {
+  @SuppressWarnings("PlaceholderCountMatchesArgumentCount")
+  private static void getMnistPNG() throws IOException {
     String tmpDirStr = System.getProperty("java.io.tmpdir");
     String archizePath = DATA_PATH + "/mnist_png.tar.gz";
 
@@ -187,5 +189,4 @@ public static void getMnistPNG() throws IOException {
       log.info("Using existing directory at ", f.getAbsolutePath());
     }
   }
-
 }