From: Marcin Masternak Date: Tue, 31 May 2016 18:09:57 +0000 (+0200) Subject: [my-place] Refactoring: hide internal methods to private. X-Git-Tag: submit/tizen/20160622.045445~1^2~5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=87b03cc1f33233ad3ca19115278703ec1b2d02ac;p=platform%2Fcore%2Fcontext%2Fcontext-provider.git [my-place] Refactoring: hide internal methods to private. Change-Id: Ifd0dd501b45055d1b61c9453bc9ccc5c5da928a1 Signed-off-by: Marcin Masternak --- diff --git a/src/my-place/user_places/mahal.cpp b/src/my-place/user_places/mahal.cpp index b78d34c..c7dd99d 100644 --- a/src/my-place/user_places/mahal.cpp +++ b/src/my-place/user_places/mahal.cpp @@ -18,7 +18,7 @@ #include #include -ctx::num_t ctx::MahalModel::distance(const std::vector &v1, const std::vector &v2, const std::vector &m) +ctx::num_t ctx::MahalModel::__distance(const std::vector &v1, const std::vector &v2, const std::vector &m) { size_t n = v1.size(); if (m.size() != n * n) { @@ -42,5 +42,5 @@ ctx::num_t ctx::MahalModel::distance(const std::vector &v1, const std::ve ctx::num_t ctx::MahalModel::distance(const std::vector &v) { - return distance(v, __mean, __sigma); + return __distance(v, __mean, __sigma); } diff --git a/src/my-place/user_places/mahal.h b/src/my-place/user_places/mahal.h index 9fc57ff..dadf859 100644 --- a/src/my-place/user_places/mahal.h +++ b/src/my-place/user_places/mahal.h @@ -30,9 +30,9 @@ namespace ctx { private: std::vector __mean; std::vector __sigma; // represents square matrix row-wise + static num_t __distance(const std::vector &v1, const std::vector &v2, const std::vector &m); public: - static num_t distance(const std::vector &v1, const std::vector &v2, const std::vector &m); MahalModel(std::vector mean, std::vector sigma) : __mean(mean), __sigma(sigma) { } diff --git a/src/my-place/user_places/place_categer.cpp b/src/my-place/user_places/place_categer.cpp index 5ec32e4..3532ab6 100644 --- a/src/my-place/user_places/place_categer.cpp +++ b/src/my-place/user_places/place_categer.cpp @@ -22,7 +22,7 @@ #include #include -void ctx::PlaceCateger::reduceOutliers(ctx::Visits &visits) +void ctx::PlaceCateger::__reduceOutliers(ctx::Visits &visits) { int size = visits.size(); visits.erase(std::remove_if( @@ -50,7 +50,7 @@ bool ctx::PlaceCateger::__reduceCategory(const PlaceCategId &categId, const ctx: void ctx::PlaceCateger::categorize(ctx::Visits &visits, ctx::Place &place) { - reduceOutliers(visits); + __reduceOutliers(visits); place.categId = PLACE_CATEG_ID_NONE; place.categConfidence = 0.0; @@ -64,7 +64,7 @@ void ctx::PlaceCateger::categorize(ctx::Visits &visits, ctx::Place &place) num_t sumScore = 0.0; num_t maxScore = 0.0; for (PlaceCategId categId : categIds) { - std::vector categVector = categVectorFromVisits(visits, categId); + std::vector categVector = __categVectorFromVisits(visits, categId); num_t score = median(categVector); sumScore += score; if (score > maxScore) { @@ -80,10 +80,10 @@ void ctx::PlaceCateger::categorize(ctx::Visits &visits, ctx::Place &place) } } - place.name = categId2Name(place.categId); + place.name = __categId2Name(place.categId); } -std::vector ctx::PlaceCateger::categVectorFromVisits(const ctx::Visits &visits, PlaceCategId categId) +std::vector ctx::PlaceCateger::__categVectorFromVisits(const ctx::Visits &visits, PlaceCategId categId) { std::vector vec; for (auto &visit : visits) { @@ -94,7 +94,7 @@ std::vector ctx::PlaceCateger::categVectorFromVisits(const ctx::Visi return vec; } -std::string ctx::PlaceCateger::categId2Name(PlaceCategId categId) { +std::string ctx::PlaceCateger::__categId2Name(PlaceCategId categId) { switch (categId) { case PLACE_CATEG_ID_HOME: return "home"; diff --git a/src/my-place/user_places/place_categer.h b/src/my-place/user_places/place_categer.h index 9632f6f..50df4b1 100644 --- a/src/my-place/user_places/place_categer.h +++ b/src/my-place/user_places/place_categer.h @@ -30,12 +30,12 @@ namespace ctx { private: static bool __reduceCategory(const PlaceCategId &categId, const ctx::Visits &visits); + static void __reduceOutliers(Visits &visits); + static std::vector __categVectorFromVisits(const ctx::Visits &visits, PlaceCategId categId); + static std::string __categId2Name(PlaceCategId categId); public: - static void reduceOutliers(Visits &visits); // TODO: move to private - static std::vector categVectorFromVisits(const ctx::Visits &visits, PlaceCategId categId); // TODO: move to private static void categorize(ctx::Visits &visits, ctx::Place &place); - static std::string categId2Name(PlaceCategId categId); // TODO: move to private }; /* class PlaceCateger */ diff --git a/src/my-place/user_places/places_detector.cpp b/src/my-place/user_places/places_detector.cpp index bec0fe6..d05647a 100644 --- a/src/my-place/user_places/places_detector.cpp +++ b/src/my-place/user_places/places_detector.cpp @@ -241,7 +241,7 @@ std::vector> ctx::PlacesDetector::__placesFromJsons( return places; } -void ctx::PlacesDetector::reduceOutliers(ctx::Visits &visits) +void ctx::PlacesDetector::__reduceOutliers(ctx::Visits &visits) { int size = visits.size(); visits.erase(std::remove_if( @@ -260,7 +260,7 @@ void ctx::PlacesDetector::reduceOutliers(ctx::Visits &visits) void ctx::PlacesDetector::__processVisits(ctx::Visits &visits) { - reduceOutliers(visits); + __reduceOutliers(visits); _D("__testMode = %d", __testMode); auto components = __mergeVisits(visits); @@ -359,7 +359,7 @@ std::shared_ptr ctx::PlacesDetector::__placeFromMergedVisits(Visits return place; } -void ctx::PlacesDetector::reduceOutliers(std::shared_ptr &cc) +void ctx::PlacesDetector::__reduceOutliers(std::shared_ptr &cc) { int size = cc->size(); cc->erase(std::remove_if(cc->begin(), @@ -377,7 +377,7 @@ std::shared_ptr ctx::PlacesDetector::__mergeVisits(const { auto graph = __graphFromVisits(visits); auto cc = graph::connectedComponents(*graph); - reduceOutliers(cc); + __reduceOutliers(cc); return cc; } diff --git a/src/my-place/user_places/places_detector.h b/src/my-place/user_places/places_detector.h index 91c4fd3..e67f204 100644 --- a/src/my-place/user_places/places_detector.h +++ b/src/my-place/user_places/places_detector.h @@ -63,13 +63,13 @@ namespace ctx { void __processVisits(Visits &visits); static void __mergeLocation(const Visits &mergedVisits, Place &place); std::shared_ptr __mergeVisits(const std::vector &visits); + static void __reduceOutliers(Visits &visits); + static void __reduceOutliers(std::shared_ptr &cc); bool onTimerExpired(int timerId); public: PlacesDetector(bool testMode = false); - static void reduceOutliers(Visits &visits); // TODO: move to private - static void reduceOutliers(std::shared_ptr &cc); // TODO: move to private std::vector> getPlaces(); }; /* class PlacesDetector */ diff --git a/src/my-place/user_places/visit_categer.cpp b/src/my-place/user_places/visit_categer.cpp index c5300f3..3b0805f 100644 --- a/src/my-place/user_places/visit_categer.cpp +++ b/src/my-place/user_places/visit_categer.cpp @@ -296,7 +296,7 @@ const std::vector ctx::VisitCateger::__featuresStd( 0.109386661911 }); -ctx::TimeFeatures ctx::VisitCateger::timeFeatures(const time_t &time) +ctx::TimeFeatures ctx::VisitCateger::__timeFeatures(const time_t &time) { struct tm timeinfo; struct tm *result; @@ -316,7 +316,7 @@ ctx::TimeFeatures ctx::VisitCateger::timeFeatures(const time_t &time) }; } -int ctx::VisitCateger::weeksScope(const TimeFeatures &startF, const Interval &interval) +int ctx::VisitCateger::__weeksScope(const TimeFeatures &startF, const Interval &interval) { int durationMinutes = (interval.end - interval.start) / 60; int scopeMinutes = startF.minutesSinceBeginingOfTheWeek + durationMinutes; @@ -347,7 +347,7 @@ ctx::num_t ctx::VisitCateger::__weekModelMeanValue(PlaceCategId categ, const Int { num_t ret = 0.0; int minutes = 0; - int ws = weeksScope(startF, interval); + int ws = __weeksScope(startF, interval); for (int week = 1; week <= ws; week++) { size_t startIndex = (week == 1) ? startF.minutesSinceBeginingOfTheWeek @@ -363,7 +363,7 @@ ctx::num_t ctx::VisitCateger::__weekModelMeanValue(PlaceCategId categ, const Int return ret; } -ctx::Categs ctx::VisitCateger::weekModelFeatures(const Interval &interval, const TimeFeatures &startF, const TimeFeatures &endF) +ctx::Categs ctx::VisitCateger::__weekModelFeatures(const Interval &interval, const TimeFeatures &startF, const TimeFeatures &endF) { ctx::Categs categs; for (const auto &item : prob_features::weekModel) { @@ -376,12 +376,12 @@ ctx::Categs ctx::VisitCateger::weekModelFeatures(const Interval &interval, const return categs; } -ctx::IntervalFeatures ctx::VisitCateger::intervalFeatures(const Interval &interval) +ctx::IntervalFeatures ctx::VisitCateger::__intervalFeatures(const Interval &interval) { num_t durationMinutes = 1.0 * (interval.end - interval.start) / 60; - TimeFeatures startFeatures = timeFeatures(interval.start); - TimeFeatures endFeatures = timeFeatures(interval.end); - Categs weekFeatures = weekModelFeatures(interval, startFeatures, endFeatures); + TimeFeatures startFeatures = __timeFeatures(interval.start); + TimeFeatures endFeatures = __timeFeatures(interval.end); + Categs weekFeatures = __weekModelFeatures(interval, startFeatures, endFeatures); return { durationMinutes, (num_t) startFeatures.minutesSinceMidnight, @@ -404,7 +404,7 @@ void ctx::VisitCateger::__normalize(std::vector &features) void ctx::VisitCateger::categorize(ctx::Visit &visit) { - IntervalFeatures features = intervalFeatures(visit.interval); + IntervalFeatures features = __intervalFeatures(visit.interval); __normalize(features); for (auto &modelPair : __models) { diff --git a/src/my-place/user_places/visit_categer.h b/src/my-place/user_places/visit_categer.h index 9f5a7fa..a457ca8 100644 --- a/src/my-place/user_places/visit_categer.h +++ b/src/my-place/user_places/visit_categer.h @@ -49,16 +49,15 @@ namespace ctx { static void __normalize(std::vector &features); static PiecewiseLin __chiApprox; // tabled chi function approximator - public: /** * Function interpret time in timestamp input argument, * * @param time timestamp * @return TimeFeatures structure with interpretations of timestamp */ - static TimeFeatures timeFeatures(const time_t &time); + static TimeFeatures __timeFeatures(const time_t &time); - static int weeksScope(const TimeFeatures &startF, const Interval &interval); + static int __weeksScope(const TimeFeatures &startF, const Interval &interval); /** * Function interpret time interval input argument and calculates scores @@ -69,7 +68,7 @@ namespace ctx { * @param endF end time features * @return Categs score that argument interval is home, work or other */ - static Categs weekModelFeatures(const Interval &interval, const TimeFeatures &startF, + static Categs __weekModelFeatures(const Interval &interval, const TimeFeatures &startF, const TimeFeatures &endF); /** @@ -78,7 +77,9 @@ namespace ctx { * @param interval time interval * @return IntervalFeatures vector with interpretations of input time interval */ - static IntervalFeatures intervalFeatures(const Interval &interval); + static IntervalFeatures __intervalFeatures(const Interval &interval); + + public: /** * Function categorize visit based on visits time interval and fill its categories values. diff --git a/src/my-place/user_places/visit_detector.cpp b/src/my-place/user_places/visit_detector.cpp index 03af967..9fc9264 100644 --- a/src/my-place/user_places/visit_detector.cpp +++ b/src/my-place/user_places/visit_detector.cpp @@ -363,7 +363,7 @@ std::shared_ptr ctx::VisitDetector::__macSharesFromCounts(ctx: return macs2Shares; } -std::shared_ptr ctx::VisitDetector::getVisits() +std::shared_ptr ctx::VisitDetector::__getVisits() { return __detectedVisits; } diff --git a/src/my-place/user_places/visit_detector.h b/src/my-place/user_places/visit_detector.h index 7b63e57..613c554 100644 --- a/src/my-place/user_places/visit_detector.h +++ b/src/my-place/user_places/visit_detector.h @@ -79,6 +79,7 @@ namespace ctx { bool __protrudesFrom(const Macs2Counts &macs2Counts, const MacSet &macSet); void __setPeriod(PlaceRecogMode mode); void __processCurrentLogger(); + std::shared_ptr __getVisits(); /* DATABASE */ void __dbCreateTables(); @@ -95,7 +96,6 @@ namespace ctx { VisitDetector(time_t startScan, PlaceRecogMode energyMode = PLACE_RECOG_HIGH_ACCURACY_MODE, bool testMode = false); ~VisitDetector(); - std::shared_ptr getVisits(); // only used in test mode void setMode(PlaceRecogMode energyMode); }; /* class VisitDetector */