mv_machine_learning: rename 'getResult()' to 'result()'

[Issue type] : code cleanup

Change-Id: I1f5d90736b7c11e6769f25d82eacd2297294a841
Signed-off-by: Inki Dae <inki.dae@samsung.com>

diff --git a/mv_machine_learning/face_recognition/include/face_recognition.h b/mv_machine_learning/face_recognition/include/face_recognition.h
index f280e2f..0ba0be4 100644 (file)
--- a/mv_machine_learning/face_recognition/include/face_recognition.h
+++ b/mv_machine_learning/face_recognition/include/face_recognition.h
@@ -115,7 +115,7 @@ public:
        int RecognizeFace(std::vector<float> &input_vec);
        int DeleteLabel(std::string label_name);
        int GetLabel(const char **out_label);
-       mv_face_recognition_result_s &GetResult();
+       mv_face_recognition_result_s &result();
 };
 
 } // machine_learning

diff --git a/mv_machine_learning/face_recognition/include/facenet.h b/mv_machine_learning/face_recognition/include/facenet.h
index b9265af..b67f608 100644 (file)
--- a/mv_machine_learning/face_recognition/include/facenet.h
+++ b/mv_machine_learning/face_recognition/include/facenet.h
@@ -55,7 +55,7 @@ public:
        void prepare();
        void preprocess(mv_source_h &mv_src);
        void inference(mv_source_h source);
-       facenet_output_s &getResult();
+       facenet_output_s &result();
 };
 
 } // machine_learning

diff --git a/mv_machine_learning/face_recognition/src/face_recognition.cpp b/mv_machine_learning/face_recognition/src/face_recognition.cpp
index c7a9c3e..e519437 100644 (file)
--- a/mv_machine_learning/face_recognition/src/face_recognition.cpp
+++ b/mv_machine_learning/face_recognition/src/face_recognition.cpp
@@ -518,7 +518,7 @@ int FaceRecognition::GetLabel(const char **out_label)
        return MEDIA_VISION_ERROR_NONE;
 }
 
-mv_face_recognition_result_s &FaceRecognition::GetResult()
+mv_face_recognition_result_s &FaceRecognition::result()
 {
        if (!_result.is_valid)
                throw NoData("Inference result not ready yet.");

diff --git a/mv_machine_learning/face_recognition/src/face_recognition_adapter.cpp b/mv_machine_learning/face_recognition/src/face_recognition_adapter.cpp
index 65a8c53..a147864 100644 (file)
--- a/mv_machine_learning/face_recognition/src/face_recognition_adapter.cpp
+++ b/mv_machine_learning/face_recognition/src/face_recognition_adapter.cpp
@@ -126,7 +126,7 @@ template<typename T, typename V> void FaceRecognitionAdapter<T, V>::perform()
 
 template<typename T, typename V> V &FaceRecognitionAdapter<T, V>::getOutput()
 {
-       return _face_recognition->GetResult();
+       return _face_recognition->result();
 }
 
 template class FaceRecognitionAdapter<mv_face_recognition_input_s, mv_face_recognition_result_s>;

diff --git a/mv_machine_learning/face_recognition/src/facenet.cpp b/mv_machine_learning/face_recognition/src/facenet.cpp
index 9834e35..cebe041 100644 (file)
--- a/mv_machine_learning/face_recognition/src/facenet.cpp
+++ b/mv_machine_learning/face_recognition/src/facenet.cpp
@@ -125,7 +125,7 @@ void Facenet::inference(mv_source_h source)
        LOGI("LEAVE");
 }
 
-facenet_output_s &Facenet::getResult()
+facenet_output_s &Facenet::result()
 {
        TensorBuffer &tensor_buffer_obj = _inference->GetOutputTensorBuffer();
 

diff --git a/mv_machine_learning/face_recognition/src/facenet_adapter.cpp b/mv_machine_learning/face_recognition/src/facenet_adapter.cpp
index 9ffd4d3..5963ed6 100644 (file)
--- a/mv_machine_learning/face_recognition/src/facenet_adapter.cpp
+++ b/mv_machine_learning/face_recognition/src/facenet_adapter.cpp
@@ -63,7 +63,7 @@ template<typename T, typename V> void FacenetAdapter<T, V>::perform()
 
 template<typename T, typename V> V &FacenetAdapter<T, V>::getOutput()
 {
-       return _facenet->getResult();
+       return _facenet->result();
 }
 
 template class FacenetAdapter<facenet_input_s, facenet_output_s>;

diff --git a/mv_machine_learning/image_classification/include/image_classification.h b/mv_machine_learning/image_classification/include/image_classification.h
index 219e566..2303292 100644 (file)
--- a/mv_machine_learning/image_classification/include/image_classification.h
+++ b/mv_machine_learning/image_classification/include/image_classification.h
@@ -61,7 +61,7 @@ public:
        void prepare();
        void preprocess(mv_source_h &mv_src);
        void inference(mv_source_h source);
-       virtual image_classification_result_s &getResult() = 0;
+       virtual image_classification_result_s &result() = 0;
 };
 
 } // machine_learning

