From 6307f226dabf315cd181ba5c695eace208e04723 Mon Sep 17 00:00:00 2001 From: Somin Kim Date: Fri, 9 Sep 2016 17:44:00 +0900 Subject: [PATCH] Fix coding rule violations Change-Id: Ifed0d9c3accdb5f1de3957591fa86ce9d85708e7 Signed-off-by: Somin Kim --- .../app_inactive_detector/InactiveDetectorStorage.cpp | 2 +- src/prediction/assoc_rule_miner.cpp | 2 +- src/prediction/assoc_rule_producer.h | 4 ++-- src/prediction/basket_compressor.cpp | 4 ++-- src/prediction/item_catalogue.cpp | 2 +- src/prediction/item_catalogue.h | 4 ++-- src/prediction/weight_apriori.cpp | 2 +- src/prediction/weight_apriori.h | 2 +- src/social-stats/LogAggregator.cpp | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/app-stats/app_inactive_detector/InactiveDetectorStorage.cpp b/src/app-stats/app_inactive_detector/InactiveDetectorStorage.cpp index 7fd11a7..8349947 100644 --- a/src/app-stats/app_inactive_detector/InactiveDetectorStorage.cpp +++ b/src/app-stats/app_inactive_detector/InactiveDetectorStorage.cpp @@ -178,7 +178,7 @@ void ctx::InactiveDetectorStorage::__injectParams(std::string& str, const std::s return; size_t startPos = 0; - while((startPos = str.find(from, startPos)) != std::string::npos) { + while ((startPos = str.find(from, startPos)) != std::string::npos) { str.replace(startPos, from.length(), to); startPos += to.length(); } diff --git a/src/prediction/assoc_rule_miner.cpp b/src/prediction/assoc_rule_miner.cpp index a639af8..38affde 100644 --- a/src/prediction/assoc_rule_miner.cpp +++ b/src/prediction/assoc_rule_miner.cpp @@ -30,7 +30,7 @@ std::list ctx::AssocRuleMiner::mine_from_baskets( std::string consequentCategory) { SingleCategoryItemIdFilter itemIdFilter(consequentCategory, itemCatalogue); - BasketFilter::filter_in_place(initBaskets,itemIdFilter); + BasketFilter::filter_in_place(initBaskets, itemIdFilter); std::list compressedBaskets = BasketCompressor::compress(initBaskets); diff --git a/src/prediction/assoc_rule_producer.h b/src/prediction/assoc_rule_producer.h index 2b02b79..17c5d3a 100644 --- a/src/prediction/assoc_rule_producer.h +++ b/src/prediction/assoc_rule_producer.h @@ -28,14 +28,14 @@ namespace ctx { public: static std::list generate_rules( - const std::list> &freqItemIdSets, + const std::list> &freqItemIdSets, const IItemIdFilter &itemIdFilter, double minConfidence); static AssocRuleOfIds rule_template(const ItemIdSet &sourceItemIdSet, const IItemIdFilter &antecedentItemIdFilter); private: - static double supportOf(const std::list> &allFreqItemIdSets, const ItemIdSet &wanted); + static double supportOf(const std::list> &allFreqItemIdSets, const ItemIdSet &wanted); }; diff --git a/src/prediction/basket_compressor.cpp b/src/prediction/basket_compressor.cpp index f46c40d..31086bd 100644 --- a/src/prediction/basket_compressor.cpp +++ b/src/prediction/basket_compressor.cpp @@ -29,7 +29,7 @@ std::string ctx::BasketCompressor::itemset_string(const ctx::ItemIdSet& itemIdSe std::list ctx::BasketCompressor::compress(const std::list& inputBaskets) { - std::map basketsMap; + std::map basketsMap; // TODO: maybe it is worth to resign from string keys and use std::map instead. for (const Basket& basket : inputBaskets) { @@ -37,7 +37,7 @@ std::list ctx::BasketCompressor::compress(const std::list(itemSetStr, basket)); + basketsMap.insert(std::pair(itemSetStr, basket)); } else { Basket& compressedBasket = findResult->second; compressedBasket.weight += basket.weight; diff --git a/src/prediction/item_catalogue.cpp b/src/prediction/item_catalogue.cpp index 666b5a8..57189c4 100644 --- a/src/prediction/item_catalogue.cpp +++ b/src/prediction/item_catalogue.cpp @@ -20,7 +20,7 @@ int ctx::ItemCatalogue::id_of(const ctx::Item& item) { std::string s = ItemStringConverter::item_to_string(item); - std::map::iterator it = mItemIdsOfStrings.find(s); + std::map::iterator it = mItemIdsOfStrings.find(s); if (it == mItemIdsOfStrings.end()) { // new item mMaxId++; mItemIdsOfStrings[s] = mMaxId; diff --git a/src/prediction/item_catalogue.h b/src/prediction/item_catalogue.h index 404765b..92f727d 100644 --- a/src/prediction/item_catalogue.h +++ b/src/prediction/item_catalogue.h @@ -40,10 +40,10 @@ namespace ctx { private: /* Translates item string to its id */ - std::map mItemIdsOfStrings; + std::map mItemIdsOfStrings; /* Translating category string to int */ - std::map> mCategoryItemIds; + std::map> mCategoryItemIds; /* Stores item strings (index is item's id) */ std::vector mItemStrings; diff --git a/src/prediction/weight_apriori.cpp b/src/prediction/weight_apriori.cpp index 92aaebc..c95fe0d 100644 --- a/src/prediction/weight_apriori.cpp +++ b/src/prediction/weight_apriori.cpp @@ -82,7 +82,7 @@ std::list> ctx::WeightApriori::find_frequent_i double support = basketAgregator.supportOf(candidate); if (support >= supportThreshold) { freqItemsetsOfCurrSize.push_back(candidate); - allFreqItemsets.push_back(std::make_pair(candidate,support)); + allFreqItemsets.push_back(std::make_pair(candidate, support)); } } candidates = find_wider_candidates(freqItemsetsOfCurrSize, ++candidateSize); diff --git a/src/prediction/weight_apriori.h b/src/prediction/weight_apriori.h index 6cb493d..2749023 100644 --- a/src/prediction/weight_apriori.h +++ b/src/prediction/weight_apriori.h @@ -32,7 +32,7 @@ namespace ctx { static bool survives_prunning(ItemIdSet &widerCandidate, const std::list &narrowFreqSets); /* Find frequent itemsets along with its support value. */ - static std::list> find_frequent_itemid_sets(BasketsAgregator &basketAgregator, double supportThreshold); + static std::list> find_frequent_itemid_sets(BasketsAgregator &basketAgregator, double supportThreshold); private: static std::list single_size_candidates(BasketsAgregator &basketAgregator); diff --git a/src/social-stats/LogAggregator.cpp b/src/social-stats/LogAggregator.cpp index 63dbfea..fc7576f 100644 --- a/src/social-stats/LogAggregator.cpp +++ b/src/social-stats/LogAggregator.cpp @@ -154,7 +154,7 @@ void ctx::ContactLogAggregator::__insertContactLogList(contacts_list_h list) __dbManager.insert(0, SOCIAL_TABLE_CONTACT_LOG, data, NULL); - } while(contacts_list_next(list) == CONTACTS_ERROR_NONE); + } while (contacts_list_next(list) == CONTACTS_ERROR_NONE); } void ctx::ContactLogAggregator::__removeExpiredLog() -- 2.34.1