motion was missing ndata updates for full-field integration

Author: rcoreilly

motion/motion.go

@@ -73,47 +73,49 @@ func (pr *Params) Defaults() {
 // Resulting integ tensor is 4 values (2x2) with left, right, bottom, top units.
 // integ = integrated full-field values over time
 // visNormInteg = integrated visNorm, actually used for normalization
-func (pr *Params) FullFieldInteg(scalars, integ *tensor.Float32) {
-	visNorm := scalars.Value1D(pr.DoGSumScalarIndex)
-	integ.SetShapeSizes(2, 2)
+func (pr *Params) FullFieldInteg(ndata int, scalars, integ *tensor.Float32) {
 	idt := 1.0 / pr.IntegTau
-	if pr.NormInteg == 0 {
-		pr.NormInteg = visNorm
-	} else {
-		pr.NormInteg += idt * (visNorm - pr.NormInteg)
+	integ.SetShapeSizes(ndata, 2, 2)
+	for di := range ndata {
+		visNorm := scalars.Value(pr.DoGSumScalarIndex, di)
+		if pr.NormInteg == 0 {
+			pr.NormInteg = visNorm
+		} else {
+			pr.NormInteg += idt * (visNorm - pr.NormInteg)
+		}
+		vnf := pr.FullGain
+		if pr.NormInteg > 0 {
+			vnf /= pr.NormInteg
+		}
+
+		act := func(v float32) float32 { return vnf * v }
+		l := scalars.Value(pr.FFScalarIndex+0, di)
+		r := scalars.Value(pr.FFScalarIndex+1, di)
+		if l > r {
+			l = act(l - r)
+			r = 0
+		} else {
+			r = act(r - l)
+			l = 0
+		}
+		b := scalars.Value(pr.FFScalarIndex+2, di)
+		u := scalars.Value(pr.FFScalarIndex+3, di)
+		if b > u {
+			b = act(b - u)
+			u = 0
+		} else {
+			u = act(u - b)
+			b = 0
+		}
+
+		integf := func(y, x int, v float32) {
+			vi := integ.Value(di, y, x)
+			vi += idt * (v - vi)
+			integ.Set(vi, di, y, x)
+		}
+		integf(0, 0, l)
+		integf(0, 1, r)
+		integf(1, 0, b)
+		integf(1, 1, u)
 	}
-	vnf := pr.FullGain
-	if pr.NormInteg > 0 {
-		vnf /= pr.NormInteg
-	}
-
-	act := func(v float32) float32 { return vnf * v }
-	l := scalars.Value1D(pr.FFScalarIndex + 0)
-	r := scalars.Value1D(pr.FFScalarIndex + 1)
-	if l > r {
-		l = act(l - r)
-		r = 0
-	} else {
-		r = act(r - l)
-		l = 0
-	}
-	b := scalars.Value1D(pr.FFScalarIndex + 2)
-	u := scalars.Value1D(pr.FFScalarIndex + 3)
-	if b > u {
-		b = act(b - u)
-		u = 0
-	} else {
-		u = act(u - b)
-		b = 0
-	}
-
-	integf := func(i int, v float32) {
-		vi := integ.Value1D(i)
-		vi += idt * (v - vi)
-		integ.Set1D(vi, i)
-	}
-	integf(0, l)
-	integf(1, r)
-	integf(2, b)
-	integf(3, u)
 }

v1std/motion_dog.go

@@ -34,7 +34,7 @@ type MotionDoG struct {
 	// Geom is geometry of input, output.
 	Geom v1vision.Geom `edit:"-"`
 
-	// FullField has the integrated FullField output (1D).
+	// FullField has the integrated FullField output: [NData, 2, 2].
 	// Use [motion.Directions] for 1D indexes (is 2x2 for [L,R][D,U]).
 	FullField tensor.Float32 `display:"no-inline"`
 
@@ -46,7 +46,7 @@ type MotionDoG struct {
 
 	// Star has the star values, if GetStar is true,
 	// pointing to Values in V1.
-	// [Y, X, Polarity, 4], where Polarity is DoG polarity, and 4 is for
+	// [NData, Y, X, Polarity, 4], where Polarity is DoG polarity, and 4 is for
 	// Left, Right, Down, Up.
 	Star *tensor.Float32 `display:"no-inline"`
 }
@@ -73,7 +73,7 @@ func (vi *MotionDoG) SetSize(sz, spc int) {
 // ndata = number of data-parallel inputs to process in parallel.
 func (vi *MotionDoG) Config(ndata int, imageSize image.Point) {
 	vi.Geom.SetImageSize(imageSize)
-	vi.FullField.SetShapeSizes(2, 2)
+	vi.FullField.SetShapeSizes(ndata, 2, 2)
 
 	fn := 1 // number of filters in DoG
 
@@ -93,7 +93,7 @@ func (vi *MotionDoG) Config(ndata int, imageSize image.Point) {
 
 	if vi.GetStar {
 		out4 := vi.V1.NewValues4D(int(vi.Geom.Out.Y), int(vi.Geom.Out.X), 2, 4)
-		vi.Star.SetShapeSizes(int(vi.Geom.Out.Y), int(vi.Geom.Out.X), 2, 4)
+		vi.Star.SetShapeSizes(ndata, int(vi.Geom.Out.Y), int(vi.Geom.Out.X), 2, 4)
 		vi.V1.NewTo4D(starIdx, out4, 2, 4, 0, &vi.Geom)
 	}
 
@@ -129,8 +129,8 @@ func (vi *MotionDoG) Run() {
 		vals = append(vals, v1vision.Values4DVar)
 	}
 	vi.V1.Run(vals...)
-	vi.Motion.FullFieldInteg(vi.V1.Scalars, &vi.FullField)
-	if vi.GetStar {
+	vi.Motion.FullFieldInteg(vi.V1.NData, vi.V1.Scalars, &vi.FullField)
+	if vi.GetStar { // assumes star at 0
 		vi.Star = vi.V1.Values4D.SubSpace(0).(*tensor.Float32)
 	}
 }