trackler 2.2.1.85 → 2.2.1.86

data/tracks/java/exercises/beer-song/.meta/src/reference/java/BeerSong.java

@@ -1,5 +1,5 @@
 class BeerSong {
-    String verse(int number) {
+    private String verse(int number) {
         switch (number) {
             case 0:
                 return "No more bottles of beer on the wall, no more bottles of beer.\nGo to the store and buy some more, 99 bottles of beer on the wall.\n\n";
@@ -12,7 +12,8 @@ class BeerSong {
         }
     }
 
-    String sing(int start, int stop) {
+    String sing(int start, int takeDown) {
+        int stop = start - takeDown + 1;
         StringBuilder songOutput = new StringBuilder();
 
         for (int i=start; i>=stop; i--) {
@@ -23,6 +24,6 @@ class BeerSong {
     }
 
     String singSong() {
-        return sing(99,0);
+        return sing(99, 100);
     }
-}
+}

data/tracks/java/exercises/beer-song/.meta/version

@@ -0,0 +1 @@
+2.1.0

data/tracks/java/exercises/beer-song/src/test/java/BeerSongTest.java

@@ -17,53 +17,61 @@ public class BeerSongTest {
     public void singFirstVerse() {
         assertEquals("99 bottles of beer on the wall, 99 bottles of beer.\n" +
                         "Take one down and pass it around, 98 bottles of beer on the wall.\n\n",
-                beerSong.verse(99));
+                beerSong.sing(99, 1));
     }
 
     @Ignore("Remove to run test")
     @Test
-    public void singMiddleVerse() {
-        assertEquals("44 bottles of beer on the wall, 44 bottles of beer.\n" +
-                        "Take one down and pass it around, 43 bottles of beer on the wall.\n\n",
-                beerSong.verse(44));
+    public void singLastGenericVerse() {
+        assertEquals("3 bottles of beer on the wall, 3 bottles of beer.\n" +
+                        "Take one down and pass it around, 2 bottles of beer on the wall.\n\n",
+                beerSong.sing(3, 1));
     }
 
     @Ignore("Remove to run test")
     @Test
-    public void singThirdToLastVerse() {
+    public void verseWithTwoBottles() {
         assertEquals("2 bottles of beer on the wall, 2 bottles of beer.\n" +
                         "Take one down and pass it around, 1 bottle of beer on the wall.\n\n",
-                beerSong.verse(2));
+                beerSong.sing(2, 1));
     }
 
     @Ignore("Remove to run test")
     @Test
-    public void singPenultimateVerse() {
+    public void verseWithOneBottle() {
         assertEquals("1 bottle of beer on the wall, 1 bottle of beer.\n" +
                         "Take it down and pass it around, no more bottles of beer on the wall.\n\n",
-                beerSong.verse(1));
+                beerSong.sing(1, 1));
     }
 
     @Ignore("Remove to run test")
     @Test
-    public void singLastVerse() {
+    public void verseWithZeroBottles() {
         assertEquals("No more bottles of beer on the wall, no more bottles of beer.\n" +
                         "Go to the store and buy some more, 99 bottles of beer on the wall.\n\n",
-                beerSong.verse(0));
+                beerSong.sing(0, 1));
     }
 
     @Ignore("Remove to run test")
     @Test
-    public void singLastFourVerses() {
-        assertEquals("3 bottles of beer on the wall, 3 bottles of beer.\n" +
-                        "Take one down and pass it around, 2 bottles of beer on the wall.\n\n" +
-                        "2 bottles of beer on the wall, 2 bottles of beer.\n" +
+    public void singFirstTwoVerses() {
+        assertEquals("99 bottles of beer on the wall, 99 bottles of beer.\n" +
+                        "Take one down and pass it around, 98 bottles of beer on the wall.\n\n" +
+                        "98 bottles of beer on the wall, 98 bottles of beer.\n" +
+                        "Take one down and pass it around, 97 bottles of beer on the wall.\n\n",
+                beerSong.sing(99, 2));
+    }
+
+    @Ignore("Remove to run test")
+    @Test
+    public void singLastThreeVerses() {
+        assertEquals("2 bottles of beer on the wall, 2 bottles of beer.\n" +
                         "Take one down and pass it around, 1 bottle of beer on the wall.\n\n" +
                         "1 bottle of beer on the wall, 1 bottle of beer.\n" +
                         "Take it down and pass it around, no more bottles of beer on the wall.\n\n" +
                         "No more bottles of beer on the wall, no more bottles of beer.\n" +
                         "Go to the store and buy some more, 99 bottles of beer on the wall.\n\n",
-                beerSong.sing(3,0));
+                beerSong.sing(2, 3));
     }
 
     @Ignore("Remove to run test")

data/tracks/java/exercises/binary-search/.meta/version

@@ -0,0 +1 @@
+1.1.0

data/tracks/java/exercises/book-store/.meta/version

@@ -0,0 +1 @@
+1.2.0

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

@@ -23,21 +23,21 @@ public class BookStoreTest {
   @Test
   public void onlyASingleBook() {
     List<Integer> books = Collections.singletonList(1);
-    assertEquals(8, bookStore.calculateBasketCost(books), EQUALITY_TOLERANCE);
+    assertEquals(8.00, 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);
+    List<Integer> books = Arrays.asList(2, 2);
+    assertEquals(16.00, 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);
+    assertEquals(0.00, bookStore.calculateBasketCost(books), EQUALITY_TOLERANCE);
   }
 
   @Ignore("Remove to run test")
@@ -51,21 +51,21 @@ public class BookStoreTest {
   @Test
   public void threeDifferentBooks() {
     List<Integer> books = Arrays.asList(1, 2, 3);
-    assertEquals(21.6, bookStore.calculateBasketCost(books), EQUALITY_TOLERANCE);
+    assertEquals(21.60, 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);
+    assertEquals(25.60, 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);
+    assertEquals(30.00, bookStore.calculateBasketCost(books), EQUALITY_TOLERANCE);
   }
 
   @Ignore("Remove to run test")
@@ -79,7 +79,7 @@ public class BookStoreTest {
   @Test
   public void groupOfFourPlusGroupOfTwoIsCheaperThanTwoGroupsOfThree() {
     List<Integer> books = Arrays.asList(1, 1, 2, 2, 3, 4);
-    assertEquals(40.8, bookStore.calculateBasketCost(books), EQUALITY_TOLERANCE);
+    assertEquals(40.80, bookStore.calculateBasketCost(books), EQUALITY_TOLERANCE);
   }
 
   @Ignore("Remove to run test")
@@ -110,4 +110,11 @@ public class BookStoreTest {
     assertEquals(75.20, bookStore.calculateBasketCost(books), EQUALITY_TOLERANCE);
   }
 
+  @Ignore("Remove to run test")
+  @Test
+  public void fourGroupsOfFourAreCheaperThanTwoGroupsEachOfFiveAndThree() {
+    List<Integer> books = Arrays.asList(1, 1, 2, 2, 3, 3, 4, 5, 1, 1, 2, 2, 3, 3, 4, 5);
+    assertEquals(102.4, bookStore.calculateBasketCost(books), EQUALITY_TOLERANCE);
+  }
+
 }

data/tracks/java/exercises/circular-buffer/.meta/version

@@ -0,0 +1 @@
+1.0.1

data/tracks/java/exercises/list-ops/.meta/version

@@ -1 +1 @@
-1.0.0
+2.0.0

data/tracks/java/exercises/list-ops/src/test/java/ListOpsTest.java

@@ -179,5 +179,5 @@ public class ListOpsTest {
                 Arrays.asList('7', '5', '3', '1'),
                 ListOps.reverse(Arrays.asList('1', '3', '5', '7')));
     }
-
+    
 }

data/tracks/java/exercises/nth-prime/.meta/version

@@ -0,0 +1 @@
+2.0.0

data/tracks/java/exercises/settings.gradle

@@ -2,6 +2,7 @@ include 'accumulate'
 include 'acronym'
 include 'all-your-base'
 include 'allergies'
+include 'alphametics'
 include 'anagram'
 include 'armstrong-numbers'
 include 'atbash-cipher'

data/tracks/java/exercises/tournament/.meta/version

@@ -0,0 +1 @@
+1.3.0

data/tracks/java/exercises/transpose/.meta/version

@@ -0,0 +1 @@
+1.1.0

data/tracks/java/exercises/transpose/src/test/java/TransposeTest.java

@@ -129,6 +129,35 @@ public class TransposeTest {
         assertEquals(expected, transpose.transpose(input));
     }
 
+    @Ignore("Remove to run test")
+    @Test
+    public void mixedLineLength() {
+        String input = "The longest line.\n" +
+                       "A long line.\n" +
+                       "A longer line.\n" +
+                       "A line.";
+
+        String expected = "TAAA\n" +
+                          "h   \n" +
+                          "elll\n" +
+                          " ooi\n" +
+                          "lnnn\n" +
+                          "ogge\n" +
+                          "n e.\n" +
+                          "glr\n" +
+                          "ei \n" +
+                          "snl\n" +
+                          "tei\n" +
+                          " .n\n" +
+                          "l e\n" +
+                          "i .\n" +
+                          "n\n" +
+                          "e\n" +
+                          ".";
+
+        assertEquals(expected, transpose.transpose(input));
+    }
+
     @Ignore("Remove to run test")
     @Test
     public void square() {
@@ -187,78 +216,4 @@ public class TransposeTest {
         assertEquals(expected, transpose.transpose(input));
     }
 
-    @Ignore("Remove to run test")
-    @Test
-    public void manyLines() {
-        String input = "Chor. Two households, both alike in dignity,\n" +
-                       "In fair Verona, where we lay our scene,\n" +
-                       "From ancient grudge break to new mutiny,\n" +
-                       "Where civil blood makes civil hands unclean.\n" +
-                       "From forth the fatal loins of these two foes\n" +
-                       "A pair of star-cross'd lovers take their life;\n" +
-                       "Whose misadventur'd piteous overthrows\n" +
-                       "Doth with their death bury their parents' strife.\n" +
-                       "The fearful passage of their death-mark'd love,\n" +
-                       "And the continuance of their parents' rage,\n" +
-                       "Which, but their children's end, naught could remove,\n" +
-                       "Is now the two hours' traffic of our stage;\n" +
-                       "The which if you with patient ears attend,\n" +
-                       "What here shall miss, our toil shall strive to mend.";
-
-        String expected = "CIFWFAWDTAWITW\n" +
-                          "hnrhr hohnhshh\n" +
-                          "o oeopotedi ea\n" +
-                          "rfmrmash  cn t\n" +
-                          ".a e ie fthow \n" +
-                          " ia fr weh,whh\n" +
-                          "Trnco miae  ie\n" +
-                          "w ciroitr btcr\n" +
-                          "oVivtfshfcuhhe\n" +
-                          " eeih a uote  \n" +
-                          "hrnl sdtln  is\n" +
-                          "oot ttvh tttfh\n" +
-                          "un bhaeepihw a\n" +
-                          "saglernianeoyl\n" +
-                          "e,ro -trsui ol\n" +
-                          "h uofcu sarhu \n" +
-                          "owddarrdan o m\n" +
-                          "lhg to'egccuwi\n" +
-                          "deemasdaeehris\n" +
-                          "sr als t  ists\n" +
-                          ",ebk 'phool'h,\n" +
-                          "  reldi ffd   \n" +
-                          "bweso tb  rtpo\n" +
-                          "oea ileutterau\n" +
-                          "t kcnoorhhnatr\n" +
-                          "hl isvuyee'fi \n" +
-                          " atv es iisfet\n" +
-                          "ayoior trr ino\n" +
-                          "l  lfsoh  ecti\n" +
-                          "ion   vedpn  l\n" +
-                          "kuehtteieadoe \n" +
-                          "erwaharrar,fas\n" +
-                          "   nekt te  rh\n" +
-                          "ismdsehphnnosa\n" +
-                          "ncuse ra-tau l\n" +
-                          " et  tormsural\n" +
-                          "dniuthwea'g t \n" +
-                          "iennwesnr hsts\n" +
-                          "g,ycoi tkrttet\n" +
-                          "n ,l r s'a anr\n" +
-                          "i  ef  'dgcgdi\n" +
-                          "t  aol   eoe,v\n" +
-                          "y  nei sl,u; e\n" +
-                          ",  .sf to l   \n" +
-                          "     e rv d  t\n" +
-                          "     ; ie    o\n" +
-                          "       f, r   \n" +
-                          "       e  e  m\n" +
-                          "       .  m  e\n" +
-                          "          o  n\n" +
-                          "          v  d\n" +
-                          "          e  .\n" +
-                          "          ,";
-
-        assertEquals(expected, transpose.transpose(input));
-    }
 }

data/tracks/java/exercises/wordy/.meta/version

@@ -0,0 +1 @@
+1.0.0

data/tracks/javascript/.eslintignore

@@ -2,7 +2,6 @@ big-integer.js
 exercises/alphametics
 exercises/binary-search
 exercises/binary-search-tree
-exercises/bowling
 exercises/bracket-push
 exercises/custom-set
 exercises/flatten-array

data/tracks/javascript/config.json

@@ -1128,10 +1128,8 @@
       "topics": [
         "Control-flow (conditionals)",
         "Control-flow (loops)",
-        "Polymorphism",
         "Strings",
-        "Pattern recognition",
-        "Regular expressions"
+        "Pattern recognition"
       ]
     },
     {
@@ -1186,6 +1184,18 @@
         "pattern_matching",
         "strings"
       ]
+    },
+    {
+      "uuid": "b3dbc935-536e-4910-994d-4a519b511b6a",
+      "slug": "forth",
+      "core": false,
+      "unlocked_by": "saddle-points",
+      "difficulty": 8,
+      "topics": [
+        "stacks",
+        "parsing",
+        "domain_specific_languages"
+      ]
     }
   ],
   "foregone": [],

data/tracks/javascript/exercises/bowling/example.js

@@ -5,6 +5,9 @@ function Bowling(rolls) {
 }
 
 Bowling.prototype.score = function () {
+  var maxFrames = 10;
+  var maxPins = 10;
+
   var initialState = {
     frameNumber: 1,
     rollNumber: 1,
@@ -17,7 +20,7 @@ Bowling.prototype.score = function () {
   };
 
   var finalState = this.rolls.reduce(function (state, roll) {
-    if (roll < 0 || roll > 10) {
+    if (roll < 0 || roll > maxFrames ) {
       throw new Error('Pins must have a value from 0 to 10');
     }
 
@@ -25,11 +28,11 @@ Bowling.prototype.score = function () {
       throw new Error('Pin count exceeds pins on the lane');
     }
 
-    if (state.frameNumber > 10) {
+    if (state.frameNumber > maxFrames ) {
       throw new Error('Should not be able to roll after game is over');
     }
 
-    var finalFrame = state.frameNumber === 10;
+    var finalFrame = state.frameNumber === maxFrames;
     var strike = state.rollNumber === 1 && roll === 10;
     var spare = state.rollNumber === 2 && roll === state.pinsRemaining;
     var frameOver = finalFrame
@@ -38,17 +41,19 @@ Bowling.prototype.score = function () {
 
     var score = state.score + roll;
 
-    if (state.strikeLastFrame && state.rollNumber < 3) { score += roll; }
-    if (state.spareLastFrame && state.rollNumber === 1) { score += roll; }
-    if (state.twoStrikesInARow && state.rollNumber === 1) { score += roll; }
+    if (state.strikeLastFrame && state.rollNumber < 3) { score = incrementScore(score, roll); }
+    if (state.spareLastFrame && state.rollNumber === 1) { score = incrementScore(score, roll); }
+    if (state.twoStrikesInARow && state.rollNumber === 1) { score = incrementScore(score, roll); }
 
     var next = {};
 
     next.frameNumber = frameOver ? state.frameNumber + 1 : state.frameNumber;
     next.rollNumber = frameOver ? 1 : state.rollNumber + 1;
-    next.pinsRemaining = finalFrame
-      ? ((strike || spare) ? 10 : state.pinsRemaining - roll)
-      : (frameOver ? 10 : state.pinsRemaining - roll);
+    if ( finalFrame ) {
+      next.pinsRemaining = (strike || spare) ? maxPins : pinsRemaining(state.pinsRemaining, roll);
+    } else {
+      next.pinsRemaining = frameOver ? maxPins : pinsRemaining(state.pinsRemaining, roll);
+    }
     next.spareLastFrame = frameOver ? spare : state.spareLastFrame;
     next.strikeLastFrame = frameOver ? strike : state.strikeLastFrame;
     next.twoStrikesInARow = frameOver ? strike && state.strikeLastFrame : state.twoStrikesInARow;
@@ -58,11 +63,20 @@ Bowling.prototype.score = function () {
     return next;
   }, initialState);
 
-  if (finalState.frameNumber !== 11) {
+  if (finalState.frameNumber <= maxFrames ) {
     throw new Error('Score cannot be taken until the end of the game');
   }
 
   return finalState.score;
 };
 
+function incrementScore(score, roll) {
+  return score + roll;
+}
+
+function pinsRemaining(pins, roll) {
+  return pins - roll;
+}
+
+
 module.exports = Bowling;