Mercurial Hosting > traffic-intelligence

changeset 349:e3f910c26fae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
added other safety analysis parameters
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Thu, 27 Jun 2013 00:07:44 -0400
parents c64a4f889b97
children 7e9ad2d9d79c
files c/Parameters.cpp include/Parameters.hpp tracking.cfg
diffstat 3 files changed, 17 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/c/Parameters.cpp	Wed Jun 26 18:40:31 2013 -0400
+++ b/c/Parameters.cpp	Thu Jun 27 00:07:44 2013 -0400
@@ -63,6 +63,10 @@
     ("prediction-time-horizon", po::value<float>(&predictionTimeHorizon)->default_value(5.), "time horizon for collision prediction (s)")
     ("collision-distance", po::value<float>(&collisionDistance)->default_value(1.8), "collision distance threshold (m)")
     ("crossing-zones", po::value<bool>(&crossingZones)->default_value(false), "option to compute crossing zones and predicted PET")
+    ("npredicted-trajectories", po::value<int>(&nPredictedTrajectories)->default_value(1), "number of predicted trajectories (use depends on prediction method)")
+    ("min-acceleration", po::value<float>(&minAcceleration)->default_value(-9.1), "minimum acceleration for input distribution (m/s2) (used only for evasive action distributions)")
+    ("max-acceleration", po::value<float>(&maxAcceleration)->default_value(2.), "maximum acceleration for input distribution (m/s2)")
+    ("max-steering", po::value<float>(&maxSteering)->default_value(0.5), "maximum steering for input distribution (rad/s)")
     ;
   
   po::options_description cmdLine;
--- a/include/Parameters.hpp	Wed Jun 26 18:40:31 2013 -0400
+++ b/include/Parameters.hpp	Thu Jun 27 00:07:44 2013 -0400
@@ -53,6 +53,10 @@
   float predictionTimeHorizon;
   float collisionDistance;
   bool crossingZones;
+  int nPredictedTrajectories;
+  float minAcceleration;
+  float maxAcceleration;
+  float maxSteering;
 
   std::string parameterDescription;
 
--- a/tracking.cfg	Wed Jun 26 18:40:31 2013 -0400
+++ b/tracking.cfg	Thu Jun 27 00:07:44 2013 -0400
@@ -70,4 +70,12 @@
 # collision distance threshold (m)
 collision-distance = 1.8
 # option to compute crossing zones and predicted PET
-crossing-zones = false
\ No newline at end of file
+crossing-zones = false
+# number of predicted trajectories (use depends on prediction method)
+npredicted-trajectories = 10
+# minimum acceleration for input distribution (m/s2) (used only for evasive action distributions)
+min-acceleration = -9.1
+# maximum acceleration for input distribution (m/s2)
+max-acceleration = 2
+# maximum steering for input distribution (rad/s)
+max-steering = 0.5
\ No newline at end of file