Rename Positioning -> Positioner
To be consistent with the other modules, the positioning server must be called OwlPS Positioner instead of Positioning, and the executable owlps-positionerd (even if the daemon mode is not implemented yet). That's a big commit for a tiny change.
This commit is contained in:
parent
b39dff9afb
commit
d5e2c975ae
22
Makefile
22
Makefile
|
@ -11,25 +11,25 @@ endif
|
|||
owlps-listener \
|
||||
owlps-aggregator \
|
||||
owlps-udp-to-http \
|
||||
owlps-positioning \
|
||||
owlps-positioner \
|
||||
install \
|
||||
install-owlps-client \
|
||||
install-owlps-listener \
|
||||
install-owlps-aggregator \
|
||||
install-owlps-udp-to-http \
|
||||
install-owlps-positioning \
|
||||
install-owlps-positioner \
|
||||
uninstall \
|
||||
uninstall-owlps-client \
|
||||
uninstall-owlps-listener \
|
||||
uninstall-owlps-aggregator \
|
||||
uninstall-owlps-udp-to-http \
|
||||
uninstall-owlps-positioning
|
||||
uninstall-owlps-positioner
|
||||
|
||||
## Compilation ##
|
||||
|
||||
all: \
|
||||
c \
|
||||
owlps-positioning
|
||||
owlps-positioner
|
||||
|
||||
c: \
|
||||
libowlps \
|
||||
|
@ -54,7 +54,7 @@ owlps-aggregator: libowlps
|
|||
@$(MAKE) -C $@ $(ARG)
|
||||
owlps-udp-to-http: libowlps libowlps-resultreader
|
||||
@$(MAKE) -C $@ $(ARG)
|
||||
owlps-positioning: libowlps
|
||||
owlps-positioner: libowlps
|
||||
@$(MAKE) -C $@ $(ARG)
|
||||
|
||||
|
||||
|
@ -66,7 +66,7 @@ install : \
|
|||
install-owlps-listener \
|
||||
install-owlps-aggregator \
|
||||
install-owlps-udp-to-http \
|
||||
install-owlps-positioning
|
||||
install-owlps-positioner
|
||||
|
||||
install-libowlps:
|
||||
@$(MAKE) -C $(subst install-,,$@) install
|
||||
|
@ -78,7 +78,7 @@ install-owlps-aggregator: install-libowlps
|
|||
@$(MAKE) -C $(subst install-,,$@) install
|
||||
install-owlps-udp-to-http: install-libowlps
|
||||
@$(MAKE) -C $(subst install-,,$@) install
|
||||
install-owlps-positioning: install-libowlps
|
||||
install-owlps-positioner: install-libowlps
|
||||
@$(MAKE) -C $(subst install-,,$@) install
|
||||
|
||||
|
||||
|
@ -90,7 +90,7 @@ uninstall : \
|
|||
uninstall-owlps-listener \
|
||||
uninstall-owlps-aggregator \
|
||||
uninstall-owlps-udp-to-http \
|
||||
uninstall-owlps-positioning
|
||||
uninstall-owlps-positioner
|
||||
|
||||
uninstall-libowlps:
|
||||
@$(MAKE) -C $(subst uninstall-,,$@) uninstall
|
||||
|
@ -102,7 +102,7 @@ uninstall-owlps-aggregator:
|
|||
@$(MAKE) -C $(subst uninstall-,,$@) uninstall
|
||||
uninstall-owlps-udp-to-http:
|
||||
@$(MAKE) -C $(subst uninstall-,,$@) uninstall
|
||||
uninstall-owlps-positioning:
|
||||
uninstall-owlps-positioner:
|
||||
@$(MAKE) -C $(subst uninstall-,,$@) uninstall
|
||||
|
||||
|
||||
|
@ -116,7 +116,7 @@ clean :
|
|||
@$(MAKE) -C owlps-listener clean
|
||||
@$(MAKE) -C owlps-aggregator clean
|
||||
@$(MAKE) -C owlps-udp-to-http clean
|
||||
@$(MAKE) -C owlps-positioning clean
|
||||
@$(MAKE) -C owlps-positioner clean
|
||||
|
||||
purge :
|
||||
@$(MAKE) -C libowlps purge
|
||||
|
@ -126,7 +126,7 @@ purge :
|
|||
@$(MAKE) -C owlps-listener purge
|
||||
@$(MAKE) -C owlps-aggregator purge
|
||||
@$(MAKE) -C owlps-udp-to-http purge
|
||||
@$(MAKE) -C owlps-positioning purge
|
||||
@$(MAKE) -C owlps-positioner purge
|
||||
|
||||
|
||||
## Help ##
|
||||
|
|
6
TODO
6
TODO
|
@ -24,7 +24,7 @@
|
|||
information. This will allow easy developments of clients in other
|
||||
languages.
|
||||
- Mark arguments as const in function headers if needed
|
||||
Mostly done in the owlps-positioning C++ code (should check that),
|
||||
Mostly done in the Positioner C++ code (should check that),
|
||||
but not constantly in C modules.
|
||||
[Done in libowlps & libowlps-client.]
|
||||
- Allow to use hostnames instead of IP addresses in all modules
|
||||
|
@ -100,7 +100,7 @@
|
|||
- Refactor prepare_answer().
|
||||
|
||||
|
||||
* Positioning
|
||||
* Positioner
|
||||
|
||||
- Known bugs
|
||||
° Cannot compute the error (Real) with autocalibration requests.
|
||||
|
@ -153,7 +153,7 @@
|
|||
° Improve --verbose (and/or debug level): print the options, etc.
|
||||
° Case-insensitive string comparison (for algorithm names, etc.).
|
||||
° Use a prefix for configuration files (search for config files set
|
||||
with relative path in owlps-positioning.cfg in the same directory).
|
||||
with relative path in owlps-positioner.cfg in the same directory).
|
||||
|
||||
- Optimisation & code improvement
|
||||
° Multithreading:
|
||||
|
|
|
@ -50,7 +50,7 @@ owl_result* owl_receive_position(int sockfd)
|
|||
|
||||
|
||||
/*
|
||||
* Splits the 'csv' string received from OwlPS Positioning and stores
|
||||
* Splits the 'csv' string received from OwlPS Positioner and stores
|
||||
* the fields in a new owl_result, and returns a pointer to it (or NULL
|
||||
* in case of error).
|
||||
*
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
* (Université de Franche-Comté), France.
|
||||
*
|
||||
* This is the header file of libowlps-resultreader, the library that
|
||||
* provides functions to read results sent on UDP by OwlPS Positioning.
|
||||
* provides functions to read results sent on UDP by OwlPS Positioner.
|
||||
*
|
||||
* See also the example program owlps-resultreader-udp.c.
|
||||
*/
|
||||
|
@ -19,7 +19,7 @@
|
|||
#include <inttypes.h>
|
||||
|
||||
|
||||
/* Maximum size of a result CSV string sent by OwlPS Positioning.
|
||||
/* Maximum size of a result CSV string sent by OwlPS Positioner.
|
||||
* Request's information:
|
||||
* MAC, request type (2 chars), timestamp, ';'
|
||||
* Plus, for each algorithm:
|
||||
|
|
|
@ -30,7 +30,7 @@ extern "C" {
|
|||
#define OWL_DEFAULT_REQUEST_PORT 9900
|
||||
// Port on which listeners and aggregator communicate:
|
||||
#define OWL_DEFAULT_LISTENER_PORT 9901
|
||||
// Port on which aggregator and positioning server communicate:
|
||||
// Port on which Aggregator and Positioner communicate:
|
||||
#define OWL_DEFAULT_AGGREGATION_PORT 9902
|
||||
// Port on which the aggregator listens for hello messages from the
|
||||
// listeners:
|
||||
|
@ -81,7 +81,7 @@ typedef struct _owl_captured_request
|
|||
} owl_captured_request ;
|
||||
|
||||
|
||||
/* Message sent by the aggregator to the positioning server containing
|
||||
/* Message sent by the Aggregator to the Positioner containing
|
||||
* the main data of a request */
|
||||
typedef struct _owl_request
|
||||
{
|
||||
|
@ -97,7 +97,7 @@ typedef struct _owl_request
|
|||
} owl_request ;
|
||||
|
||||
|
||||
/* Message sent by the aggregator to the positioning server refering to
|
||||
/* Message sent by the Aggregator to the Positioner refering to
|
||||
* a request, indicating that an AP received the request with a given
|
||||
* signal strength */
|
||||
typedef struct _owl_request_info
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
*
|
||||
* This is the main source file of OwlPS Aggregator, the program that
|
||||
* aggregates the requests captured by the Listeners in order to present
|
||||
* them to the positioning server.
|
||||
* them to the Positioner.
|
||||
*/
|
||||
|
||||
|
||||
|
|
|
@ -26,7 +26,7 @@ DOXYFILE_ENCODING = UTF-8
|
|||
# identify the project. Note that if you do not use Doxywizard you need
|
||||
# to put quotes around the project name if it contains spaces.
|
||||
|
||||
PROJECT_NAME = "OwlPS Positioning"
|
||||
PROJECT_NAME = "OwlPS Positioner"
|
||||
|
||||
# The PROJECT_NUMBER tag can be used to enter a project or revision number.
|
||||
# This could be handy for archiving the generated documentation or
|
|
@ -56,7 +56,7 @@ OWLPSFLAGS = -D OWLPS_VERSION=\"$(OWLPS_VERSION)\"
|
|||
# Targets
|
||||
.PHONY : all dynamic static test doc clean purge install uninstall style check
|
||||
|
||||
TARGET = owlps-positioning
|
||||
TARGET = owlps-positionerd
|
||||
OBJ_TARGET = $(OBJ_DIR)/$(TARGET).o
|
||||
SOURCE_TARGET = $(SRC_DIR)/$(TARGET).cc
|
||||
|
||||
|
@ -159,9 +159,9 @@ $(OBJ_DIR)/point3d.o: \
|
|||
$(OBJ_DIR)/posutil.o: \
|
||||
$(OBJ_DIR)/stock.o \
|
||||
$(OBJ_DIR)/posexcept.o
|
||||
$(OBJ_DIR)/owlps-positioning.o: \
|
||||
$(OBJ_DIR)/owlps-positionerd.o: \
|
||||
$(OBJ_DIR)/posexcept.o
|
||||
$(OBJ_DIR)/owlps-positioning.o: \
|
||||
$(OBJ_DIR)/owlps-positionerd.o: \
|
||||
$(OBJ_DIR)/userinterface.o \
|
||||
$(OBJ_DIR)/inputdatareader.o \
|
||||
$(OBJ_DIR)/stock.o \
|
||||
|
@ -408,11 +408,11 @@ help:
|
|||
@echo " cppcheck"
|
||||
@echo
|
||||
@echo "Targets:"
|
||||
@echo " all (default target): Compiles OwlPS Positioning."
|
||||
@echo " all (default target): Compiles OwlPS Positioner."
|
||||
@echo " doc: Generates documentation from source files (doxygen \
|
||||
is required)."
|
||||
@echo " install: Installs OwlPS Positioning."
|
||||
@echo " uninstall: Uninstalls OwlPS Positioning."
|
||||
@echo " install: Installs OwlPS Positioner."
|
||||
@echo " uninstall: Uninstalls OwlPS Positioner."
|
||||
@echo ""
|
||||
@echo " test: Run unit tests (CxxTest suite is required)."
|
||||
@echo " style: Reindent source files (astyle is required)."
|
|
@ -1,4 +1,4 @@
|
|||
# Sample configuration file for OWLPS Positioning
|
||||
# Sample configuration file for OwlPS Positioner
|
||||
|
||||
# [Miscellaneous options]
|
||||
|
||||
|
@ -47,7 +47,7 @@ csv-file = /tmp/input.csv
|
|||
#medium = none
|
||||
|
||||
medium = CSV
|
||||
csv-file = /tmp/owlps-positioning.log
|
||||
csv-file = /tmp/owlps-positioner.log
|
||||
|
||||
[positioning]
|
||||
# The options in this section are related to the way the requests are
|
||||
|
@ -141,7 +141,7 @@ csv-file = /tmp/owlps-positioning.log
|
|||
#medium = Terminal
|
||||
|
||||
#medium = CSV
|
||||
csv-file = /tmp/owlps-positioning.out
|
||||
csv-file = /tmp/owlps-positioner.out
|
||||
|
||||
#medium = UDP
|
||||
# Currently, the host must be an IP address (not a DNS name).
|
|
@ -3,7 +3,7 @@
|
|||
* OwlPS is a project of the University of Franche-Comté
|
||||
* (Université de Franche-Comté), France.
|
||||
*
|
||||
* This is the main source file of OwlPS Positioning, the program that
|
||||
* This is the main source file of OwlPS Positioner, the program that
|
||||
* computes the position of the mobile terminals.
|
||||
*/
|
||||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
|
||||
|
||||
/// Super-class of all exceptions defined in OWLPS-Positioning
|
||||
/// Super-class of all exceptions defined in OwlPS Positioner
|
||||
class posexcept: public std::exception
|
||||
{
|
||||
protected:
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue