Mercurial Hosting > traffic-intelligence

comparison c/Motion.cpp @ 480:f43bc0b0ba74

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cleaning code
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Tue, 01 Apr 2014 17:42:40 -0400
parents 03dbecd3a887
children b6ad86ee7033
comparison
equal deleted inserted replaced
479:7828fec8bbd2 480:f43bc0b0ba74
66 else 66 else
67 ratio = displacementDistances[nPositions-3] / displacementDistances[nPositions-2]; 67 ratio = displacementDistances[nPositions-3] / displacementDistances[nPositions-2];
68 68
69 float cosine = scalarProduct((*velocities)[nPositions-3],(*velocities)[nPositions-2]) / (displacementDistances[nPositions-3] * displacementDistances[nPositions-2]); 69 float cosine = scalarProduct((*velocities)[nPositions-3],(*velocities)[nPositions-2]) / (displacementDistances[nPositions-3] * displacementDistances[nPositions-2]);
70 70
71 result &= (ratio < accelerationBound) & (cosine > deviationBound); 71 result = (ratio < accelerationBound) & (cosine > deviationBound);
72 } 72 }
73 return result; 73 return result;
74 } 74 }
75 75
76 bool FeatureTrajectory::minMaxSimilarity(const FeatureTrajectory& ft, const int& firstInstant, const int& lastInstant, const float& connectionDistance, const float& segmentationDistance) { 76 bool FeatureTrajectory::minMaxSimilarity(const FeatureTrajectory& ft, const int& firstInstant, const int& lastInstant, const float& connectionDistance, const float& segmentationDistance) {