# HG changeset patch
# User Nicolas Saunier <nicolas.saunier@polymtl.ca>
# Date 1588741101 14400
# Node ID 8c0ec7e1eb8e0842b82d548e3e17d9647c570acd
# Parent  b219d5a1bb55bf8b209ecab6354d601ab16b8b7c
minor

diff -r b219d5a1bb55 -r 8c0ec7e1eb8e scripts/safety-analysis.py
--- a/scripts/safety-analysis.py	Wed Apr 29 01:09:55 2020 -0400
+++ b/scripts/safety-analysis.py	Wed May 06 00:58:21 2020 -0400
@@ -18,6 +18,7 @@
 # TODO analyze only 
 parser.add_argument('--prediction-method', dest = 'predictionMethod', help = 'prediction method (constant velocity (cvd: vector computation (approximate); cve: equation solving; cv: discrete time (approximate)), normal adaptation, point set prediction)', choices = ['cvd', 'cve', 'cv', 'na', 'ps', 'mp'])
 parser.add_argument('-p', dest = 'prototypeDatabaseFilename', help = 'name of the database containing the prototypes')
+# parser.add_argument('--categorize', dest = 'categorize', help = 'computes interaction categories', action = 'store_true') TODO, add angle parameters in tracking.cfg - the safety analysis parameters should probably be spun off tracking.cfg
 parser.add_argument('--no-motion-prediction', dest = 'noMotionPrediction', help = 'does not compute indicators like TTC depending on motion prediction', action = 'store_true')
 parser.add_argument('--pet', dest = 'computePET', help = 'computes PET', action = 'store_true')
 parser.add_argument('--display-cp', dest = 'displayCollisionPoints', help = 'display collision points', action = 'store_true')
diff -r b219d5a1bb55 -r 8c0ec7e1eb8e trafficintelligence/events.py
--- a/trafficintelligence/events.py	Wed Apr 29 01:09:55 2020 -0400
+++ b/trafficintelligence/events.py	Wed May 06 00:58:21 2020 -0400
@@ -219,11 +219,6 @@
                 minDistances[instant] = moving.MovingObject.minDistance(self.roadUser1, self.roadUser2, instant)
             self.addIndicator(indicators.SeverityIndicator(Interaction.indicatorNames[3], minDistances, mostSevereIsMax = False))
 
-    # categories = {'headon': 0,
-    #               'rearend': 1,
-    #               'side': 2,
-    #               'parallel': 3}
-            
     def categorize(self, velocityAngleTolerance, parallelAngleTolerance):
         '''Computes the interaction category by instant
         velocityAngleTolerance and parallelAngleTolerance in radian'''