SET(target "${target_prefix}-my-place")
+SET(target_myplace_utils_static "${target}-utils_static")
+
+INCLUDE_DIRECTORIES(utils)
SET(DEPS ${DEPS}
gmodule-2.0
capi-network-wifi
)
-FILE(GLOB SRCS *.cpp facade/*.cpp utils/*.cpp visit-detector/*.cpp)
+FILE(GLOB SRCS *.cpp facade/*.cpp visit-detector/*.cpp)
INCLUDE(FindPkgConfig)
PKG_CHECK_MODULES(PKG_MYPLACE REQUIRED ${DEPS})
ENDFOREACH(flag)
ADD_LIBRARY(${target} SHARED ${SRCS})
-TARGET_LINK_LIBRARIES(${target} ${PKG_MYPLACE_LDFLAGS} ${target_shared})
+TARGET_LINK_LIBRARIES(${target} ${PKG_MYPLACE_LDFLAGS} ${target_shared} ${target_myplace_utils_static})
INSTALL(TARGETS ${target} DESTINATION ${CMAKE_INSTALL_LIBDIR}/${target_dir})
+ADD_SUBDIRECTORY(utils)
ADD_SUBDIRECTORY(place)
ADD_SUBDIRECTORY(visit-categer)
\ No newline at end of file
#include <TimerManager.h>
#include <ITimerListener.h>
#include "../visit-detector/VisitDetector.h"
-#include "../place/PlacesDetector.h"
-#include "UserPlacesTypes.h"
+#include <UserPlacesTypes.h>
namespace ctx {
SET(target "${target_prefix}-my-place-places-detector")
+INCLUDE_DIRECTORIES(../utils)
+
FILE(GLOB SRCS *.cpp)
ADD_LIBRARY(${target} SHARED ${SRCS})
+TARGET_LINK_LIBRARIES(${target} ${target_myplace_utils_static})
INSTALL(TARGETS ${target} DESTINATION ${CMAKE_INSTALL_LIBDIR}/${target_dir})
\ No newline at end of file
*/
#include "PlaceCateger.h"
-#include "../utils/Median.h"
-#include "../facade/UserPlacesParams.h"
-#include "../facade/UserPlacesTypes.h"
+#include <Median.h>
+#include <UserPlacesParams.h>
+#include <UserPlacesTypes.h>
#include <algorithm>
#include <Types.h>
#ifndef _CONTEXT_PLACE_RECOGNITION_PLACE_CATEGER_
#define _CONTEXT_PLACE_RECOGNITION_PLACE_CATEGER_
-#include "../facade/UserPlacesTypes.h"
+#include <UserPlacesTypes.h>
#include <utility>
#include <vector>
#include <string>
#include <sstream>
#include <Types.h>
#include <Json.h>
-#include "../utils/Similarity.h"
+#include <Similarity.h>
#include "PlacesDetector.h"
#include "PlaceCateger.h"
-#include "../utils/Median.h"
+#include <Median.h>
#ifdef TIZEN_ENGINEER_MODE
-#include "../utils/Gmap.h"
+#include <Gmap.h>
#endif /* TIZEN_ENGINEER_MODE */
-#include "../facade/UserPlacesTypes.h"
+#include <UserPlacesTypes.h>
#include <fstream>
#include <algorithm>
-#include "../facade/UserPlacesParams.h"
-#include "../utils/DebugUtils.h"
+#include <UserPlacesParams.h>
+#include <DebugUtils.h>
#include <DatabaseManager.h>
#define __DELETE_PLACES_QUERY "DELETE FROM " PLACE_TABLE
{
double value;
row.get(NULL, key, &value);
- _D("__doubleValueFromJson, key:%s, value: %lf", key, value);
+ _D("key: %s, value: %lf", key, value);
return value;
}
#include <vector>
#include <cstdint>
#include <ITimerListener.h>
-#include "../facade/UserPlacesTypes.h"
+#include <UserPlacesTypes.h>
#include <MyPlaceTypes.h>
#include "Graph.h"
--- /dev/null
+SET(target ${target_myplace_utils_static})
+
+FILE(GLOB SRCS *.cpp)
+
+ADD_LIBRARY(${target} STATIC ${SRCS})
\ No newline at end of file
#ifndef _CONTEXT_PLACE_RECOGNITION_GMAP_H_
#define _CONTEXT_PLACE_RECOGNITION_GMAP_H_
-#include "../facade/UserPlacesTypes.h"
+#include "UserPlacesTypes.h"
#define GMAP_FILE "/tmp/user_places_map.html"
#ifndef _CONTEXT_PLACE_RECOGNITION_MEDIAN_
#define _CONTEXT_PLACE_RECOGNITION_MEDIAN_
-#include "../facade/UserPlacesTypes.h"
+#include "UserPlacesTypes.h"
#include <vector>
namespace ctx {
#ifndef _CONTEXT_PLACE_RECOGNITION_SIMILAR_H_
#define _CONTEXT_PLACE_RECOGNITION_SIMILAR_H_
-#include "../facade/UserPlacesTypes.h"
+#include "UserPlacesTypes.h"
namespace ctx {
#include <Types.h>
#include "UserPlacesTypes.h"
#include "UserPlacesParams.h"
-#include "../utils/DebugUtils.h"
+#include "DebugUtils.h"
#define __MAC_STRING_COMPONENTS_SEPARATOR ':'
#define __MAC_SET_STRING_DELIMITER ','
SET(target "${target_prefix}-my-place-visit-categer")
+INCLUDE_DIRECTORIES(../utils)
+
FILE(GLOB SRCS *.cpp)
ADD_LIBRARY(${target} SHARED ${SRCS})
+TARGET_LINK_LIBRARIES(${target} ${target_myplace_utils_static})
INSTALL(TARGETS ${target} DESTINATION ${CMAKE_INSTALL_LIBDIR}/${target_dir})
\ No newline at end of file
#define _CONTEXT_PLACE_RECOGNITION_MAHAL_H_
#include <vector>
-#include "../facade/UserPlacesTypes.h"
+#include <UserPlacesTypes.h>
namespace ctx {
#ifndef _CONTEXT_PLACE_RECOGNITION_PIECEWISE_LIN_
#define _CONTEXT_PLACE_RECOGNITION_PIECEWISE_LIN_
-#include "../facade/UserPlacesTypes.h"
+#include <UserPlacesTypes.h>
namespace ctx {
#ifndef _CONTEXT_PLACE_RECOGNITION_VISIT_CATEGER_H_
#define _CONTEXT_PLACE_RECOGNITION_VISIT_CATEGER_H_
-#include "../facade/UserPlacesTypes.h"
+#include <UserPlacesTypes.h>
#include "Mahal.h"
#include "PiecewiseLin.h"
#include <map>
#ifndef _CONTEXT_PLACE_RECOGNITION_LOCATION_LISTENER_IFACE_H_
#define _CONTEXT_PLACE_RECOGNITION_LOCATION_LISTENER_IFACE_H_
-#include "../facade/UserPlacesTypes.h"
+#include <UserPlacesTypes.h>
namespace ctx {
#include <Types.h>
#include <Json.h>
#include <DatabaseManager.h>
-#include "../facade/UserPlacesTypes.h"
-#include "../facade/UserPlacesParams.h"
-#include "../utils/DebugUtils.h"
+#include <UserPlacesTypes.h>
+#include <UserPlacesParams.h>
+#include <DebugUtils.h>
#include "LocationLogger.h"
#ifdef TIZEN_ENGINEER_MODE
#include <sstream>
#include <Types.h>
#include <Json.h>
-#include "../facade/UserPlacesTypes.h"
+#include <UserPlacesTypes.h>
#include "VisitDetector.h"
-#include "../facade/UserPlacesParams.h"
-#include "../utils/Similarity.h"
-#include "../utils/Median.h"
-#include "../utils/DebugUtils.h"
+#include <UserPlacesParams.h>
+#include <Similarity.h>
+#include <Median.h>
+#include <DebugUtils.h>
#include <gmodule.h>
#include <DatabaseManager.h>
#include <map>
#include <unordered_map>
#include <unordered_set>
-#include "../facade/UserPlacesTypes.h"
+#include <UserPlacesTypes.h>
#include <Json.h>
#include "VisitListenerIface.h"
#include "LocationLogger.h"
#ifndef _CONTEXT_PLACE_RECOGNITION_WIFI_LISTENER_IFACE_H_
#define _CONTEXT_PLACE_RECOGNITION_WIFI_LISTENER_IFACE_H_
-#include "../facade/UserPlacesTypes.h"
+#include <UserPlacesTypes.h>
namespace ctx {
#include <sstream>
#include <Types.h>
#include <DatabaseManager.h>
-#include "../facade/UserPlacesTypes.h"
-#include "../utils/DebugUtils.h"
+#include <UserPlacesTypes.h>
+#include <DebugUtils.h>
#include "WifiLogger.h"
#define __WIFI_CREATE_TABLE_COLUMNS \
#include <TimerManager.h>
#include "WifiListenerIface.h"
#include "VisitListenerIface.h"
-#include "../facade/UserPlacesParams.h"
+#include <UserPlacesParams.h>
/* Database usage flag */
#define WIFI_LOGGER_DATABASE false