From f8baf8bbd07f96c323b38dd944b49d6dba118da5 Mon Sep 17 00:00:00 2001
From: Vladimir Chalupecky <vladimir.chalupecky@gmail.com>
Date: Thu, 1 Jun 2017 21:46:14 +0200
Subject: [PATCH] matrix/mat64: fix wrong return statement

---
 matrix/mat64/triangular.go      |   2 +-
 matrix/mat64/triangular_test.go | 118 ++++++++++++++++++++++++++++++++
 2 files changed, 119 insertions(+), 1 deletion(-)

diff --git a/matrix/mat64/triangular.go b/matrix/mat64/triangular.go
index 76016e83..99f0f6cf 100644
--- a/matrix/mat64/triangular.go
+++ b/matrix/mat64/triangular.go
@@ -418,8 +418,8 @@ func copySymIntoTriangle(t *TriDense, s Symmetric) {
 				for j := i; j < n; j++ {
 					t.mat.Data[i*ts+j] = sd.Data[j*ss+i]
 				}
-				return
 			}
+			return
 		}
 		if sd.Uplo == blas.Upper {
 			for i := 0; i < n; i++ {
diff --git a/matrix/mat64/triangular_test.go b/matrix/mat64/triangular_test.go
index 29e929a7..bb1af94a 100644
--- a/matrix/mat64/triangular_test.go
+++ b/matrix/mat64/triangular_test.go
@@ -315,3 +315,121 @@ func TestTriMul(t *testing.T) {
 	receiver = NewTriDense(3, matrix.Upper, nil)
 	testTwoInput(t, "TriMul", receiver, method, denseComparison, legalTypesUpper, legalSizeTriMul, 1e-14)
 }
+
+func TestCopySymIntoTriangle(t *testing.T) {
+	nan := math.NaN()
+	for tc, test := range []struct {
+		n     int
+		sUplo blas.Uplo
+		s     []float64
+
+		tUplo matrix.TriKind
+		want  []float64
+	}{
+		{
+			n:     3,
+			sUplo: blas.Upper,
+			s: []float64{
+				1, 2, 3,
+				nan, 4, 5,
+				nan, nan, 6,
+			},
+			tUplo: matrix.Upper,
+			want: []float64{
+				1, 2, 3,
+				0, 4, 5,
+				0, 0, 6,
+			},
+		},
+		{
+			n:     3,
+			sUplo: blas.Lower,
+			s: []float64{
+				1, nan, nan,
+				2, 3, nan,
+				4, 5, 6,
+			},
+			tUplo: matrix.Upper,
+			want: []float64{
+				1, 2, 4,
+				0, 3, 5,
+				0, 0, 6,
+			},
+		},
+		{
+			n:     3,
+			sUplo: blas.Upper,
+			s: []float64{
+				1, 2, 3,
+				nan, 4, 5,
+				nan, nan, 6,
+			},
+			tUplo: matrix.Lower,
+			want: []float64{
+				1, 0, 0,
+				2, 4, 0,
+				3, 5, 6,
+			},
+		},
+		{
+			n:     3,
+			sUplo: blas.Lower,
+			s: []float64{
+				1, nan, nan,
+				2, 3, nan,
+				4, 5, 6,
+			},
+			tUplo: matrix.Lower,
+			want: []float64{
+				1, 0, 0,
+				2, 3, 0,
+				4, 5, 6,
+			},
+		},
+	} {
+		n := test.n
+		s := NewSymDense(n, test.s)
+		// For the purpose of the test, break the assumption that
+		// symmetric is stored in the upper triangle (only when S is
+		// RawSymmetricer).
+		s.mat.Uplo = test.sUplo
+
+		t1 := NewTriDense(n, test.tUplo, nil)
+		copySymIntoTriangle(t1, s)
+
+		equal := true
+	loop1:
+		for i := 0; i < n; i++ {
+			for j := 0; j < n; j++ {
+				if t1.At(i, j) != test.want[i*n+j] {
+					equal = false
+					break loop1
+				}
+			}
+		}
+		if !equal {
+			t.Errorf("Case %v: unexpected T when S is RawSymmetricer", tc)
+		}
+
+		if test.sUplo == blas.Lower {
+			continue
+		}
+
+		sb := (basicSymmetric)(*s)
+		t2 := NewTriDense(n, test.tUplo, nil)
+		copySymIntoTriangle(t2, &sb)
+		equal = true
+	loop2:
+		for i := 0; i < n; i++ {
+			for j := 0; j < n; j++ {
+				if t1.At(i, j) != test.want[i*n+j] {
+					equal = false
+					break loop2
+				}
+			}
+		}
+		if !equal {
+			t.Errorf("Case %v: unexpected T when S is not RawSymmetricer", tc)
+		}
+	}
+}