From 00f6700316ce7e445782f77d52e899e16a9fb28a Mon Sep 17 00:00:00 2001 From: Somin Kim Date: Fri, 15 Apr 2016 17:24:43 +0900 Subject: [PATCH] Rename app inactive detector in C++ style Change-Id: I6129687b83c38f6d9221d4bbeffff1f409384849 Signed-off-by: Somin Kim --- ...p_inactive_detector.cpp => AppInactiveDetector.cpp} | 6 +++--- .../{app_inactive_detector.h => AppInactiveDetector.h} | 4 ++-- ...ive_detector_types.h => AppInactiveDetectorTypes.h} | 0 .../{inactive_detector.cpp => InactiveDetector.cpp} | 8 ++++---- .../{inactive_detector.h => InactiveDetector.h} | 2 +- ...sificator.cpp => InactiveDetectorClassificator.cpp} | 10 +++++----- ...classificator.h => InactiveDetectorClassificator.h} | 2 +- ...ans.cpp => InactiveDetectorClassificatorKmeans.cpp} | 6 +++--- ..._kmeans.h => InactiveDetectorClassificatorKmeans.h} | 2 +- ...es.h => InactiveDetectorClassificatorKmeansTypes.h} | 0 ...etector_storage.cpp => InactiveDetectorStorage.cpp} | 10 +++++----- ...ve_detector_storage.h => InactiveDetectorStorage.h} | 2 +- ...rage_queries.h => InactiveDetectorStorageQueries.h} | 2 +- ..._detector_weight.cpp => InactiveDetectorWeight.cpp} | 7 +++---- ...tive_detector_weight.h => InactiveDetectorWeight.h} | 0 15 files changed, 30 insertions(+), 31 deletions(-) rename src/statistics/app/app_inactive_detector/{app_inactive_detector.cpp => AppInactiveDetector.cpp} (95%) rename src/statistics/app/app_inactive_detector/{app_inactive_detector.h => AppInactiveDetector.h} (92%) rename src/statistics/app/app_inactive_detector/{app_inactive_detector_types.h => AppInactiveDetectorTypes.h} (100%) rename src/statistics/app/app_inactive_detector/{inactive_detector.cpp => InactiveDetector.cpp} (95%) rename src/statistics/app/app_inactive_detector/{inactive_detector.h => InactiveDetector.h} (96%) rename src/statistics/app/app_inactive_detector/{inactive_detector_classificator.cpp => InactiveDetectorClassificator.cpp} (83%) rename src/statistics/app/app_inactive_detector/{inactive_detector_classificator.h => InactiveDetectorClassificator.h} (96%) rename src/statistics/app/app_inactive_detector/{inactive_detector_classificator_kmeans.cpp => InactiveDetectorClassificatorKmeans.cpp} (96%) rename src/statistics/app/app_inactive_detector/{inactive_detector_classificator_kmeans.h => InactiveDetectorClassificatorKmeans.h} (96%) rename src/statistics/app/app_inactive_detector/{inactive_detector_classificator_kmeans_types.h => InactiveDetectorClassificatorKmeansTypes.h} (100%) rename src/statistics/app/app_inactive_detector/{inactive_detector_storage.cpp => InactiveDetectorStorage.cpp} (97%) rename src/statistics/app/app_inactive_detector/{inactive_detector_storage.h => InactiveDetectorStorage.h} (97%) rename src/statistics/app/app_inactive_detector/{inactive_detector_storage_queries.h => InactiveDetectorStorageQueries.h} (99%) rename src/statistics/app/app_inactive_detector/{inactive_detector_weight.cpp => InactiveDetectorWeight.cpp} (91%) rename src/statistics/app/app_inactive_detector/{inactive_detector_weight.h => InactiveDetectorWeight.h} (100%) diff --git a/src/statistics/app/app_inactive_detector/app_inactive_detector.cpp b/src/statistics/app/app_inactive_detector/AppInactiveDetector.cpp similarity index 95% rename from src/statistics/app/app_inactive_detector/app_inactive_detector.cpp rename to src/statistics/app/app_inactive_detector/AppInactiveDetector.cpp index ef5c23a..48dc313 100644 --- a/src/statistics/app/app_inactive_detector/app_inactive_detector.cpp +++ b/src/statistics/app/app_inactive_detector/AppInactiveDetector.cpp @@ -17,9 +17,9 @@ #include #include #include -#include "app_inactive_detector.h" -#include "app_inactive_detector_types.h" -#include "inactive_detector.h" +#include "AppInactiveDetector.h" +#include "AppInactiveDetectorTypes.h" +#include "InactiveDetector.h" ctx::app_inactive_detector_provider *ctx::app_inactive_detector_provider::__instance = NULL; diff --git a/src/statistics/app/app_inactive_detector/app_inactive_detector.h b/src/statistics/app/app_inactive_detector/AppInactiveDetector.h similarity index 92% rename from src/statistics/app/app_inactive_detector/app_inactive_detector.h rename to src/statistics/app/app_inactive_detector/AppInactiveDetector.h index 94e5b83..2dd427d 100644 --- a/src/statistics/app/app_inactive_detector/app_inactive_detector.h +++ b/src/statistics/app/app_inactive_detector/AppInactiveDetector.h @@ -18,8 +18,8 @@ #define __CONTEXT_APP_INACTIVE_DETECTOR_H__ #include -#include "app_inactive_detector_types.h" -#include "inactive_detector.h" +#include "AppInactiveDetectorTypes.h" +#include "InactiveDetector.h" namespace ctx { diff --git a/src/statistics/app/app_inactive_detector/app_inactive_detector_types.h b/src/statistics/app/app_inactive_detector/AppInactiveDetectorTypes.h similarity index 100% rename from src/statistics/app/app_inactive_detector/app_inactive_detector_types.h rename to src/statistics/app/app_inactive_detector/AppInactiveDetectorTypes.h diff --git a/src/statistics/app/app_inactive_detector/inactive_detector.cpp b/src/statistics/app/app_inactive_detector/InactiveDetector.cpp similarity index 95% rename from src/statistics/app/app_inactive_detector/inactive_detector.cpp rename to src/statistics/app/app_inactive_detector/InactiveDetector.cpp index 5da86fe..6cc1820 100644 --- a/src/statistics/app/app_inactive_detector/inactive_detector.cpp +++ b/src/statistics/app/app_inactive_detector/InactiveDetector.cpp @@ -16,10 +16,10 @@ #include #include -#include "inactive_detector.h" -#include "inactive_detector_weight.h" -#include "inactive_detector_storage.h" -#include "inactive_detector_classificator.h" +#include "InactiveDetector.h" +#include "InactiveDetectorWeight.h" +#include "InactiveDetectorStorage.h" +#include "InactiveDetectorClassificator.h" #include "TimerManager.h" ctx::inactive_detector::inactive_detector() diff --git a/src/statistics/app/app_inactive_detector/inactive_detector.h b/src/statistics/app/app_inactive_detector/InactiveDetector.h similarity index 96% rename from src/statistics/app/app_inactive_detector/inactive_detector.h rename to src/statistics/app/app_inactive_detector/InactiveDetector.h index 62701d8..8c2d0a0 100644 --- a/src/statistics/app/app_inactive_detector/inactive_detector.h +++ b/src/statistics/app/app_inactive_detector/InactiveDetector.h @@ -20,7 +20,7 @@ #include #include #include -#include "app_inactive_detector_types.h" +#include "AppInactiveDetectorTypes.h" #include namespace ctx { diff --git a/src/statistics/app/app_inactive_detector/inactive_detector_classificator.cpp b/src/statistics/app/app_inactive_detector/InactiveDetectorClassificator.cpp similarity index 83% rename from src/statistics/app/app_inactive_detector/inactive_detector_classificator.cpp rename to src/statistics/app/app_inactive_detector/InactiveDetectorClassificator.cpp index adcf699..5e5859b 100644 --- a/src/statistics/app/app_inactive_detector/inactive_detector_classificator.cpp +++ b/src/statistics/app/app_inactive_detector/InactiveDetectorClassificator.cpp @@ -14,10 +14,10 @@ * limitations under the License. */ #include -#include "inactive_detector.h" -#include "app_inactive_detector_types.h" -#include "inactive_detector_classificator.h" -#include "inactive_detector_classificator_kmeans.h" +#include "InactiveDetector.h" +#include "AppInactiveDetectorTypes.h" +#include "InactiveDetectorClassificator.h" +#include "InactiveDetectorClassificatorKmeans.h" int ctx::inactive_detector_classificator::classify(std::vector *apps_with_weights) { @@ -25,4 +25,4 @@ int ctx::inactive_detector_classificator::classify(std::vector *apps_with int error = kmeans.classify(apps_with_weights); return error; -} \ No newline at end of file +} diff --git a/src/statistics/app/app_inactive_detector/inactive_detector_classificator.h b/src/statistics/app/app_inactive_detector/InactiveDetectorClassificator.h similarity index 96% rename from src/statistics/app/app_inactive_detector/inactive_detector_classificator.h rename to src/statistics/app/app_inactive_detector/InactiveDetectorClassificator.h index e5655d9..fc9abd0 100644 --- a/src/statistics/app/app_inactive_detector/inactive_detector_classificator.h +++ b/src/statistics/app/app_inactive_detector/InactiveDetectorClassificator.h @@ -18,7 +18,7 @@ #define __CONTEXT_INACTIVE_DETECTOR_CLASSIFICATOR_H__ #include -#include "app_inactive_detector_types.h" +#include "AppInactiveDetectorTypes.h" #include namespace ctx { diff --git a/src/statistics/app/app_inactive_detector/inactive_detector_classificator_kmeans.cpp b/src/statistics/app/app_inactive_detector/InactiveDetectorClassificatorKmeans.cpp similarity index 96% rename from src/statistics/app/app_inactive_detector/inactive_detector_classificator_kmeans.cpp rename to src/statistics/app/app_inactive_detector/InactiveDetectorClassificatorKmeans.cpp index 298f60d..c0cb93e 100644 --- a/src/statistics/app/app_inactive_detector/inactive_detector_classificator_kmeans.cpp +++ b/src/statistics/app/app_inactive_detector/InactiveDetectorClassificatorKmeans.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ #include -#include "app_inactive_detector_types.h" -#include "inactive_detector_classificator_kmeans.h" -#include "inactive_detector_classificator_kmeans_types.h" +#include "AppInactiveDetectorTypes.h" +#include "InactiveDetectorClassificatorKmeans.h" +#include "InactiveDetectorClassificatorKmeansTypes.h" #include #include diff --git a/src/statistics/app/app_inactive_detector/inactive_detector_classificator_kmeans.h b/src/statistics/app/app_inactive_detector/InactiveDetectorClassificatorKmeans.h similarity index 96% rename from src/statistics/app/app_inactive_detector/inactive_detector_classificator_kmeans.h rename to src/statistics/app/app_inactive_detector/InactiveDetectorClassificatorKmeans.h index dd99125..adc1fe8 100644 --- a/src/statistics/app/app_inactive_detector/inactive_detector_classificator_kmeans.h +++ b/src/statistics/app/app_inactive_detector/InactiveDetectorClassificatorKmeans.h @@ -18,7 +18,7 @@ #define __CONTEXT_INACTIVE_DETECTOR_CLASSIFICATOR_KMEANS_H__ #include -#include "inactive_detector_classificator_kmeans_types.h" +#include "InactiveDetectorClassificatorKmeansTypes.h" #include namespace ctx { diff --git a/src/statistics/app/app_inactive_detector/inactive_detector_classificator_kmeans_types.h b/src/statistics/app/app_inactive_detector/InactiveDetectorClassificatorKmeansTypes.h similarity index 100% rename from src/statistics/app/app_inactive_detector/inactive_detector_classificator_kmeans_types.h rename to src/statistics/app/app_inactive_detector/InactiveDetectorClassificatorKmeansTypes.h diff --git a/src/statistics/app/app_inactive_detector/inactive_detector_storage.cpp b/src/statistics/app/app_inactive_detector/InactiveDetectorStorage.cpp similarity index 97% rename from src/statistics/app/app_inactive_detector/inactive_detector_storage.cpp rename to src/statistics/app/app_inactive_detector/InactiveDetectorStorage.cpp index 3cfcb2d..052c3fe 100644 --- a/src/statistics/app/app_inactive_detector/inactive_detector_storage.cpp +++ b/src/statistics/app/app_inactive_detector/InactiveDetectorStorage.cpp @@ -19,11 +19,11 @@ #include #include #include -#include "inactive_detector.h" -#include "inactive_detector_storage.h" -#include "inactive_detector_storage_queries.h" -#include "inactive_detector_classificator.h" -#include "app_inactive_detector_types.h" +#include "InactiveDetector.h" +#include "InactiveDetectorStorage.h" +#include "InactiveDetectorStorageQueries.h" +#include "InactiveDetectorClassificator.h" +#include "AppInactiveDetectorTypes.h" /*int ctx::inactive_detector_storage::create_table() { diff --git a/src/statistics/app/app_inactive_detector/inactive_detector_storage.h b/src/statistics/app/app_inactive_detector/InactiveDetectorStorage.h similarity index 97% rename from src/statistics/app/app_inactive_detector/inactive_detector_storage.h rename to src/statistics/app/app_inactive_detector/InactiveDetectorStorage.h index 6292768..0eab066 100644 --- a/src/statistics/app/app_inactive_detector/inactive_detector_storage.h +++ b/src/statistics/app/app_inactive_detector/InactiveDetectorStorage.h @@ -18,7 +18,7 @@ #define __CONTEXT_INACTIVE_DETECTOR_STORAGE_H__ #include -#include "app_inactive_detector_types.h" +#include "AppInactiveDetectorTypes.h" #include #include diff --git a/src/statistics/app/app_inactive_detector/inactive_detector_storage_queries.h b/src/statistics/app/app_inactive_detector/InactiveDetectorStorageQueries.h similarity index 99% rename from src/statistics/app/app_inactive_detector/inactive_detector_storage_queries.h rename to src/statistics/app/app_inactive_detector/InactiveDetectorStorageQueries.h index 469bd17..4ef20d3 100644 --- a/src/statistics/app/app_inactive_detector/inactive_detector_storage_queries.h +++ b/src/statistics/app/app_inactive_detector/InactiveDetectorStorageQueries.h @@ -18,7 +18,7 @@ #define __CONTEXT_INACTIVE_DETECTOR_STORAGE_QUERIES_H__ #include -#include "app_inactive_detector_types.h" +#include "AppInactiveDetectorTypes.h" /* diff --git a/src/statistics/app/app_inactive_detector/inactive_detector_weight.cpp b/src/statistics/app/app_inactive_detector/InactiveDetectorWeight.cpp similarity index 91% rename from src/statistics/app/app_inactive_detector/inactive_detector_weight.cpp rename to src/statistics/app/app_inactive_detector/InactiveDetectorWeight.cpp index 52ed158..202301b 100644 --- a/src/statistics/app/app_inactive_detector/inactive_detector_weight.cpp +++ b/src/statistics/app/app_inactive_detector/InactiveDetectorWeight.cpp @@ -15,9 +15,8 @@ */ #include -#include "inactive_detector_weight.h" -#include "inactive_detector_storage.h" - +#include "InactiveDetectorWeight.h" +#include "InactiveDetectorStorage.h" int ctx::inactive_detector_weight::request_weights( double timestamp_from) @@ -27,4 +26,4 @@ int ctx::inactive_detector_weight::request_weights( int error = ids.get_apps_info_w_weights(timestamp_from); return error; -} \ No newline at end of file +} diff --git a/src/statistics/app/app_inactive_detector/inactive_detector_weight.h b/src/statistics/app/app_inactive_detector/InactiveDetectorWeight.h similarity index 100% rename from src/statistics/app/app_inactive_detector/inactive_detector_weight.h rename to src/statistics/app/app_inactive_detector/InactiveDetectorWeight.h -- 2.34.1