From 3be8b99bdaafb13b3c3b0fab5883c44bcc984c24 Mon Sep 17 00:00:00 2001
From: Matteo Cypriani <matteo.cypriani@univ-fcomte.fr>
Date: Tue, 28 Aug 2012 19:29:06 +0200
Subject: [PATCH] s20: change suffix

README: document the suffixes.
---
 v1.3.1/README.org                             | 21 ++++++++++++++-----
 ...d.agg => s20_t01_fon_2012-08-23+calib.agg} |  0
 ...d.agg => s20_t02_fon_2012-08-28+calib.agg} |  0
 ...gg => s20_t02_fon_2012-08-28+calib_1p.agg} |  0
 ...xt => s20_t02_fon_2012-08-28+calib_1p.txt} |  0
 ... => s20_t02_fon_2012-08-28+calib_2-3m.agg} |  0
 ... => s20_t02_fon_2012-08-28+calib_2-3m.txt} |  0
 ...gg => s20_t02_fon_2012-08-28+calib_2m.agg} |  0
 ...xt => s20_t02_fon_2012-08-28+calib_2m.txt} |  0
 9 files changed, 16 insertions(+), 5 deletions(-)
 rename v1.3.1/s20/{s20_t01_fon_2012-08-23+coord.agg => s20_t01_fon_2012-08-23+calib.agg} (100%)
 rename v1.3.1/s20/{s20_t02_fon_2012-08-28+coord.agg => s20_t02_fon_2012-08-28+calib.agg} (100%)
 rename v1.3.1/s20/{s20_t02_fon_2012-08-28+coord_1p.agg => s20_t02_fon_2012-08-28+calib_1p.agg} (100%)
 rename v1.3.1/s20/{s20_t02_fon_2012-08-28+coord_1p.txt => s20_t02_fon_2012-08-28+calib_1p.txt} (100%)
 rename v1.3.1/s20/{s20_t02_fon_2012-08-28+coord_2-3m.agg => s20_t02_fon_2012-08-28+calib_2-3m.agg} (100%)
 rename v1.3.1/s20/{s20_t02_fon_2012-08-28+coord_2-3m.txt => s20_t02_fon_2012-08-28+calib_2-3m.txt} (100%)
 rename v1.3.1/s20/{s20_t02_fon_2012-08-28+coord_2m.agg => s20_t02_fon_2012-08-28+calib_2m.agg} (100%)
 rename v1.3.1/s20/{s20_t02_fon_2012-08-28+coord_2m.txt => s20_t02_fon_2012-08-28+calib_2m.txt} (100%)

diff --git a/v1.3.1/README.org b/v1.3.1/README.org
index 2473609..9a9ea12 100644
--- a/v1.3.1/README.org
+++ b/v1.3.1/README.org
@@ -3,7 +3,7 @@ Scenarios
 
 * File naming convention
 
-: sS_jJ_dev_YYYY-MM-DD.extension
+: sS_jJ_dev_YYYY-MM-DD[+suffix][_similarity].extension
 
 With:
 - S :: scenario number.
@@ -12,6 +12,15 @@ With:
 - MM :: month.
 - DD :: day.
 - dev :: client device short name.
+- suffix :: an optional suffix can be added, separated by a +; suffixes
+  have the following meanings:
+  + coord :: the real coordinate were added in the file;
+  + calib :: the file is a manual calibration file, containing
+             calibration requests (type 1) (+coord is implied, as
+             manual calibration requests always contain the mobile's
+             coordinates); it can be made from real calibration
+             requests, or from simple positioning requests with added
+             coordinates and adapted type.
 - extension :: file extension:
   + agg :: OwlPS Aggregator output file;
   + txt :: experiment report;
@@ -21,10 +30,12 @@ With:
   + err :: OwlPS Positioner standard error;
   + ods :: results formatted in a spreadsheet.
 
-If "+coord" is present in a file name before the extension, it means the
-real coordinates were added.
-For the results, after "+coord", the name of the similarity algorithm
-can be added (mean, interval, interval2).
+For the result files, the name of the similarity algorithm used to
+compute the positions is added after the suffix. For now it can be one
+of the following:
+- mean,
+- interval,
+- interval2.
 
 
 * Client devices
diff --git a/v1.3.1/s20/s20_t01_fon_2012-08-23+coord.agg b/v1.3.1/s20/s20_t01_fon_2012-08-23+calib.agg
similarity index 100%
rename from v1.3.1/s20/s20_t01_fon_2012-08-23+coord.agg
rename to v1.3.1/s20/s20_t01_fon_2012-08-23+calib.agg
diff --git a/v1.3.1/s20/s20_t02_fon_2012-08-28+coord.agg b/v1.3.1/s20/s20_t02_fon_2012-08-28+calib.agg
similarity index 100%
rename from v1.3.1/s20/s20_t02_fon_2012-08-28+coord.agg
rename to v1.3.1/s20/s20_t02_fon_2012-08-28+calib.agg
diff --git a/v1.3.1/s20/s20_t02_fon_2012-08-28+coord_1p.agg b/v1.3.1/s20/s20_t02_fon_2012-08-28+calib_1p.agg
similarity index 100%
rename from v1.3.1/s20/s20_t02_fon_2012-08-28+coord_1p.agg
rename to v1.3.1/s20/s20_t02_fon_2012-08-28+calib_1p.agg
diff --git a/v1.3.1/s20/s20_t02_fon_2012-08-28+coord_1p.txt b/v1.3.1/s20/s20_t02_fon_2012-08-28+calib_1p.txt
similarity index 100%
rename from v1.3.1/s20/s20_t02_fon_2012-08-28+coord_1p.txt
rename to v1.3.1/s20/s20_t02_fon_2012-08-28+calib_1p.txt
diff --git a/v1.3.1/s20/s20_t02_fon_2012-08-28+coord_2-3m.agg b/v1.3.1/s20/s20_t02_fon_2012-08-28+calib_2-3m.agg
similarity index 100%
rename from v1.3.1/s20/s20_t02_fon_2012-08-28+coord_2-3m.agg
rename to v1.3.1/s20/s20_t02_fon_2012-08-28+calib_2-3m.agg
diff --git a/v1.3.1/s20/s20_t02_fon_2012-08-28+coord_2-3m.txt b/v1.3.1/s20/s20_t02_fon_2012-08-28+calib_2-3m.txt
similarity index 100%
rename from v1.3.1/s20/s20_t02_fon_2012-08-28+coord_2-3m.txt
rename to v1.3.1/s20/s20_t02_fon_2012-08-28+calib_2-3m.txt
diff --git a/v1.3.1/s20/s20_t02_fon_2012-08-28+coord_2m.agg b/v1.3.1/s20/s20_t02_fon_2012-08-28+calib_2m.agg
similarity index 100%
rename from v1.3.1/s20/s20_t02_fon_2012-08-28+coord_2m.agg
rename to v1.3.1/s20/s20_t02_fon_2012-08-28+calib_2m.agg
diff --git a/v1.3.1/s20/s20_t02_fon_2012-08-28+coord_2m.txt b/v1.3.1/s20/s20_t02_fon_2012-08-28+calib_2m.txt
similarity index 100%
rename from v1.3.1/s20/s20_t02_fon_2012-08-28+coord_2m.txt
rename to v1.3.1/s20/s20_t02_fon_2012-08-28+calib_2m.txt