mcy
/
owlps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix bugs in FBCM/FRBHM, parameters to radar_exp() 

Many bugs fixed in FBCM and Hybrid basic model.
Added parameters to radar_exp and Server contructor.

git-svn-id: https://pif.pu-pm.univ-fcomte.fr/svn/loc@67 785a6c6c-259e-4ff1-8b91-dc31627914f0
This commit is contained in:
Frédéric Lassabe 2008-08-07 13:44:54 +00:00 committed by Matteo Cypriani
parent 9c3e39ee29
commit a831e2fb8e
3 changed files with 1606 additions and 1574 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
GuiNuMo-server/guinumo.cc
View File

@ -14,15 +14,24 @@ using std::string;
int main(int argc, char ** argv)
{
ofstream output_file;
string read_file;
Server server ;
ofstream output_file;
string read_file;
server.createClient() ;
server.monitorClient(0, ALGO_CONTINU_FRBHM) ;
if(argc != 4)
cout << "Usage: guinumo AP_file Ref_Pt_file Test_file logfile" << endl;
else
{
string apfile = argv[1];
string refptfile = argv[2];
Server server(apfile, refptfile) ;
//server.createClient() ;
//server.monitorClient(0, ALGO_CONTINU_FRBHM) ;
string logfile = argv[4];
string testfile = argv[3];
server.radar_exp(logfile, testfile);
cout << argv[0] << " : fin." << endl ;
fflush(stdout) ;
return 0;
cout << argv[0] << " : fin." << endl ;
fflush(stdout) ;
}
return 0;
}

3147
GuiNuMo-server/server.cc
View File

File diff suppressed because it is too large Load Diff

6
GuiNuMo-server/server.hh
View File

@ -31,7 +31,7 @@ typedef ClientInfo::float_index float_index ;
#define DEFAULT_LOGFILE "log/radar_exp.csv" // Fichier de sortie
#define DEFAULT_REF_POINT_FILE "csv/agreg/1ppp/toutes.csv" // Fichier des points de référence
#define DEFAULT_REF_POINT_FILE "csv/agreg/1m/toutes.csv" // Fichier des points de référence
#define DEFAULT_REF_POINT_FILE_1M "csv/agreg/1m/toutes.csv" // Fichier contenant tous les points de référence (maillage à 1m)
#define DEFAULT_AP_FILE "cfg/minipc.cfg" // Fichier de configuration des AP
#define DEFAULT_TRACKING_FILE "csv/agreg/divagation/divagation9_interpolé.csv" // Fichier de prérégrination
@ -73,7 +73,7 @@ protected:
int sockSend;
public:
Server(const string &ip_addr = DEFAULT_IP, const int &listen_port = DEFAULT_LISTEN_PORT);
Server(const string &ap_file = DEFAULT_AP_FILE, const string &ref_pt_file = DEFAULT_REF_POINT_FILE, const string &ip_addr = DEFAULT_IP, const int &listen_port = DEFAULT_LISTEN_PORT);
~Server();
void send_to_client(const int &cl);
@ -140,7 +140,7 @@ public:
Point fastViterbiLike(const unsigned int &id_client, const float_array &distance_matrix) ;
/* For experimentation purpose only ! */
void radar_exp();
void radar_exp(const string &outfile = DEFAULT_LOGFILE, const string &testfile = DEFAULT_REF_POINT_FILE_1M);
};
#endif // _SERVER_HH_