trackler 2.1.0.27 → 2.1.0.28

data/tracks/go/exercises/secret-handshake/example.go

@@ -1,6 +1,6 @@
 package secret
 
-const testVersion = 1
+const testVersion = 2
 
 var signals = []string{"wink", "double blink", "close your eyes", "jump"}
 

data/tracks/go/exercises/secret-handshake/secret_handshake_test.go

@@ -5,23 +5,7 @@ import (
 	"testing"
 )
 
-const targetTestVersion = 1
-
-var tests = []struct {
-	code uint
-	h    []string
-}{
-	{1, []string{"wink"}},
-	{2, []string{"double blink"}},
-	{4, []string{"close your eyes"}},
-	{8, []string{"jump"}},
-	{3, []string{"wink", "double blink"}},
-	{19, []string{"double blink", "wink"}},
-	{31, []string{"jump", "close your eyes", "double blink", "wink"}},
-	{0, nil},
-	{32, nil},
-	{33, []string{"wink"}},
-}
+const targetTestVersion = 2
 
 func TestTestVersion(t *testing.T) {
 	if testVersion != targetTestVersion {

data/tracks/java/config.json

@@ -60,6 +60,11 @@
       "difficulty": 3,
       "topics": []
     },
+    {
+      "slug": "perfect-numbers",
+      "difficulty": 3,
+      "topics": []
+    },
     {
       "slug": "sum-of-multiples",
       "difficulty": 4,
@@ -105,6 +110,11 @@
       "difficulty": 4,
       "topics": []
     },
+    {
+      "slug": "saddle-points",
+      "difficulty": 4,
+      "topics": []
+    },
     {
       "slug": "diamond",
       "difficulty": 4,
@@ -271,38 +281,38 @@
       "topics": []
     },
     {
-      "slug": "simple-cipher",
-      "difficulty": 8,
+      "slug": "clock",
+      "difficulty": 7,
       "topics": []
     },
     {
-      "slug": "palindrome-products",
+      "slug": "book-store",
       "difficulty": 8,
       "topics": []
     },
     {
-      "slug": "pythagorean-triplet",
-      "difficulty": 9,
+      "slug": "simple-cipher",
+      "difficulty": 8,
       "topics": []
     },
     {
-      "slug": "custom-set",
-      "difficulty": 10,
+      "slug": "change",
+      "difficulty": 8,
       "topics": []
     },
     {
-      "slug": "clock",
-      "difficulty": 1,
+      "slug": "palindrome-products",
+      "difficulty": 8,
       "topics": []
     },
     {
-      "slug": "perfect-numbers",
-      "difficulty": 1,
+      "slug": "pythagorean-triplet",
+      "difficulty": 9,
       "topics": []
     },
     {
-      "slug": "change",
-      "difficulty": 1,
+      "slug": "custom-set",
+      "difficulty": 10,
       "topics": []
     },
     {
@@ -315,16 +325,6 @@
       "difficulty": 1,
       "topics": []
     },
-    {
-      "slug": "book-store",
-      "difficulty": 1,
-      "topics": []
-    },
-    {
-      "slug": "saddle-points",
-      "difficulty": 1,
-      "topics": []
-    },
     {
       "slug": "run-length-encoding",
       "difficulty": 1,

data/tracks/java/exercises/book-store/src/example/java/{Bookstore.java → BookStore.java}

@@ -2,23 +2,17 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
-class Bookstore {
+class BookStore {
 
   private static final int BOOK_PRICE = 8, MAX_GROUP_SIZE = 5;
 
   private static double[] DISCOUNT_TIERS = {0, 5, 10, 20, 25};
 
-  private List<Integer> books;
-
-  Bookstore(List<Integer> books) {
-    this.books = books;
-  }
-
-  double calculateTotalCost() {
-    return calculateTotalCost(this.books, 0);
+  double calculateBasketCost(final List<Integer> books) {
+    return calculateBasketCost(books, 0);
   }
 
-  private double calculateTotalCost(List<Integer> books, double priceSoFar) {
+  private double calculateBasketCost(final List<Integer> books, final double priceSoFar) {
     if (books.size() == 0) {
       return priceSoFar;
     }
@@ -38,8 +32,7 @@ class Bookstore {
         remainingBooks.remove(newGroupBook);
       }
 
-      double price = calculateTotalCost(remainingBooks, priceSoFar + costOfGroupSize(newGroupBooks.size()));
-
+      double price = calculateBasketCost(remainingBooks, priceSoFar + costOfGroupSize(newGroupBooks.size()));
       minPrice = Math.min(minPrice, price);
     }
 

data/tracks/java/exercises/book-store/src/test/java/BookStoreTest.java

@@ -0,0 +1,113 @@
+import static org.junit.Assert.assertEquals;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Arrays;
+
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+
+public class BookStoreTest {
+
+  // This is sufficient accuracy since we're handling currency values, which should be equal to within 2 decimal places.
+  private static final double EQUALITY_TOLERANCE = 0.001;
+
+  private BookStore bookStore;
+
+  @Before
+  public void setUp() {
+    bookStore = new BookStore();
+  }
+
+  @Test
+  public void onlyASingleBook() {
+    List<Integer> books = Collections.singletonList(1);
+    assertEquals(8, bookStore.calculateBasketCost(books), EQUALITY_TOLERANCE);
+  }
+
+  @Ignore("Remove to run test")
+  @Test
+  public void twoOfSameBook() {
+    List<Integer> books = Arrays.asList(1, 1);
+    assertEquals(16, bookStore.calculateBasketCost(books), EQUALITY_TOLERANCE);
+  }
+
+  @Ignore("Remove to run test")
+  @Test
+  public void emptyBasket() {
+    List<Integer> books = Collections.emptyList();
+    assertEquals(0, bookStore.calculateBasketCost(books), EQUALITY_TOLERANCE);
+  }
+
+  @Ignore("Remove to run test")
+  @Test
+  public void twoDifferentBooks() {
+    List<Integer> books = Arrays.asList(1, 2);
+    assertEquals(15.20, bookStore.calculateBasketCost(books), EQUALITY_TOLERANCE);
+  }
+
+  @Ignore("Remove to run test")
+  @Test
+  public void threeDifferentBooks() {
+    List<Integer> books = Arrays.asList(1, 2, 3);
+    assertEquals(21.6, bookStore.calculateBasketCost(books), EQUALITY_TOLERANCE);
+  }
+
+  @Ignore("Remove to run test")
+  @Test
+  public void fourDifferentBooks() {
+    List<Integer> books = Arrays.asList(1, 2, 3, 4);
+    assertEquals(25.6, bookStore.calculateBasketCost(books), EQUALITY_TOLERANCE);
+  }
+
+  @Ignore("Remove to run test")
+  @Test
+  public void fiveDifferentBooks() {
+    List<Integer> books = Arrays.asList(1, 2, 3, 4, 5);
+    assertEquals(30, bookStore.calculateBasketCost(books), EQUALITY_TOLERANCE);
+  }
+
+  @Ignore("Remove to run test")
+  @Test
+  public void twoGroupsOfFourIsCheaperThanGroupOfFivePlusGroupOfThree() {
+    List<Integer> books = Arrays.asList(1, 1, 2, 2, 3, 3, 4, 5);
+    assertEquals(51.20, bookStore.calculateBasketCost(books), EQUALITY_TOLERANCE);
+  }
+
+  @Ignore("Remove to run test")
+  @Test
+  public void groupOfFourPlusGroupOfTwoIsCheaperThanTwoGroupsOfThree() {
+    List<Integer> books = Arrays.asList(1, 1, 2, 2, 3, 4);
+    assertEquals(40.8, bookStore.calculateBasketCost(books), EQUALITY_TOLERANCE);
+  }
+
+  @Ignore("Remove to run test")
+  @Test
+  public void twoEachOfFirst4BooksAnd1CopyEachOfRest() {
+    List<Integer> books = Arrays.asList(1, 1, 2, 2, 3, 3, 4, 4, 5);
+    assertEquals(55.60, bookStore.calculateBasketCost(books), EQUALITY_TOLERANCE);
+  }
+
+  @Ignore("Remove to run test")
+  @Test
+  public void twoCopiesOfEachBook() {
+    List<Integer> books = Arrays.asList(1, 1, 2, 2, 3, 3, 4, 4, 5, 5);
+    assertEquals(60.00, bookStore.calculateBasketCost(books), EQUALITY_TOLERANCE);
+  }
+
+  @Ignore("Remove to run test")
+  @Test
+  public void threeCopiesOfFirstBookAnd2EachOfRemaining() {
+    List<Integer> books = Arrays.asList(1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 1);
+    assertEquals(68.00, bookStore.calculateBasketCost(books), EQUALITY_TOLERANCE);
+  }
+
+  @Ignore("Remove to run test")
+  @Test
+  public void threeEachOFirst2BooksAnd2EachOfRemainingBooks() {
+    List<Integer> books = Arrays.asList(1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 1, 2);
+    assertEquals(75.20, bookStore.calculateBasketCost(books), EQUALITY_TOLERANCE);
+  }
+
+}

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

@@ -1,6 +1,7 @@
-import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 final class Matrix {
 
@@ -10,8 +11,8 @@ final class Matrix {
     this.values = values;
   }
 
-  List<MatrixCoordinate> getSaddlePoints() {
-    final List<MatrixCoordinate> result = new ArrayList<>();
+  Set<MatrixCoordinate> getSaddlePoints() {
+    final Set<MatrixCoordinate> result = new HashSet<>();
 
     if (values.isEmpty()) {
       return result;
@@ -38,7 +39,7 @@ final class Matrix {
     return values.stream()
         .map(row -> row.get(column))
         .min(Integer::compareTo)
-        .get();
+        .orElseThrow(() -> new IllegalArgumentException("Column cannot be empty"));
   }
 
 }

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

@@ -2,11 +2,11 @@ final class MatrixCoordinate {
 
   private final int row;
 
-  private final int column;
+  private final int col;
 
-  MatrixCoordinate(final int row, final int column) {
+  MatrixCoordinate(final int row, final int col) {
     this.row = row;
-    this.column = column;
+    this.col = col;
   }
 
   // Generated equals and hashcode.
@@ -18,13 +18,13 @@ final class MatrixCoordinate {
 
     final MatrixCoordinate that = (MatrixCoordinate) o;
 
-    return row == that.row && column == that.column;
+    return row == that.row && col == that.col;
   }
 
   @Override
   public int hashCode() {
     int result = row;
-    result = 31 * result + column;
+    result = 31 * result + col;
     return result;
   }
 

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

@@ -2,11 +2,11 @@ final class MatrixCoordinate {
 
   private final int row;
 
-  private final int column;
+  private final int col;
 
-  MatrixCoordinate(final int row, final int column) {
+  MatrixCoordinate(final int row, final int col) {
     this.row = row;
-    this.column = column;
+    this.col = col;
   }
 
   // Generated equals and hashcode.
@@ -18,13 +18,13 @@ final class MatrixCoordinate {
 
     final MatrixCoordinate that = (MatrixCoordinate) o;
 
-    return row == that.row && column == that.column;
+    return row == that.row && col == that.col;
   }
 
   @Override
   public int hashCode() {
     int result = row;
-    result = 31 * result + column;
+    result = 31 * result + col;
     return result;
   }
 

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

@@ -1,13 +1,13 @@
 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 java.util.*;
 
 import static org.junit.Assert.assertEquals;
 
+/*
+ * version: 1.0.0
+ */
 public class MatrixTest {
 
     @Test
@@ -18,7 +18,7 @@ public class MatrixTest {
             Arrays.asList(6, 6, 7)
         ));
 
-        List<MatrixCoordinate> expectedSaddlePoints = Collections.singletonList(new MatrixCoordinate(1, 0));
+        Set<MatrixCoordinate> expectedSaddlePoints = Collections.singleton(new MatrixCoordinate(1, 0));
 
         assertEquals(expectedSaddlePoints, matrix.getSaddlePoints());
     }
@@ -28,7 +28,7 @@ public class MatrixTest {
     public void testCanIdentifyThatEmptyMatrixHasNoSaddlePoints() {
         Matrix matrix = new Matrix(new ArrayList<>());
 
-        List<MatrixCoordinate> expectedSaddlePoints = new ArrayList<>();
+        Set<MatrixCoordinate> expectedSaddlePoints = Collections.emptySet();
 
         assertEquals(expectedSaddlePoints, matrix.getSaddlePoints());
     }
@@ -42,7 +42,7 @@ public class MatrixTest {
             Arrays.asList(2, 3, 1)
         ));
 
-        List<MatrixCoordinate> expectedSaddlePoints = new ArrayList<>();
+        Set<MatrixCoordinate> expectedSaddlePoints = Collections.emptySet();
 
         assertEquals(expectedSaddlePoints, matrix.getSaddlePoints());
     }
@@ -56,11 +56,11 @@ public class MatrixTest {
             Arrays.asList(1, 5, 4)
         ));
 
-        List<MatrixCoordinate> expectedSaddlePoints = Arrays.asList(
+        Set<MatrixCoordinate> expectedSaddlePoints = new HashSet<>(Arrays.asList(
             new MatrixCoordinate(0, 1),
             new MatrixCoordinate(1, 1),
             new MatrixCoordinate(2, 1)
-        );
+        ));
 
         assertEquals(expectedSaddlePoints, matrix.getSaddlePoints());
     }
@@ -74,7 +74,7 @@ public class MatrixTest {
             Arrays.asList(3, 2, 5)
         ));
 
-        List<MatrixCoordinate> expectedSaddlePoints = Collections.singletonList(new MatrixCoordinate(2, 2));
+        Set<MatrixCoordinate> expectedSaddlePoints = Collections.singleton(new MatrixCoordinate(2, 2));
 
         assertEquals(expectedSaddlePoints, matrix.getSaddlePoints());
     }

data/tracks/purescript/config.json

@@ -32,6 +32,13 @@
         "modulo"
       ]
     },
+    {
+      "slug": "hamming",
+      "difficulty": 1,
+      "topics": [
+        "Iterating over two lists at once"
+      ]
+    },
     {
       "slug": "pangram",
       "difficulty": 1,