diff --git a/mv_machine_learning/image_classification/include/image_classification_default.h b/mv_machine_learning/image_classification/include/image_classification_default.h
index 7da906e..e001fd7 100644 (file)
--- a/mv_machine_learning/image_classification/include/image_classification_default.h
+++ b/mv_machine_learning/image_classification/include/image_classification_default.h
@@ -37,7 +37,7 @@ private:
 public:
        ImageClassificationDefault();
        ~ImageClassificationDefault();
-       image_classification_result_s &getResult() override;
+       image_classification_result_s &result() override;
 };
 
 } // machine_learning

diff --git a/mv_machine_learning/image_classification/src/image_classification_adapter.cpp b/mv_machine_learning/image_classification/src/image_classification_adapter.cpp
index 674baea..03a00e9 100644 (file)
--- a/mv_machine_learning/image_classification/src/image_classification_adapter.cpp
+++ b/mv_machine_learning/image_classification/src/image_classification_adapter.cpp
@@ -69,7 +69,7 @@ template<typename T, typename V> void ImageClassificationAdapter<T, V>::perform(
 
 template<typename T, typename V> V &ImageClassificationAdapter<T, V>::getOutput()
 {
-       return _image_classification->getResult();
+       return _image_classification->result();
 }
 
 template class ImageClassificationAdapter<image_classification_input_s, image_classification_result_s>;

diff --git a/mv_machine_learning/image_classification/src/image_classification_default.cpp b/mv_machine_learning/image_classification/src/image_classification_default.cpp
index 9b1c1ad..33a90cf 100644 (file)
--- a/mv_machine_learning/image_classification/src/image_classification_default.cpp
+++ b/mv_machine_learning/image_classification/src/image_classification_default.cpp
@@ -36,7 +36,7 @@ ImageClassificationDefault::ImageClassificationDefault() : _result()
 ImageClassificationDefault::~ImageClassificationDefault()
 {}
 
-image_classification_result_s &ImageClassificationDefault::getResult()
+image_classification_result_s &ImageClassificationDefault::result()
 {
        vector<string> names;
 

diff --git a/mv_machine_learning/object_detection/include/object_detection.h b/mv_machine_learning/object_detection/include/object_detection.h
index 30a79c2..48df71b 100644 (file)
--- a/mv_machine_learning/object_detection/include/object_detection.h
+++ b/mv_machine_learning/object_detection/include/object_detection.h
@@ -55,7 +55,7 @@ public:
        void prepare();
        void preprocess(mv_source_h &mv_src);
        void inference(mv_source_h source);
-       virtual object_detection_result_s &getResult() = 0;
+       virtual object_detection_result_s &result() = 0;
 };
 
 } // machine_learning

diff --git a/mv_machine_learning/object_detection/include/objectron.h b/mv_machine_learning/object_detection/include/objectron.h
index 1c70378..a312647 100644 (file)
--- a/mv_machine_learning/object_detection/include/objectron.h
+++ b/mv_machine_learning/object_detection/include/objectron.h
@@ -36,7 +36,7 @@ private:
 public:
        Objectron();
        ~Objectron();
-       object_detection_result_s &getResult() override;
+       object_detection_result_s &result() override;
 };
 
 } // machine_learning

diff --git a/mv_machine_learning/object_detection/src/object_detection_adapter.cpp b/mv_machine_learning/object_detection/src/object_detection_adapter.cpp
index 61fe189..372ebe8 100644 (file)
--- a/mv_machine_learning/object_detection/src/object_detection_adapter.cpp
+++ b/mv_machine_learning/object_detection/src/object_detection_adapter.cpp
@@ -67,7 +67,7 @@ template<typename T, typename V> void ObjectDetectionAdapter<T, V>::perform()
 
 template<typename T, typename V> V &ObjectDetectionAdapter<T, V>::getOutput()
 {
-       return _object_detection->getResult();
+       return _object_detection->result();
 }
 
 template class ObjectDetectionAdapter<object_detection_input_s, object_detection_result_s>;

diff --git a/mv_machine_learning/object_detection/src/objectron.cpp b/mv_machine_learning/object_detection/src/objectron.cpp
index 76793fa..1a62fcb 100644 (file)
--- a/mv_machine_learning/object_detection/src/objectron.cpp
+++ b/mv_machine_learning/object_detection/src/objectron.cpp
@@ -36,7 +36,7 @@ Objectron::Objectron() : _result()
 Objectron::~Objectron()
 {}
 
-object_detection_result_s &Objectron::getResult()
+object_detection_result_s &Objectron::result()
 {
        vector<string> names;