Mercurial Hosting > traffic-intelligence
diff c/feature-based-tracking.cpp @ 716:85af65b6d531 dev
corrected major bug slowing feature grouping
author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
---|---|
date | Sat, 25 Jul 2015 23:28:52 -0400 |
parents | 70a3cdf0dbb3 |
children | 2cade72d75ad |
line wrap: on
line diff
--- a/c/feature-based-tracking.cpp Sat Jul 25 22:36:39 2015 -0400 +++ b/c/feature-based-tracking.cpp Sat Jul 25 23:28:52 2015 -0400 @@ -297,22 +297,11 @@ success = trajectoryDB->trajectoryIdEndingAt(trajectoryIds, frameNum); if (frameNum%100 ==0) cout << "frame " << frameNum << endl; - //success = trajectoryDB->trajectoryIdInInterval(trajectoryIds, frameNum, min(frameNum+queryIntervalLength-1, frameNum+params.nFrames)); // ending #if DEBUG cout << trajectoryIds.size() << " trajectories " << endl; #endif - // vector<TrajectoryPoint2fPtr> positions, velocities; - // trajectoryDB->read(positions, trajectoryIds, "positions"); - // trajectoryDB->read(velocities, trajectoryIds, "velocities"); - // for (unsigned int i=0; i<trajectoryIds.size(); ++i) { - // FeatureTrajectoryPtr ft = FeatureTrajectoryPtr(new FeatureTrajectory(positions[i], velocities[i])); BOOST_FOREACH(int trajectoryId, trajectoryIds) { - //cout << trajectoryId << " " << endl; - // std::shared_ptr<Trajectory<cv::Point2f> > trajectory; - // success = trajectoryDB->read(trajectory, trajectoryId, "positions"); // velocities FeatureTrajectoryPtr ft = FeatureTrajectoryPtr(new FeatureTrajectory(trajectoryId, *trajectoryDB, "positions", "velocities")); - // stringstream ss;ss << *ft; cout << ss.str() << endl; - // cout << ft->getFirstInstant() << " " << ft->getLastInstant() << endl; featureGraph.addFeature(ft); } @@ -326,7 +315,7 @@ vector<unsigned int> featureNumbers; for (unsigned int j=0; j<featureGroups[i].size(); ++j) featureNumbers.push_back(featureGroups[i][j]->getId()); - trajectoryDB->writeObject(savedObjectId, featureNumbers, 0 /* unknown */, 1, string("objects"), string("objects_features")); + trajectoryDB->writeObject(savedObjectId, featureNumbers, 0 /* unknown type */, 1, string("objects"), string("objects_features")); savedObjectId++; } }