# HG changeset patch # User Nicolas Saunier # Date 1694118028 14400 # Node ID 83ca1493d55cb5acf5923bb24e36954b705da2d1 # Parent 6487ef10c0e079eb091175af99cffa8ea5beac90 minor work / verif saving works diff -r 6487ef10c0e0 -r 83ca1493d55c c/Parameters.cpp --- a/c/Parameters.cpp Thu Aug 24 17:06:16 2023 -0400 +++ b/c/Parameters.cpp Thu Sep 07 16:20:28 2023 -0400 @@ -71,16 +71,16 @@ // ("max-uturn-cosine", po::value(&maxUTurnCosine), "maximum cosine value to detect U-turn") // ("nframes-avoid-uturn", po::value(&nFramesAvoidUTurn), "number of frames over which a feature should not make a U-turn") // Safety Analysis - ("max-predicted-speed", po::value(&maxPredictedSpeed)->default_value(50.), "maximum speed when predicting future motion (km/h)") + /* ("max-predicted-speed", po::value(&maxPredictedSpeed)->default_value(50.), "maximum speed when predicting future motion (km/h)") ("prediction-time-horizon", po::value(&predictionTimeHorizon)->default_value(5.), "time horizon for collision prediction (s)") ("collision-distance", po::value(&collisionDistance)->default_value(1.8), "collision distance threshold (m)") ("crossing-zones", po::value(&crossingZones)->default_value(false), "option to compute crossing zones and predicted PET") ("prediction-method", po::value(&predictionMethod)->default_value("na"), "prediction method") ("npredicted-trajectories", po::value(&nPredictedTrajectories)->default_value(1), "number of predicted trajectories (use depends on prediction method)") - ("min-acceleration", po::value(&minAcceleration)->default_value(-9.1), "minimum acceleration for input distribution (m/s2) (used only for evasive action distributions)") - ("max-acceleration", po::value(&maxAcceleration)->default_value(2.), "maximum acceleration for input distribution (m/s2)") - ("max-steering", po::value(&maxSteering)->default_value(0.5), "maximum steering for input distribution (rad/s)") - ("use-features-prediction", po::value(&useFeaturesForPrediction)->default_value(false), "use feature positions and velocities for prediction") + ("min-extreme-acceleration", po::value(&minAcceleration)->default_value(-9.1), "minimum acceleration for input distribution (m/s2) (used only for evasive action distributions)") + ("max-extreme-acceleration", po::value(&maxAcceleration)->default_value(2.), "maximum acceleration for input distribution (m/s2)") + ("max-extreme-steering", po::value(&maxSteering)->default_value(0.5), "maximum steering for input distribution (rad/s)") + ("use-features-prediction", po::value(&useFeaturesForPrediction)->default_value(false), "use feature positions and velocities for prediction") */ ; po::options_description cmdLine; diff -r 6487ef10c0e0 -r 83ca1493d55c trafficintelligence/storage.py --- a/trafficintelligence/storage.py Thu Aug 24 17:06:16 2023 -0400 +++ b/trafficintelligence/storage.py Thu Sep 07 16:20:28 2023 -0400 @@ -1646,7 +1646,7 @@ self.minFeatureEigThreshold = config.getfloat(self.sectionHeader, 'min-feature-eig-threshold') self.minFeatureTime = config.getint(self.sectionHeader, 'min-feature-time') self.minFeatureDisplacement = config.getfloat(self.sectionHeader, 'min-feature-displacement') - self.updateTimer = config.getint(self.sectionHeader, 'tracker-reload-time') + #self.updateTimer = config.getint(self.sectionHeader, 'tracker-reload-time') def __init__(self, filename = None):