mv_machine_learning: cleanup namespace

[Issue type] cleanup

Cleaned up the use of namespace for Face recognition framework
according to Tizen coding style document.

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

diff --git a/mv_machine_learning/common/include/machine_learning_exception.h b/mv_machine_learning/common/include/machine_learning_exception.h
index 05d33c99da24fe8d24bfc03c474182f7e39794e9..1038c9350d4987970d0d49e3a556d480b0d95924 100644 (file)
--- a/mv_machine_learning/common/include/machine_learning_exception.h
+++ b/mv_machine_learning/common/include/machine_learning_exception.h
@@ -22,9 +22,9 @@
 
 #include <mv_common.h>
 
-namespace Mediavision {
-namespace MachineLearning {
-namespace Exception {
+namespace mediavision {
+namespace machine_learning {
+namespace exception {
 
 class BaseException : public std::exception {
 private:

diff --git a/mv_machine_learning/face_recognition/include/face_recognition.h b/mv_machine_learning/face_recognition/include/face_recognition.h
index f4d65a88afe30e14c7bdb0f1386bd7e06fcc979e..a23947177b355fc812b1d6e3c55bdb724339d8c4 100644 (file)
--- a/mv_machine_learning/face_recognition/include/face_recognition.h
+++ b/mv_machine_learning/face_recognition/include/face_recognition.h
@@ -32,12 +32,14 @@
 #include "data_augment_flip.h"
 #include "data_augment_rotate.h"
 
-namespace Mv
+namespace mediavision
 {
-namespace FaceRecognition
+namespace machine_learning
+{
+namespace face_recognition
 {
 
-namespace Status
+namespace status
 {
 enum {
        NONE = 0,
@@ -46,19 +48,18 @@ enum {
        INFERENCED,
        DELETED
 };
-} // Status
+} // status
 
-namespace Mode
+namespace mode
 {
 enum {
        REGISTER = 0,
        INFERENCE,
        DELETE
 };
-} // Mode
+} // mode
 
-} // FaceRecognition
-} // Mv
+} // face_recognition
 
 typedef struct {
        unsigned int mode;
@@ -131,4 +132,7 @@ public:
 
 };
 
+} // machine_learning
+} // mediavision
+
 #endif
\ No newline at end of file

diff --git a/mv_machine_learning/face_recognition/include/face_recognition_adapter.h b/mv_machine_learning/face_recognition/include/face_recognition_adapter.h
index f5a4ad09b2872e80065ed5573b1ee90d9d655023..b4ab9faf6edd40d968b74446c72a1a13797d9e0c 100644 (file)
--- a/mv_machine_learning/face_recognition/include/face_recognition_adapter.h
+++ b/mv_machine_learning/face_recognition/include/face_recognition_adapter.h
@@ -60,6 +60,7 @@ namespace mediavision
 {
 namespace machine_learning
 {
+
 template <typename T, typename V>
 class FaceRecognitionAdapter : public mediavision::common::ITask<T, V> {
 private:
@@ -82,6 +83,7 @@ public:
        void perform();
        V& getOutput();
 };
+
 } // machine_learning
 } // mediavision
 

diff --git a/mv_machine_learning/face_recognition/src/face_recognition.cpp b/mv_machine_learning/face_recognition/src/face_recognition.cpp
index 11ad1a2a916aa925e9f3fed3bb9d1d371aee445a..13b120d15d1d126c82ba4a4785be719bba88f736 100644 (file)
--- a/mv_machine_learning/face_recognition/src/face_recognition.cpp
+++ b/mv_machine_learning/face_recognition/src/face_recognition.cpp
@@ -36,8 +36,13 @@
 using namespace std;
 using namespace mediavision::inference;
 using namespace TrainingEngineInterface::Common;
-using namespace Mv::FaceRecognition::Status;
-using namespace Mediavision::MachineLearning::Exception;
+using namespace mediavision::machine_learning::face_recognition::status;
+using namespace mediavision::machine_learning::exception;
+
+namespace mediavision
+{
+namespace machine_learning
+{
 
 FaceRecognition::FaceRecognition() :
                _status(NONE), _internal(), _backbone(), _face_net_info(), _training_model(), _label_manager()
@@ -614,3 +619,6 @@ int FaceRecognition::GetLabel(const char **out_label)
 
        return _result;
  }
+
+} // machine_learning
+} // mediavision
\ No newline at end of file

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 de0abb9586e3eeeb08dd61315857fb951c749f6b..da8aeec9cefd4d21af1feb40066a88d79cbc0b08 100644 (file)
--- a/mv_machine_learning/face_recognition/src/face_recognition_adapter.cpp
+++ b/mv_machine_learning/face_recognition/src/face_recognition_adapter.cpp
@@ -21,12 +21,14 @@
 
 using namespace std;
 using namespace MediaVision::Common;
-using namespace Mediavision::MachineLearning::Exception;
+using namespace mediavision::machine_learning::exception;
+using namespace mediavision::machine_learning::face_recognition;
 
 namespace mediavision
 {
 namespace machine_learning
 {
+
 template <typename T, typename V>
 FaceRecognitionAdapter<T, V>::FaceRecognitionAdapter()
 {
@@ -101,7 +103,7 @@ void FaceRecognitionAdapter<T, V>::setInput(T& t)
 template <typename T, typename V>
 void FaceRecognitionAdapter<T, V>::perform()
 {
-       if (_source.mode == Mv::FaceRecognition::Mode::REGISTER) {
+       if (_source.mode == mode::REGISTER) {
                for (auto& s : _source.register_src) {
                        int ret = _face_recognition->RegisterNewFace(s.first, s.second);
                        if (ret != MEDIA_VISION_ERROR_NONE)
@@ -111,7 +113,7 @@ void FaceRecognitionAdapter<T, V>::perform()
                return;
        }
 
-       if (_source.mode == Mv::FaceRecognition::Mode::INFERENCE) {
+       if (_source.mode == mode::INFERENCE) {
                int ret = _face_recognition->RecognizeFace(_source.inference_src);
                if (ret == MEDIA_VISION_ERROR_NO_DATA)
                        throw NoData("Label not found.");
@@ -119,7 +121,7 @@ void FaceRecognitionAdapter<T, V>::perform()
                return;
        }
 
-       if (_source.mode == Mv::FaceRecognition::Mode::DELETE) {
+       if (_source.mode == mode::DELETE) {
                for (auto& l : _source.labels) {
                        int ret = _face_recognition->DeleteLabel(l);
                        if (ret != MEDIA_VISION_ERROR_NONE)

diff --git a/mv_machine_learning/face_recognition/src/mv_face_recognition_open.cpp b/mv_machine_learning/face_recognition/src/mv_face_recognition_open.cpp
index d34b699e651c1e1e267e39660bd89bd511bb8954..3dbbb675e9f65f7a6d9797cfd2eb1d3bb176fc74 100644 (file)
--- a/mv_machine_learning/face_recognition/src/mv_face_recognition_open.cpp
+++ b/mv_machine_learning/face_recognition/src/mv_face_recognition_open.cpp
@@ -26,8 +26,8 @@
 using namespace std;
 using namespace mediavision::common;
 using namespace mediavision::machine_learning;
-using namespace Mv::FaceRecognition;
-using namespace Mediavision::MachineLearning::Exception;
+using namespace mediavision::machine_learning::face_recognition;
+using namespace mediavision::machine_learning::exception;
 
 int mv_face_recognition_create_open(mv_face_recognition_h *handle)
 {
@@ -121,7 +121,7 @@ int mv_face_recognition_register_open(mv_face_recognition_h handle, mv_source_h
                Context *context = static_cast<Context *>(handle);
                auto itask = static_cast<ITask<mv_face_recognition_input_s, mv_face_recognition_result_s> *>(context->__itasks["face_recognition"]);
 
-               mv_face_recognition_input_s input = { Mode::REGISTER };
+               mv_face_recognition_input_s input = { mode::REGISTER };
 
                input.register_src.clear();
                input.register_src.insert(make_pair(source, string(label)));
@@ -150,7 +150,7 @@ int mv_face_recognition_unregister_open(mv_face_recognition_h handle, const char
                Context *context = static_cast<Context *>(handle);
                auto itask = static_cast<ITask<mv_face_recognition_input_s, mv_face_recognition_result_s> *>(context->__itasks["face_recognition"]);
 
-               mv_face_recognition_input_s input = { Mode::DELETE };
+               mv_face_recognition_input_s input = { mode::DELETE };
 
                input.labels.clear();
                input.labels.push_back(string(label));
@@ -179,7 +179,7 @@ int mv_face_recognition_inference_open(mv_face_recognition_h handle, mv_source_h
                Context *context = static_cast<Context *>(handle);
                auto itask = static_cast<ITask<mv_face_recognition_input_s, mv_face_recognition_result_s> *>(context->__itasks["face_recognition"]);
 
-               mv_face_recognition_input_s input = { Mode::INFERENCE };
+               mv_face_recognition_input_s input = { mode::INFERENCE };
 
                input.inference_src = source;
                itask->setInput(input);

diff --git a/mv_machine_learning/face_recognition/src/nntrainer_dsm.cpp b/mv_machine_learning/face_recognition/src/nntrainer_dsm.cpp
index 1a95cdf7159db75f4f24ad996b88ca2b1a962aae..2eedaa45b7c00980b1f59fa63de225599ee96f1d 100644 (file)
--- a/mv_machine_learning/face_recognition/src/nntrainer_dsm.cpp
+++ b/mv_machine_learning/face_recognition/src/nntrainer_dsm.cpp
@@ -22,7 +22,7 @@
 #include "nntrainer_dsm.h"
 
 using namespace std;
-using namespace Mediavision::MachineLearning::Exception;
+using namespace mediavision::machine_learning::exception;
 
 void NNTrainerDSM::PrintHeader(FeaVecHeader& fvh)
 {

diff --git a/mv_machine_learning/face_recognition/src/nntrainer_fvm.cpp b/mv_machine_learning/face_recognition/src/nntrainer_fvm.cpp
index e9ffb6b4fd45a38a663ac32be985b5561ee77d34..0f20e9aeee95b824e2b7e4ccbe176ebabd74d515 100644 (file)
--- a/mv_machine_learning/face_recognition/src/nntrainer_fvm.cpp
+++ b/mv_machine_learning/face_recognition/src/nntrainer_fvm.cpp
@@ -20,7 +20,7 @@
 #include "nntrainer_fvm.h"
 
 using namespace std;
-using namespace Mediavision::MachineLearning::Exception;
+using namespace mediavision::machine_learning::exception;
 
 NNTrainerFVM::NNTrainerFVM(const string feature_vector_file)
        : FeatureVectorManager(feature_vector_file)

diff --git a/mv_machine_learning/face_recognition/src/simple_shot.cpp b/mv_machine_learning/face_recognition/src/simple_shot.cpp
index 6dd97f2b58be8333aa9f9aa1ae6fd0a3423d614b..25a51adfac885e7b07528cb930bd4d59b0a2fc95 100644 (file)
--- a/mv_machine_learning/face_recognition/src/simple_shot.cpp
+++ b/mv_machine_learning/face_recognition/src/simple_shot.cpp
@@ -30,7 +30,7 @@
 
 using namespace std;
 using namespace TrainingEngineInterface::Common;
-using namespace Mediavision::MachineLearning::Exception;
+using namespace mediavision::machine_learning::exception;
 
 SimpleShot::SimpleShot(const mv_inference_backend_type_e backend_type,
                                           const mv_inference_target_device_e target_type,

diff --git a/mv_machine_learning/training/src/data_augment_rotate.cpp b/mv_machine_learning/training/src/data_augment_rotate.cpp
index 5ccb588102975570cfff2507052002da42d3c20a..4b206235598c148cad475c5b93162aa72ccbea4d 100644 (file)
--- a/mv_machine_learning/training/src/data_augment_rotate.cpp
+++ b/mv_machine_learning/training/src/data_augment_rotate.cpp
@@ -18,7 +18,7 @@
 #include "data_augment_rotate.h"
 
 using namespace std;
-using namespace Mediavision::MachineLearning::Exception;
+using namespace mediavision::machine_learning::exception;
 
 DataAugmentRotate::DataAugmentRotate(unsigned int degree) : _degree(degree)
 {

diff --git a/mv_machine_learning/training/src/feature_vector_manager.cpp b/mv_machine_learning/training/src/feature_vector_manager.cpp
index 6e83e801b1762594d23cf7440ba4253ccef83885..62d90a316944dbaa8a88d48d621106f299cc96c8 100644 (file)
--- a/mv_machine_learning/training/src/feature_vector_manager.cpp
+++ b/mv_machine_learning/training/src/feature_vector_manager.cpp
@@ -21,7 +21,7 @@
 #include "feature_vector_manager.h"
 
 using namespace std;
-using namespace Mediavision::MachineLearning::Exception;
+using namespace mediavision::machine_learning::exception;
 
 FeatureVectorManager::FeatureVectorManager(const string feature_vector_file)
        : _feature_vector_file(feature_vector_file)

diff --git a/mv_machine_learning/training/src/label_manager.cpp b/mv_machine_learning/training/src/label_manager.cpp
index b72b3d6a1e44e53c341bab45fdd9df3216b2fc21..2f65c27dea85f0ea32c5d3a436002ea234b7af57 100644 (file)
--- a/mv_machine_learning/training/src/label_manager.cpp
+++ b/mv_machine_learning/training/src/label_manager.cpp
@@ -21,7 +21,7 @@
 #include "label_manager.h"
 
 using namespace std;
-using namespace Mediavision::MachineLearning::Exception;
+using namespace mediavision::machine_learning::exception;
 
 LabelManager::LabelManager(string label_file, double decision_threshold) : _labels_and_files(), _label_file(label_file)
 {

diff --git a/mv_machine_learning/training/src/training_model.cpp b/mv_machine_learning/training/src/training_model.cpp
index fe9183ff068c01856f13479da84034011e5b040d..673779148779d15e2723c2eb83656579ed2557bd 100644 (file)
--- a/mv_machine_learning/training/src/training_model.cpp
+++ b/mv_machine_learning/training/src/training_model.cpp
@@ -31,7 +31,7 @@
 
 using namespace std;
 using namespace TrainingEngineInterface::Common;
-using namespace Mediavision::MachineLearning::Exception;
+using namespace mediavision::machine_learning::exception;
 
 TrainingModel::TrainingModel(const mv_inference_backend_type_e backend_type,
                                                         const mv_inference_target_device_e target_type,