mv_machine_learning: rename 'output' to 'tensor'

[Issue type] : code cleanup

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

diff --git a/mv_machine_learning/image_classification/include/image_classification.h b/mv_machine_learning/image_classification/include/image_classification.h
index d39a1b3..219e566 100644 (file)
--- a/mv_machine_learning/image_classification/include/image_classification.h
+++ b/mv_machine_learning/image_classification/include/image_classification.h
@@ -50,7 +50,7 @@ protected:
        int _targetDeviceType;
 
        void getOutputNames(std::vector<std::string> &names);
-       void getOutpuTensor(std::string &target_name, std::vector<float> &output);
+       void getOutpuTensor(std::string &target_name, std::vector<float> &tensor);
 
 public:
        ImageClassification();

diff --git a/mv_machine_learning/image_classification/src/image_classification.cpp b/mv_machine_learning/image_classification/src/image_classification.cpp
index b4393cd..0a92d44 100644 (file)
--- a/mv_machine_learning/image_classification/src/image_classification.cpp
+++ b/mv_machine_learning/image_classification/src/image_classification.cpp
@@ -189,7 +189,7 @@ void ImageClassification::getOutputNames(vector<string> &names)
                names.push_back(it->first);
 }
 
-void ImageClassification::getOutpuTensor(string &target_name, vector<float> &output)
+void ImageClassification::getOutpuTensor(string &target_name, vector<float> &tensor)
 {
        LOGI("ENTER");
 
@@ -201,7 +201,7 @@ void ImageClassification::getOutpuTensor(string &target_name, vector<float> &out
 
        auto raw_buffer = static_cast<float *>(tensor_buffer->buffer);
 
-       copy(&raw_buffer[0], &raw_buffer[tensor_buffer->size / sizeof(float)], back_inserter(output));
+       copy(&raw_buffer[0], &raw_buffer[tensor_buffer->size / sizeof(float)], back_inserter(tensor));
 
        LOGI("LEAVE");
 }

diff --git a/mv_machine_learning/object_detection/include/object_detection.h b/mv_machine_learning/object_detection/include/object_detection.h
index 889a2cc..30a79c2 100644 (file)
--- a/mv_machine_learning/object_detection/include/object_detection.h
+++ b/mv_machine_learning/object_detection/include/object_detection.h
@@ -45,7 +45,7 @@ protected:
        int _targetDeviceType;
 
        void getOutputNames(std::vector<std::string> &names);
-       void getOutputTensor(std::string &target_name, std::vector<float> &output);
+       void getOutputTensor(std::string &target_name, std::vector<float> &tensor);
 
 public:
        ObjectDetection();

diff --git a/mv_machine_learning/object_detection/src/object_detection.cpp b/mv_machine_learning/object_detection/src/object_detection.cpp
index b75e82b..d6854db 100644 (file)
--- a/mv_machine_learning/object_detection/src/object_detection.cpp
+++ b/mv_machine_learning/object_detection/src/object_detection.cpp
@@ -143,7 +143,7 @@ void ObjectDetection::getOutputNames(vector<string> &names)
                names.push_back(it->first);
 }
 
-void ObjectDetection::getOutputTensor(string &target_name, vector<float> &output)
+void ObjectDetection::getOutputTensor(string &target_name, vector<float> &tensor)
 {
        LOGI("ENTER");
 
@@ -155,7 +155,7 @@ void ObjectDetection::getOutputTensor(string &target_name, vector<float> &output
 
        auto raw_buffer = static_cast<float *>(tensor_buffer->buffer);
 
-       copy(&raw_buffer[0], &raw_buffer[tensor_buffer->size / sizeof(float)], back_inserter(output));
+       copy(&raw_buffer[0], &raw_buffer[tensor_buffer->size / sizeof(float)], back_inserter(tensor));
 
        LOGI("LEAVE");
 }