Merge pull request #1 from LdDl/v2

V2

Author: LdDl

README.md

@@ -4,7 +4,7 @@ Blob tracking via GoCV package
 ## Table of Contents
 
 - [About](#about)
-- [Installation](#usage)
+- [Installation](#installation)
 - [Usage](#usage)
 - [Support](#support)
 - [Thanks](#thanks)
@@ -17,15 +17,41 @@ This small package implements basics of blob tracking (see ref. https://github.c
 First of all you need OpenCV to be installed on your operation system. Also you need [GoCV](https://github.com/hybridgroup/gocv) package to be installed too. Please see ref. here https://github.com/hybridgroup/gocv#how-to-install
 
 Then you are good to go with:
-```go
-go get github.com/LdDl/gocv-blob
+```shell
+go get github.com/LdDl/gocv-blob/v2
+## or (if you want to use legacy version):
+## go get github.com/LdDl/gocv-blob
 ```
 
 p.s. do not be worried when you see *can't load package: package github.com/LdDl/gocv-blob: no Go files....* - this is just warning.
 
 ## Usage
 
-It's pretty straightforward (pseudocode'ish)
+It's pretty straightforward (pseudocode'ish).
+
+```go
+// 1. Define global set of blobs
+global_blobs = blob.NewBlobiesDefaults()
+
+// 2. Define new blob objects
+new_blob1 = blob.NewSimpleBlobie(image.Rectangle, how many points to store in track, class ID of object , class name of object)
+new_blob2 = blob.NewSimpleBlobie(image.Rectangle, how many points to store in track, class ID of object , class name of object)
+
+// 3. Append data to temporary set of blobs
+tmp_blobs = []*blob.Blobie{new_blob1, new_blob2}
+
+// 4. Compare blobs ()
+global_blobs.MatchToExisting(tmp_blobs)
+
+// 5. Repeat steps 2-4 every time when you find new objects on images. MatchToExisting() will update existing blobs and register new ones.
+```
+
+More informative example is here: [v2/array_tracker_test.go](v2/array_tracker_test.go)
+
+**FOR LEGACY v1**:
+<details>
+<summary>Click to expand</summary>
+
 ```go
 // 1. Define global set of blobs
 global_blobs = blob.NewBlobiesDefaults()
@@ -44,6 +70,7 @@ global_blobs.MatchToExisting(tmp_blobs)
 
 // 5. Repeat steps 2-4 every time when you find new objects on images. MatchToExisting() will update existing blobs and register new ones.
 ```
+</details>
 
 ## Support
 

v2/array_tracker.go

@@ -0,0 +1,91 @@
+package blob
+
+import (
+	"math"
+
+	uuid "github.com/satori/go.uuid"
+)
+
+// Blobies - Array of blobs
+type Blobies struct {
+	Objects              map[uuid.UUID]Blobie
+	maxNoMatch           int
+	minThresholdDistance float64
+	maxPointsInTrack     int
+
+	DrawingOptions *DrawOptions
+}
+
+// NewBlobiesDefaults - Constructor for Blobies (default values)
+//
+// Default values are:
+// maxNoMatch = 5
+// minThresholdDistance = 15
+// maxPointsInTrack = 10
+//
+func NewBlobiesDefaults() *Blobies {
+	return &Blobies{
+		Objects:              make(map[uuid.UUID]Blobie),
+		maxNoMatch:           5,
+		minThresholdDistance: 15,
+		maxPointsInTrack:     10,
+		DrawingOptions:       NewDrawOptionsDefault(),
+	}
+}
+
+// MatchToExisting Check if some of blobs already exists
+func (bt *Blobies) MatchToExisting(blobies []Blobie) {
+	bt.prepare()
+	for i := range blobies {
+		minUUID := uuid.UUID{}
+		minDistance := math.MaxFloat64
+		for j := range (*bt).Objects {
+			dist := distanceBetweenPoints(blobies[i].GetCenter(), (*bt).Objects[j].GetCenter())
+			distPredicted := distanceBetweenPoints(blobies[i].GetCenter(), (*bt).Objects[j].GetPredictedNextPosition())
+			dist = minf64(dist, distPredicted)
+			if dist < minDistance {
+				minDistance = dist
+				minUUID = j
+			}
+		}
+		if minDistance < blobies[i].GetDiagonal()*0.5 || minDistance < bt.minThresholdDistance {
+			bt.Objects[minUUID].Update(blobies[i])
+		} else {
+			bt.Register(blobies[i])
+		}
+	}
+	bt.RefreshNoMatch()
+}
+
+// RefreshNoMatch - Refresh state of each blob
+func (bt *Blobies) RefreshNoMatch() {
+	for i, b := range (*bt).Objects {
+		if b.Exists() == false {
+			b.IncrementNoMatchTimes()
+		}
+		if b.NoMatchTimes() >= 5 {
+			b.SetTracking(false)
+			bt.deregister(i)
+		}
+	}
+}
+
+func (bt *Blobies) prepare() {
+	for i := range bt.Objects {
+		bt.Objects[i].SetExists(false)
+		bt.Objects[i].PredictNextPosition(bt.maxNoMatch)
+	}
+}
+
+// Register - Register new blob
+func (bt *Blobies) Register(b Blobie) error {
+	newUUID := uuid.NewV4()
+	b.SetID(newUUID)
+	bt.Objects[newUUID] = b
+	return nil
+}
+
+// deregister - deregister blob with provided uuid
+func (bt *Blobies) deregister(guid uuid.UUID) {
+	delete(bt.Objects, guid)
+}