update

Author: peirkern-skymind

vision-dl4j/README.md

@@ -5,17 +5,19 @@ Kindly Execute `/vision-dl4j/com/skymindglobal/face/FaceID` for realtime inferen
 
 ### Face Detection
 - FaceDetector.OPENCV_DL_FACEDETECTOR (default)
-  - Description: OpenCV with prebuilt caffe face detection model
+  - OpenCV with prebuilt caffe face detection model
   - [Configuration](https://github.com/skymindglobal/Vision/blob/master/vision-dl4j/src/main/java/com/skymindglobal/face/FaceID.java#L145):
     - Model inputs: Width and Height
-    - Confidence
+    - Threshold
   - Resource: `OpenCVDeepLearningFaceDetector\res10_300x300_ssd_iter_140000.caffemodel` and `OpenCVDeepLearningFaceDetector\deploy.prototxt`
-
 - FaceDetector.OPENIMAJ_FKE_FACEDETECTOR
+  - OpenIMAJ FKEFaceDetector
+  - Configuration
+    - Threshold
 
 ### Face Identification
-- FaceIdentifier.FEATURE_DISTANCE
-  - Description: 
+- FaceIdentifier.FEATURE_DISTANCE_VGG16
+  - Identification based on cosine similarity between images in dictionary and image from webcam.
   - [Configuration](https://github.com/skymindglobal/Vision/blob/master/vision-dl4j/src/main/java/com/skymindglobal/face/FaceID.java#L133)
     - Embeddings Provider (default: `VGG16FeatureProvider`)
     - Dictionary (default: resources `\vgg16_faces_224`)
@@ -26,7 +28,6 @@ Kindly Execute `/vision-dl4j/com/skymindglobal/face/FaceID` for realtime inferen
     - numSamples: 3
       Average of top 3 per class.
 
-    
 ### Dataset Preparation
 - Using FaceIdentifier.FEATURE_DISTANCE
 May invoke [FaceDatasetPreperation](https://github.com/skymindglobal/Vision/blob/master/vision-dl4j/src/main/java/com/skymindglobal/face/identification/training/FaceDatasetPreperation.java) to generate detection targets face images and load into `\vgg16_faces_224` resource directory.

vision-dl4j/src/main/java/com/skymindglobal/face/FaceID.java

@@ -37,7 +37,7 @@ public class FaceID {
 
     public static void main(String[] args) throws IOException, ClassNotFoundException, CanvasFrame.Exception, InvalidKerasConfigurationException, UnsupportedKerasConfigurationException {
         FaceDetector FaceDetector = getFaceDetector(com.skymindglobal.face.detection.FaceDetector.OPENCV_DL_FACEDETECTOR);
-        FaceIdentifier FaceIdentifier = getFaceIdentifier(com.skymindglobal.face.identification.FaceIdentifier.FEATURE_DISTANCE);
+        FaceIdentifier FaceIdentifier = getFaceIdentifier(com.skymindglobal.face.identification.FaceIdentifier.FEATURE_DISTANCE_VGG16);
         HeadPoseEstimator HeadPoseEstimator = getHeadPoseEstimator(OPENCV_HEAD_POSE_ESTIMATOR);
 
         VideoCapture capture = new VideoCapture();
@@ -128,10 +128,9 @@ private static FaceIdentifier getFaceIdentifier(String faceIdentifier) throws IO
         switch (faceIdentifier){
             case FaceIdentifier.CUSTOM_VGG16:
                 return new VGG16FaceIdentifier(3);
-            case FaceIdentifier.FEATURE_DISTANCE:
+            case FaceIdentifier.FEATURE_DISTANCE_VGG16:
                 File dictionary = new ClassPathResource("vgg16_faces_224").getFile();
-                return new DistanceFaceIdentifier(
-                        new VGG16FeatureProvider(), dictionary, 1, 0.78, 3, 3);
+                return new DistanceFaceIdentifier(new VGG16FeatureProvider(), dictionary, 1, 0.78, 3, 3);
             case FaceIdentifier.ZHZD:
                 return new AlexNetFaceIdentifier(5);
             default:

vision-dl4j/src/main/java/com/skymindglobal/face/FaceIDVideo.java

@@ -101,7 +101,7 @@ private static FaceIdentifier getFaceIdentifier(String faceIdentifier) throws IO
         switch (faceIdentifier){
             case FaceIdentifier.CUSTOM_VGG16:
                 return new VGG16FaceIdentifier(3);
-            case FaceIdentifier.FEATURE_DISTANCE:
+            case FaceIdentifier.FEATURE_DISTANCE_VGG16:
                 File dictionary = new ClassPathResource("vgg16_faces_224").getFile();
                 return new DistanceFaceIdentifier(new VGG16FeatureProvider(), dictionary,3, 0.8, 3, 3);
             case FaceIdentifier.ZHZD:

vision-dl4j/src/main/java/com/skymindglobal/face/identification/FaceIdentifier.java

@@ -8,7 +8,7 @@
 
 public class FaceIdentifier implements IFaceIdentifier{
     public static final String CUSTOM_VGG16 = "CUSTOM_VGG16";
-    public static final String FEATURE_DISTANCE = "FEATURE_DISTANCE";
+    public static final String FEATURE_DISTANCE_VGG16 = "FEATURE_DISTANCE_VGG16";
     public static final String ZHZD = "ZHZD";
 
     public List<List<Prediction>> identify(List<FaceLocalization> faceLocalizations, opencv_core.Mat image) throws IOException {