Resolve "TrackMatrix API"

Closes #453 (closed)

include/core/processor/track_matrix.h

@@ -45,8 +45,8 @@ using std::list;
 using std::pair;
 using std::shared_ptr;
 
-typedef map<TimeStamp, FeatureBasePtr>                                Track;
-typedef map<TimeStamp, FeatureBaseConstPtr>                           TrackConst;
+typedef map<TimeStamp, FeatureBasePtr>                                 Track;
+typedef map<TimeStamp, FeatureBaseConstPtr>                            TrackConst;
 typedef map<SizeStd, FeatureBasePtr >                                  Snapshot;
 typedef map<SizeStd, FeatureBaseConstPtr >                             SnapshotConst;
 typedef map<SizeStd, pair<FeatureBasePtr, FeatureBasePtr> >            TrackMatches; // matched feature pairs indexed by track_id
@@ -102,41 +102,40 @@ class TrackMatrix
         TrackMatrix();
         virtual ~TrackMatrix();
 
-        void            newTrack    (FeatureBasePtr _ftr);
-        void            add         (const SizeStd& _track_id, const FeatureBasePtr& _ftr);
-        void            add         (const FeatureBasePtr& _ftr_existing, const FeatureBasePtr&  _ftr_new);
-        void            remove      (FeatureBasePtr _ftr);
-        void            remove      (const SizeStd&  _track_id);
-        void            remove      (CaptureBasePtr _cap);
-        SizeStd         numTracks   () const;
-        SizeStd         trackSize   (const SizeStd&  _track_id) const;
-        TrackConst      track       (const SizeStd& _track_id) const;
-        Track           track       (const SizeStd& _track_id);
-        SnapshotConst   snapshot    (CaptureBaseConstPtr _capture) const;
-        Snapshot        snapshot    (CaptureBasePtr _capture);
+        void                        newTrack    (FeatureBasePtr _ftr);
+        void                        add         (const SizeStd& _track_id, const FeatureBasePtr& _ftr);
+        void                        add         (const FeatureBasePtr& _ftr_existing, const FeatureBasePtr&  _ftr_new);
+        void                        remove      (FeatureBasePtr _ftr);
+        void                        remove      (const SizeStd&  _track_id);
+        void                        remove      (CaptureBasePtr _cap);
+
+        SizeStd                     numTracks   () const;
+        SizeStd                     trackSize   (const SizeStd&  _track_id) const;
+        TrackConst                  track       (const SizeStd& _track_id) const;
+        Track                       track       (const SizeStd& _track_id);
+        SnapshotConst               snapshot    (CaptureBaseConstPtr _capture) const;
+        Snapshot                    snapshot    (CaptureBasePtr _capture);
         vector<FeatureBaseConstPtr> trackAsVector(const SizeStd& _track_id) const;
-        vector<FeatureBasePtr>  trackAsVector(const SizeStd& _track_id);
-        FeatureBaseConstPtrList snapshotAsList(CaptureBaseConstPtr _cap) const;
-        FeatureBasePtrList      snapshotAsList(CaptureBasePtr _cap);
-        TrackMatchesConst       matches     (CaptureBaseConstPtr _cap_1, CaptureBaseConstPtr _cap_2) const;
-        TrackMatches            matches     (CaptureBasePtr _cap_1, CaptureBasePtr _cap_2);
-        FeatureBaseConstPtr     firstFeature(const SizeStd& _track_id) const;
-        FeatureBasePtr          firstFeature(const SizeStd& _track_id);
-        FeatureBaseConstPtr     lastFeature (const SizeStd& _track_id) const;
-        FeatureBasePtr          lastFeature (const SizeStd& _track_id);
-        FeatureBaseConstPtr     feature     (const SizeStd& _track_id, CaptureBaseConstPtr _cap) const;
-        FeatureBasePtr          feature     (const SizeStd& _track_id, CaptureBasePtr _cap);
-        CaptureBaseConstPtr     firstCapture(const SizeStd& _track_id) const;
-        CaptureBasePtr          firstCapture(const SizeStd& _track_id);
-
-        list<SizeStd>    trackIds() const;
+        vector<FeatureBasePtr>      trackAsVector(const SizeStd& _track_id);
+        FeatureBaseConstPtrList     snapshotAsList(CaptureBaseConstPtr _cap) const;
+        FeatureBasePtrList          snapshotAsList(CaptureBasePtr _cap);
+        TrackMatchesConst           matches     (CaptureBaseConstPtr _cap_1, CaptureBaseConstPtr _cap_2) const;
+        TrackMatches                matches     (CaptureBasePtr _cap_1, CaptureBasePtr _cap_2);
+
+        FeatureBaseConstPtr         firstFeature(const SizeStd& _track_id) const;
+        FeatureBasePtr              firstFeature(const SizeStd& _track_id);
+        FeatureBaseConstPtr         lastFeature (const SizeStd& _track_id) const;
+        FeatureBasePtr              lastFeature (const SizeStd& _track_id);
+        FeatureBaseConstPtr         feature     (const SizeStd& _track_id, CaptureBaseConstPtr _cap) const;
+        FeatureBasePtr              feature     (const SizeStd& _track_id, CaptureBasePtr _cap);
+        CaptureBaseConstPtr         firstCapture(const SizeStd& _track_id) const;
+        CaptureBasePtr              firstCapture(const SizeStd& _track_id);
+
+        list<SizeStd>               trackIds(CaptureBaseConstPtr _capture = nullptr) const;
 
         // tracks across captures that belong to keyframe
-        TrackConst              trackAtKeyframes(const SizeStd& _track_id) const;
-        Track                   trackAtKeyframes(const SizeStd& _track_id);
-
-        const map<SizeStd, Track>& getTracks() {return tracks_;}
-        const map<CaptureBasePtr, Snapshot >& getSnapshots() {return snapshots_;}
+        TrackConst                  trackAtKeyframes(const SizeStd& _track_id) const;
+        Track                       trackAtKeyframes(const SizeStd& _track_id);
 
     private: