trackler 2.1.0.0 → 2.1.0.1

data/tracks/go/exercises/house/house_test.go

@@ -19,7 +19,7 @@ const targetTestVersion = 1
 
 var (
 	// song copied from README
-	song = `This is the house that Jack built.
+	expectedSong = `This is the house that Jack built.
 
 This is the malt
 that lay in the house that Jack built.
@@ -109,7 +109,7 @@ that killed the rat
 that ate the malt
 that lay in the house that Jack built.`
 
-	verses = strings.Split(song, "\n\n")
+	expectedVerses = strings.Split(expectedSong, "\n\n")
 )
 
 func TestTestVersion(t *testing.T) {
@@ -119,26 +119,26 @@ func TestTestVersion(t *testing.T) {
 }
 
 func TestVerse(t *testing.T) {
-	for v := 0; v < len(verses); v++ {
-		if ret := Verse(v + 1); ret != verses[v] {
-			t.Fatalf("Verse(%d) =\n%q\n  want:\n%q", v+1, ret, verses[v])
+	for v := 0; v < len(expectedVerses); v++ {
+		if ret := Verse(v + 1); ret != expectedVerses[v] {
+			t.Fatalf("Verse(%d) =\n%q\n  want:\n%q", v+1, ret, expectedVerses[v])
 		}
 	}
 }
 
 func TestSong(t *testing.T) {
 	s := Song()
-	if s == song {
+	if s == expectedSong {
 		return
 	}
 	// a little help in locating an error
 	gotStanzas := len(strings.Split(s, "\n\n"))
-	wantStanzas := len(verses)
+	wantStanzas := len(expectedVerses)
 	if wantStanzas != gotStanzas {
 		t.Fatalf("Song() has %d verse(s), want %d verses", gotStanzas, wantStanzas)
 	}
 	got := strings.Split(s, "\n")
-	want := strings.Split(song, "\n")
+	want := strings.Split(expectedSong, "\n")
 	var g, w string
 	var i int
 	for i, w = range want {

data/tracks/go/exercises/meetup/.meta/gen.go

@@ -37,9 +37,7 @@ type js struct {
 // template applied to above data structure generates the Go test cases
 var tmpl = `package meetup
 
-// Source: {{.Ori}}
-{{if .Commit}}// Commit: {{.Commit}}
-{{end}}
+{{.Header}}
 
 import "time"
 

data/tracks/go/exercises/meetup/cases_test.go

@@ -1,7 +1,8 @@
 package meetup
 
 // Source: exercism/x-common
-// Commit: b237b7b Merge pull request #124 from soniakeys/meetup-common-tests
+// Commit: fe9630e meetup: Fix canonical-data.json formatting
+// x-common version: 1.0.0
 
 import "time"
 

data/tracks/go/exercises/palindrome-products/example.go

@@ -47,7 +47,7 @@ func Products(fmin, fmax int) (pmin, pmax Product, err error) {
 		}
 	}
 	if len(pmin.Factorizations) == 0 {
-		err = fmt.Errorf("No palindromes in range [%d, %d].", fmin, fmax)
+		err = fmt.Errorf("no palindromes in range [%d, %d]", fmin, fmax)
 	}
 	return
 }

data/tracks/go/exercises/palindrome-products/palindrome_products_test.go

@@ -38,7 +38,7 @@ var testData = []struct {
 		Product{10201, [][2]int{{101, 101}}},
 		Product{906609, [][2]int{{913, 993}}},
 		""},
-	{4, 10, Product{}, Product{}, "No palindromes"},
+	{4, 10, Product{}, Product{}, "no palindromes"},
 	{10, 4, Product{}, Product{}, "fmin > fmax"},
 }
 

data/tracks/go/exercises/pascals-triangle/pascals_triangle_test.go

@@ -8,7 +8,7 @@ import (
 
 const targetTestVersion = 1
 
-var t20 = [][]int{
+var triangleTestCases = [][]int{
 	{1},
 	{1, 1},
 	{1, 2, 1},
@@ -31,6 +31,8 @@ var t20 = [][]int{
 	{1, 19, 171, 969, 3876, 11628, 27132, 50388, 75582, 92378, 92378, 75582, 50388, 27132, 11628, 3876, 969, 171, 19, 1},
 }
 
+var testSize = len(triangleTestCases)
+
 func TestTestVersion(t *testing.T) {
 	if testVersion != targetTestVersion {
 		t.Fatalf("Found testVersion = %v, want %v", testVersion, targetTestVersion)
@@ -38,15 +40,15 @@ func TestTestVersion(t *testing.T) {
 }
 
 func TestTriangle(t *testing.T) {
-	for n := 1; n <= 20; n++ {
+	for n := 1; n <= testSize; n++ {
 		res := Triangle(n)
-		want := t20[:n]
+		want := triangleTestCases[:n]
 		if !reflect.DeepEqual(res, want) {
 			t.Fatalf("Triangle(%d) = %s,\nwant:%s\n",
 				n, format(res), format(want))
 		}
 	}
-	t.Log(format(Triangle(20)))
+	t.Log(format(Triangle(testSize)))
 }
 
 func format(t [][]int) (s string) {
@@ -55,3 +57,21 @@ func format(t [][]int) (s string) {
 	}
 	return
 }
+
+// BenchmarkPascalsTriangleFixed will generate Pascals Triangles against the
+// solution using triangles of fixed size 20.
+func BenchmarkPascalsTriangleFixed(b *testing.B) {
+	for i := 0; i < b.N; i++ {
+		Triangle(testSize) // same length as the test for correctness above
+	}
+}
+
+// BenchmarkPascalsTriangleIncreasing will generate Pascals Triangles against the
+// solution using triangles of an increasingly larger size from 1 to 20.
+func BenchmarkPascalsTriangleIncreasing(b *testing.B) {
+	for i := 0; i < b.N; i++ {
+		for x := 0; x <= testSize; x++ {
+			Triangle(x)
+		}
+	}
+}

data/tracks/go/exercises/rna-transcription/.meta/gen.go

@@ -43,9 +43,7 @@ type js struct {
 // readme and have no biological basis and so are not converted here.
 var tmpl = `package strand
 
-// Source: {{.Ori}}
-{{if .Commit}}// Commit: {{.Commit}}
-{{end}}
+{{.Header}}
 
 var rnaTests = []struct {
 	input    string

data/tracks/go/exercises/rna-transcription/cases_test.go

@@ -1,7 +1,8 @@
 package strand
 
 // Source: exercism/x-common
-// Commit: 6985644 Merge pull request #121 from mikeyjcat/add-roman-numerals-test-definition
+// Commit: 0b20fff rna-transcription: Fix canonical-data.json formatting
+// x-common version: 1.0.0
 
 var rnaTests = []struct {
 	input    string

data/tracks/go/exercises/roman-numerals/.meta/gen.go

@@ -31,9 +31,7 @@ type js struct {
 // template applied to above data structure generates the Go test cases
 var tmpl = `package romannumerals
 
-// Source: {{.Ori}}
-{{if .Commit}}// Commit: {{.Commit}}
-{{end}}
+{{.Header}}
 
 type romanNumeralTest struct {
 	arabic   int

data/tracks/go/exercises/roman-numerals/cases_test.go

@@ -1,7 +1,8 @@
 package romannumerals
 
 // Source: exercism/x-common
-// Commit: 6985644 Merge pull request #121 from mikeyjcat/add-roman-numerals-test-definition
+// Commit: 070e8d5 roman-numerals: Fix canonical-data.json formatting
+// x-common version: 1.0.0
 
 type romanNumeralTest struct {
 	arabic   int

data/tracks/go/exercises/roman-numerals/example.go

@@ -16,7 +16,7 @@ func ToRomanNumeral(input int) (string, error) {
 	buffer := bytes.NewBufferString("")
 
 	if input <= 0 || input >= 4000 {
-		return "", fmt.Errorf("The number %d is undefined in the roman numeral system.", input)
+		return "", fmt.Errorf("the number %d is undefined in the roman numeral system", input)
 	}
 
 	mappings := []arabicToRoman{

data/tracks/go/exercises/transpose/.meta/gen.go

@@ -32,9 +32,7 @@ type js struct {
 // template applied to above data structure generates the Go test cases
 var tmpl = `package transpose
 
-// Source: {{.Ori}}
-{{if .Commit}}// Commit: {{.Commit}}
-{{end}}
+{{.Header}}
 
 var testCases = []struct {
 	description string

data/tracks/go/exercises/transpose/cases_test.go

@@ -1,7 +1,8 @@
 package transpose
 
 // Source: exercism/x-common
-// Commit: cda8f98 Create new exercises structure
+// Commit: 6dba022 transpose: Fix canonical-data.json formatting
+// x-common version: 1.0.0
 
 var testCases = []struct {
 	description string

data/tracks/go/exercises/transpose/transpose_test.go

@@ -17,6 +17,11 @@ func TestTranspose(t *testing.T) {
 	for _, test := range testCases {
 		actual := Transpose(test.input)
 		if !reflect.DeepEqual(actual, test.expected) {
+			// check for zero length slices
+			if len(actual) == 0 || len(test.expected) == 0 {
+				t.Fatalf("\n\tTranspose(%q): %s\n\n\tExpected: %q\n\tGot: %q",
+					test.input, test.description, test.expected, actual)
+			}
 			// let's make the error more specific and find the row it's on
 			min := min(len(test.expected), len(actual))
 			for i := 0; i < min; i++ {

data/tracks/go/exercises/word-count/.meta/gen.go

@@ -32,9 +32,7 @@ type js struct {
 // template applied to above data structure generates the Go test cases
 var tmpl = `package wordcount
 
-// Source: {{.Ori}}
-{{if .Commit}}// Commit: {{.Commit}}
-{{end}}
+{{.Header}}
 
 var testCases = []struct {
     description string

data/tracks/go/exercises/word-count/cases_test.go

@@ -1,7 +1,8 @@
 package wordcount
 
 // Source: exercism/x-common
-// Commit: f2ab262 word-count: replace underscore with space in description (#483)
+// Commit: cd26d49 word-count: Make exercise schema-compliant  (#634)
+// x-common version: 1.0.0
 
 var testCases = []struct {
 	description string

data/tracks/go/gen/gen.go

@@ -89,10 +89,11 @@ func Gen(exercise string, j interface{}, t *template.Template) error {
 	// try to find and read the local json source file
 	log.Printf("[LOCAL] fetching %s test data\n", exercise)
 	jPath, jOrigin, jCommit := getLocal(jFile)
+	jFilePath := filepath.Join(jPath, jFile)
 	if jPath != "" {
-		log.Printf("[LOCAL] source: %s\n", jPath)
+		log.Printf("[LOCAL] source: %s\n", jFilePath)
 	}
-	jSrc, err := ioutil.ReadFile(filepath.Join(jPath, jFile))
+	jSrc, err := ioutil.ReadFile(jFilePath)
 	if err != nil {
 		// fetch json data remotely if there's no local file
 		log.Println("[LOCAL] No test data found")

data/tracks/java/config.json

@@ -324,6 +324,11 @@
       "slug": "book-store",
       "difficulty": 1,
       "topics": []
+    },
+    {
+      "slug": "saddle-points",
+      "difficulty": 1,
+      "topics": []
     }
   ],
   "deprecated": [

data/tracks/java/exercises/saddle-points/build.gradle

@@ -0,0 +1,17 @@
+apply plugin: "java"
+apply plugin: "eclipse"
+apply plugin: "idea"
+
+repositories {
+  mavenCentral()
+}
+
+dependencies {
+  testCompile "junit:junit:4.12"
+}
+test {
+  testLogging {
+    exceptionFormat = 'full'
+    events = ["passed", "failed", "skipped"]
+  }
+}

data/tracks/java/exercises/saddle-points/src/example/java/Matrix.java

@@ -0,0 +1,44 @@
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+final class Matrix {
+
+  private final List<List<Integer>> values;
+
+  Matrix(final List<List<Integer>> values) {
+    this.values = values;
+  }
+
+  List<MatrixCoordinate> getSaddlePoints() {
+    final List<MatrixCoordinate> result = new ArrayList<>();
+
+    if (values.isEmpty()) {
+      return result;
+    }
+
+    for (int row = 0; row < values.size(); row++) {
+      for (int column = 0; column < values.get(0).size(); column++) {
+        final int coordinateValue = values.get(row).get(column);
+
+        if (coordinateValue == getRowMax(row) && coordinateValue == getColumnMin(column)) {
+          result.add(new MatrixCoordinate(row, column));
+        }
+      }
+    }
+
+    return result;
+  }
+
+  private int getRowMax(final int row) {
+    return Collections.max(values.get(row));
+  }
+
+  private int getColumnMin(final int column) {
+    return values.stream()
+        .map(row -> row.get(column))
+        .min(Integer::compareTo)
+        .get();
+  }
+
+}

data/tracks/java/exercises/saddle-points/src/example/java/MatrixCoordinate.java

@@ -0,0 +1,31 @@
+final class MatrixCoordinate {
+
+  private final int row;
+
+  private final int column;
+
+  MatrixCoordinate(final int row, final int column) {
+    this.row = row;
+    this.column = column;
+  }
+
+  // Generated equals and hashcode.
+
+  @Override
+  public boolean equals(final Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+
+    final MatrixCoordinate that = (MatrixCoordinate) o;
+
+    return row == that.row && column == that.column;
+  }
+
+  @Override
+  public int hashCode() {
+    int result = row;
+    result = 31 * result + column;
+    return result;
+  }
+
+}

data/tracks/java/exercises/saddle-points/src/main/java/Matrix.java

@@ -0,0 +1,5 @@
+final class Matrix {
+
+
+
+}

data/tracks/java/exercises/saddle-points/src/main/java/MatrixCoordinate.java

@@ -0,0 +1,31 @@
+final class MatrixCoordinate {
+
+  private final int row;
+
+  private final int column;
+
+  MatrixCoordinate(final int row, final int column) {
+    this.row = row;
+    this.column = column;
+  }
+
+  // Generated equals and hashcode.
+
+  @Override
+  public boolean equals(final Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+
+    final MatrixCoordinate that = (MatrixCoordinate) o;
+
+    return row == that.row && column == that.column;
+  }
+
+  @Override
+  public int hashCode() {
+    int result = row;
+    result = 31 * result + column;
+    return result;
+  }
+
+}

data/tracks/java/exercises/saddle-points/src/test/java/MatrixTest.java

@@ -0,0 +1,82 @@
+import org.junit.Ignore;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+
+public class MatrixTest {
+
+    @Test
+    public void testCanIdentifySingleSaddlePoint() {
+        Matrix matrix = new Matrix(Arrays.asList(
+            Arrays.asList(9, 8, 7),
+            Arrays.asList(5, 3, 2),
+            Arrays.asList(6, 6, 7)
+        ));
+
+        List<MatrixCoordinate> expectedSaddlePoints = Collections.singletonList(new MatrixCoordinate(1, 0));
+
+        assertEquals(expectedSaddlePoints, matrix.getSaddlePoints());
+    }
+
+    @Ignore
+    @Test
+    public void testCanIdentifyThatEmptyMatrixHasNoSaddlePoints() {
+        Matrix matrix = new Matrix(new ArrayList<>());
+
+        List<MatrixCoordinate> expectedSaddlePoints = new ArrayList<>();
+
+        assertEquals(expectedSaddlePoints, matrix.getSaddlePoints());
+    }
+
+    @Ignore
+    @Test
+    public void testCanIdentifyLackOfSaddlePointsWhenThereAreNone() {
+        Matrix matrix = new Matrix(Arrays.asList(
+            Arrays.asList(1, 2, 3),
+            Arrays.asList(3, 1, 2),
+            Arrays.asList(2, 3, 1)
+        ));
+
+        List<MatrixCoordinate> expectedSaddlePoints = new ArrayList<>();
+
+        assertEquals(expectedSaddlePoints, matrix.getSaddlePoints());
+    }
+
+    @Ignore
+    @Test
+    public void testCanIdentifyMultipleSaddlePoints() {
+        Matrix matrix = new Matrix(Arrays.asList(
+            Arrays.asList(4, 5, 4),
+            Arrays.asList(3, 5, 5),
+            Arrays.asList(1, 5, 4)
+        ));
+
+        List<MatrixCoordinate> expectedSaddlePoints = Arrays.asList(
+            new MatrixCoordinate(0, 1),
+            new MatrixCoordinate(1, 1),
+            new MatrixCoordinate(2, 1)
+        );
+
+        assertEquals(expectedSaddlePoints, matrix.getSaddlePoints());
+    }
+
+    @Ignore
+    @Test
+    public void testCanIdentifySaddlePointInBottomRightCorner() {
+        Matrix matrix = new Matrix(Arrays.asList(
+            Arrays.asList(8, 7, 9),
+            Arrays.asList(6, 7, 6),
+            Arrays.asList(3, 2, 5)
+        ));
+
+        List<MatrixCoordinate> expectedSaddlePoints = Collections.singletonList(new MatrixCoordinate(2, 2));
+
+        assertEquals(expectedSaddlePoints, matrix.getSaddlePoints());
+    }
+
+}