trackler 2.1.0.20 → 2.1.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f87268f3d1befaae03d6be8ac007d0728f59a122
-  data.tar.gz: 54c2c7df1d551ac6082730d8daa399d82fc18886
+  metadata.gz: 10fae0e15e9198dab905f9201679574b543a3803
+  data.tar.gz: a463c33562dc740ccfa9a73402a211d2a19ecc6a
 SHA512:
-  metadata.gz: 4f32ea0316601002cd7b6e36d6d67b2ebacc550f8e975761b436a33b5679e26f76da9aa8be03bbce38b58c2574dfd5c67b8f43a07da8ec97954a89e0eb0dee28
-  data.tar.gz: afa5fb4fda304732356033a7fc863a5417427e3f8ab0a2512922572a31418a7cd17c2bb67da348ae89c41a434949e7c6f7f9553138802e4a53c90b95c69197fb
+  metadata.gz: 2ece06dd2344a889439d5fdad91e9a8b8838ac4a1c734a2b98971eac2af3ab5ee6aeca6048ea537894a051ed82a426af86e90555baf40d9db7bae7f6ae134aa9
+  data.tar.gz: a39f6786f6d649c82f57c58e8094bd3768dcea709d3e05ad248ca12a3188acc1f646b06b2303872a768712b55540775ffe243addf18b1eeb62ba6b40e996518f

data/lib/trackler/version.rb

@@ -1,3 +1,3 @@
 module Trackler
-  VERSION = "2.1.0.20"
+  VERSION = "2.1.0.21"
 end

data/tracks/haskell/exercises/parallel-letter-frequency/HINTS.md

@@ -3,3 +3,7 @@
 Your code should contain a frequency :: Int -> [Text] -> Map Char Int
 function which accepts a number of workers to use in parallel and a list
 of texts and returns the total frequency of each letter in the text.
+
+### Benchmark
+
+Check how changing number of workers affects performance of your solution by running the benchmark. Use `stack bench` to run it. Feel free to modify `bench/Benchmark.hs` to explore your solution's performance on different inputs.

data/tracks/haskell/exercises/parallel-letter-frequency/bench/Benchmark.hs

@@ -0,0 +1,40 @@
+{-# LANGUAGE OverloadedStrings #-}
+
+import Frequency (frequency)
+
+import Prelude hiding (unlines)
+import Data.Text (Text, unlines)
+
+import Criterion.Main (bench, bgroup, defaultMain, nf)
+import Criterion.Types (Benchmark)
+import Control.Concurrent (getNumCapabilities)
+import Data.List (nub, sort, replicate)
+
+odeAnDieFreude :: Text
+odeAnDieFreude = unlines
+                 [ "Freude schöner Götterfunken"
+                 , "Tochter aus Elysium,"
+                 , "Wir betreten feuertrunken,"
+                 , "Himmlische, dein Heiligtum!"
+                 , "Deine Zauber binden wieder"
+                 , "Was die Mode streng geteilt;"
+                 , "Alle Menschen werden Brüder,"
+                 , "Wo dein sanfter Flügel weilt."
+                 ]
+
+
+makeBench :: [Text] -> Int -> Benchmark
+makeBench anthems workers = bench name $ nf (`frequency` anthems) workers
+  where name = show workers ++ " workers"
+
+benchGroup :: Int -> [Int] -> Int -> Benchmark
+benchGroup processors numWorkers numAnthems =
+  bgroup (show numAnthems ++ " anthems on " ++ show processors ++ " threads") (makeBench anthems <$> numWorkers)
+  where anthems = replicate numAnthems odeAnDieFreude
+
+main :: IO ()
+main = do threads <- getNumCapabilities
+          let numsOfWorkers = nub $ sort [1..threads]
+              numsOfAnthems = [500]
+
+          defaultMain $ benchGroup threads numsOfWorkers <$> numsOfAnthems

data/tracks/haskell/exercises/parallel-letter-frequency/examples/success-standard/package.yaml

@@ -18,3 +18,13 @@ tests:
     dependencies:
       - parallel-letter-frequency
       - hspec
+
+benchmarks:
+  bench:
+    ghc-options: -threaded -with-rtsopts=-N -O2
+
+    main: Benchmark.hs
+    source-dirs: bench
+    dependencies:
+      - parallel-letter-frequency
+      - criterion

data/tracks/haskell/exercises/parallel-letter-frequency/package.yaml

@@ -1,5 +1,5 @@
 name: parallel-letter-frequency
-version: 0.1.0.2
+version: 0.1.0.3
 
 dependencies:
   - base
@@ -20,3 +20,13 @@ tests:
     dependencies:
       - parallel-letter-frequency
       - hspec
+
+benchmarks:
+  bench:
+    ghc-options: -threaded -with-rtsopts=-N -O2
+
+    main: Benchmark.hs
+    source-dirs: bench
+    dependencies:
+      - parallel-letter-frequency
+      - criterion

data/tracks/java/exercises/binary-search/src/test/java/BinarySearchTest.java

@@ -1,136 +1,128 @@
 
+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;
-import org.junit.Ignore;
-import org.junit.Test;
 
 public class BinarySearchTest {
 
-    public static final List<Integer> EMPTY_LIST
-            = Collections.unmodifiableList(new ArrayList<Integer>(0));
-
-    public static final List<Integer> LIST_OF_UNIT_LENGTH
-            = Collections.unmodifiableList(
-                    Arrays.asList(6)
-            );
-
-    private static final List<Integer> SORTED_LIST
-            = Collections.unmodifiableList(
-                    Arrays.asList(1, 3, 4, 6, 8, 9, 11)
-            );
-
-    public static final List<Integer> SORTED_LIST_OF_ODD_LENGTH
-            = Collections.unmodifiableList(
-                    Arrays.asList(1, 3, 5, 8, 13, 21, 34, 55,
-                            89, 144, 233, 377, 634)
-            );
-
-    public static final List<Integer> SORTED_LIST_OF_EVEN_LENGTH
-            = Collections.unmodifiableList(
-                    Arrays.asList(1, 3, 5, 8, 13, 21, 34, 55,
-                            89, 144, 233, 377)
-            );
-
     @Test
     public void findsAValueInAnArrayWithOneElement() {
-        BinarySearch<Integer> sut = new BinarySearch<>(LIST_OF_UNIT_LENGTH);
-        final int value = 6;
-        final int actual = sut.indexOf(value);
-        final int expected = 0;
-        assertEquals(expected, actual);
+        List<Integer> listOfUnitLength = Collections.singletonList(6);
+
+        BinarySearch<Integer> sut = new BinarySearch<>(listOfUnitLength);
+
+        assertEquals(0, sut.indexOf(6));
     }
 
     @Ignore("Remove to run test")
     @Test
     public void findsAValueInTheMiddleOfAnArray() {
-        BinarySearch<Integer> sut = new BinarySearch<>(SORTED_LIST);
-        final int value = 6;
-        final int actual = sut.indexOf(value);
-        final int expected = 3;
-        assertEquals(expected, actual);
+        List<Integer> sortedList = Collections.unmodifiableList(
+                Arrays.asList(1, 3, 4, 6, 8, 9, 11)
+        );
+
+        BinarySearch<Integer> sut = new BinarySearch<>(sortedList);
+
+        assertEquals(3, sut.indexOf(6));
     }
 
     @Ignore("Remove to run test")
     @Test
     public void findsAValueAtTheBeginningOfAnArray() {
-        BinarySearch<Integer> sut = new BinarySearch<>(SORTED_LIST);
-        final int value = 1;
-        final int actual = sut.indexOf(value);
-        final int expected = 0;
-        assertEquals(expected, actual);
+        List<Integer> sortedList = Collections.unmodifiableList(
+                Arrays.asList(1, 3, 4, 6, 8, 9, 11)
+        );
+
+        BinarySearch<Integer> sut = new BinarySearch<>(sortedList);
+
+        assertEquals(0, sut.indexOf(1));
     }
 
     @Ignore("Remove to run test")
     @Test
     public void findsAValueAtTheEndOfAnArray() {
-        BinarySearch<Integer> sut = new BinarySearch<>(SORTED_LIST);
-        final int value = 11;
-        final int actual = sut.indexOf(value);
-        final int expected = 6;
-        assertEquals(expected, actual);
+        List<Integer> sortedList = Collections.unmodifiableList(
+                Arrays.asList(1, 3, 4, 6, 8, 9, 11)
+        );
+
+        BinarySearch<Integer> sut = new BinarySearch<>(sortedList);
+
+        assertEquals(6, sut.indexOf(11));
     }
 
     @Ignore("Remove to run test")
     @Test
     public void findsAValueInAnArrayOfOddLength() {
-        BinarySearch<Integer> sut = new BinarySearch<>(SORTED_LIST_OF_ODD_LENGTH);
-        final int value = 144;
-        final int actual = sut.indexOf(value);
-        final int expected = 9;
-        assertEquals(expected, actual);
+        List<Integer> sortedListOfOddLength = Collections.unmodifiableList(
+                Arrays.asList(1, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233, 377, 634)
+        );
+
+        BinarySearch<Integer> sut = new BinarySearch<>(sortedListOfOddLength);
+
+        assertEquals(9, sut.indexOf(144));
     }
 
     @Ignore("Remove to run test")
     @Test
     public void findsAValueInAnArrayOfEvenLength() {
-        BinarySearch<Integer> sut
-                = new BinarySearch<>(SORTED_LIST_OF_EVEN_LENGTH);
-        final int value = 21;
-        final int actual = sut.indexOf(value);
-        final int expected = 5;
-        assertEquals(expected, actual);
+        List<Integer> sortedListOfEvenLength = Collections.unmodifiableList(
+                Arrays.asList(1, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233, 377)
+        );
+
+        BinarySearch<Integer> sut = new BinarySearch<>(sortedListOfEvenLength);
+
+        assertEquals(5, sut.indexOf(21));
     }
 
     @Ignore("Remove to run test")
     @Test
     public void identifiesThatAValueIsNotIncludedInTheArray() {
-        BinarySearch<Integer> sut = new BinarySearch<>(SORTED_LIST);
-        final int value = 7;
-        final int actual = sut.indexOf(value);
-        final int expected = -1;
-        assertEquals(expected, actual);
+        List<Integer> sortedList = Collections.unmodifiableList(
+                Arrays.asList(1, 3, 4, 6, 8, 9, 11)
+        );
+
+        BinarySearch<Integer> sut = new BinarySearch<>(sortedList);
+
+        assertEquals(-1, sut.indexOf(7));
     }
 
     @Ignore("Remove to run test")
     @Test
     public void aValueSmallerThanTheArraysSmallestValueIsNotIncluded() {
-        BinarySearch<Integer> sut = new BinarySearch<>(SORTED_LIST);
-        final int value = 0;
-        final int actual = sut.indexOf(value);
-        final int expected = -1;
-        assertEquals(expected, actual);
+        List<Integer> sortedList = Collections.unmodifiableList(
+                Arrays.asList(1, 3, 4, 6, 8, 9, 11)
+        );
+
+        BinarySearch<Integer> sut = new BinarySearch<>(sortedList);
+
+        assertEquals(-1, sut.indexOf(0));
     }
 
     @Ignore("Remove to run test")
     @Test
     public void aValueLargerThanTheArraysSmallestValueIsNotIncluded() {
-        BinarySearch<Integer> sut = new BinarySearch<>(SORTED_LIST);
-        final int value = 13;
-        final int actual = sut.indexOf(value);
-        final int expected = -1;
-        assertEquals(expected, actual);
+        List<Integer> sortedList = Collections.unmodifiableList(
+                Arrays.asList(1, 3, 4, 6, 8, 9, 11)
+        );
+
+        BinarySearch<Integer> sut = new BinarySearch<>(sortedList);
+
+        assertEquals(-1, sut.indexOf(13));
     }
 
     @Ignore("Remove to run test")
     @Test
     public void nothingIsIncludedInAnEmptyArray() {
-        BinarySearch<Integer> sut = new BinarySearch<>(EMPTY_LIST);
-        final int value = 1;
-        final int actual = sut.indexOf(value);
-        final int expected = -1;
-        assertEquals(expected, actual);
+        List<Integer> emptyList = Collections.emptyList();
+
+        BinarySearch<Integer> sut = new BinarySearch<>(emptyList);
+
+        assertEquals(-1, sut.indexOf(1));
     }
 }

data/tracks/java/exercises/change/src/test/java/ChangeCalculatorTest.java

@@ -8,7 +8,7 @@ import static java.util.Collections.emptyList;
 import static java.util.Collections.singletonList;
 import static org.junit.Assert.assertEquals;
 
-public final class ChangeCalculatorTest {
+public class ChangeCalculatorTest {
 
     /*
      * See https://github.com/junit-team/junit4/wiki/Rules for information on JUnit Rules in general and

data/tracks/vimscript/config.json

@@ -3,6 +3,7 @@
   "language": "Vim script",
   "repository": "https://github.com/exercism/xvimscript",
   "active": false,
+  "test_pattern": "\\.vader$",
   "exercises": [
     {
       "slug": "hello-world",
@@ -32,20 +33,27 @@
     {
       "slug": "anagram",
       "difficulty": 1,
-      "topics": [
-      ]
+      "topics": []
     },
     {
       "slug": "difference-of-squares",
       "difficulty": 1,
-      "topics": [
-      ]
+      "topics": []
     },
     {
       "slug": "raindrops",
       "difficulty": 1,
-      "topics": [
-      ]
+      "topics": []
+    },
+    {
+      "slug": "word-count",
+      "difficulty": 1,
+      "topics": []
+    },
+    {
+      "slug": "atbash-cipher",
+      "difficulty": 1,
+      "topics": []
     }
   ],
   "deprecated": [],

data/tracks/vimscript/exercises/atbash-cipher/atbash_cipher.vader

@@ -0,0 +1,50 @@
+" The tests are divided into two groups:
+"
+"   - encoding from English to atbash cipher
+"   - decoding from atbash cipher to all-lowercase-mashed-together English
+
+" Test encoding from English to atbash
+
+Execute (encode yes):
+  AssertEqual 'bvh', AtbashEncode('yes')
+
+Execute (encode no):
+  AssertEqual 'ml', AtbashEncode('no')
+
+Execute (encode OMG):
+  AssertEqual 'lnt', AtbashEncode('OMG')
+
+Execute (encode spaces):
+  AssertEqual 'lnt', AtbashEncode('O M G')
+
+Execute (encode mindblowingly):
+  AssertEqual 'nrmwy oldrm tob', AtbashEncode('mindblowingly')
+
+Execute (encode numbers):
+  AssertEqual 'gvhgr mt123 gvhgr mt', AtbashEncode('Testing,1 2 3, testing.')
+
+Execute (encode deep thought):
+  AssertEqual 'gifgs rhurx grlm', AtbashEncode('Truth is fiction.')
+
+Execute (encode all the letters):
+  AssertEqual
+    \ 'gsvjf rxpyi ldmul cqfnk hlevi gsvoz abwlt',
+    \ AtbashEncode('The quick brown fox jumps over the lazy dog.')
+
+" Test decoding from atbash to English
+
+Execute (decode exercism):
+  AssertEqual 'exercism', AtbashDecode('vcvix rhn')
+
+Execute (decode a sentence):
+  AssertEqual
+    \ 'anobstacleisoftenasteppingstone',
+    \ AtbashDecode('zmlyh gzxov rhlug vmzhg vkkrm thglm v')
+
+Execute (decode numbers):
+  AssertEqual 'testing123testing', AtbashDecode('gvhgr mt123 gvhgr mt')
+
+Execute (decode all the letters):
+  AssertEqual
+    \ 'thequickbrownfoxjumpsoverthelazydog',
+    \ AtbashDecode('gsvjf rxpyi ldmul cqfnk hlevi gsvoz abwlt')

data/tracks/vimscript/exercises/atbash-cipher/atbash_cipher.vim

@@ -0,0 +1,23 @@
+"
+" Create an implementation of the atbash cipher, an ancient encryption system
+" created in the Middle East.
+"
+" Examples:
+"
+"   :echo AtbashEncode('test')
+"   gvhg
+"
+"   :echo AtbashDecode('gvhg')
+"   test
+"
+"   :echo AtbashDecode('gsvjf rxpyi ldmul cqfnk hlevi gsvoz abwlt')
+"   thequickbrownfoxjumpsoverthelazydog
+"
+
+function! AtbashDecode(cipher) abort
+  " your code goes here
+endfunction
+
+function! AtbashEncode(plaintext) abort
+  " your code goes here
+endfunction

data/tracks/vimscript/exercises/atbash-cipher/example.vim

@@ -0,0 +1,21 @@
+function! AtbashDecode(cipher) abort
+  return s:algorithm(s:normalize(a:cipher))
+endfunction
+
+function! AtbashEncode(plaintext) abort
+  return s:chunk(AtbashDecode(a:plaintext))
+endfunction
+
+function! s:normalize(text) abort
+  return substitute(tolower(a:text), '[^a-z0-9]', '', 'g')
+endfunction
+
+function! s:algorithm(text) abort
+  let alphabet = 'abcdefghijklmnopqrstuvwxyz'
+  let reversed = 'zyxwvutsrqponmlkjihgfedcba'
+  return tr(a:text, alphabet, reversed)
+endfunction
+
+function! s:chunk(text) abort
+  return join(split(a:text, '.\{5}\zs'))
+endfunction

data/tracks/vimscript/exercises/word-count/example.vim

@@ -0,0 +1,10 @@
+function! WordCount(phrase) abort
+  let words = {}
+
+  for word in split(a:phrase, "[^[:alnum:]']\\+")
+    let word = substitute(tolower(word), "^'\\(.*\\)'$", '\1', '')
+    let words[word] = get(words, word) + 1
+  endfor
+
+  return words
+endfunction

data/tracks/vimscript/exercises/word-count/word_count.vader

@@ -0,0 +1,54 @@
+Before:
+  if exists('expected')
+    unlet expected
+  endif
+
+Execute (count one word):
+  let phrase   = 'word'
+  let expected = {'word': 1}
+  AssertEqual expected, WordCount(phrase)
+
+Execute (count one of each word):
+  let phrase   = 'one of each'
+  let expected = {'one': 1, 'of': 1, 'each': 1}
+  AssertEqual expected, WordCount(phrase)
+
+Execute (multiple occurrences of a word):
+  let phrase   = 'one fish two fish red fish blue fish'
+  let expected = {'one': 1, 'fish': 4, 'two': 1, 'red': 1, 'blue': 1}
+  AssertEqual expected, WordCount(phrase)
+
+Execute (handles cramped lists):
+  let phrase   = 'one,two,three'
+  let expected = {'one': 1, 'two': 1, 'three': 1}
+  AssertEqual expected, WordCount(phrase)
+
+Execute (handles expanded lists):
+  let phrase   = "one,\ntwo,\nthree"
+  let expected = {'one': 1, 'two': 1, 'three': 1}
+  AssertEqual expected, WordCount(phrase)
+
+Execute (ignore punctuation):
+  let phrase   = 'car: carpet as java: javascript!!&@$%^&'
+  let expected = {'car': 1, 'carpet': 1, 'as': 1, 'java': 1, 'javascript': 1}
+  AssertEqual expected, WordCount(phrase)
+
+Execute (include numbers):
+  let phrase   = 'testing, 1, 2 testing'
+  let expected = {'testing': 2, '1': 1, '2': 1}
+  AssertEqual expected, WordCount(phrase)
+
+Execute (normalize case):
+  let phrase   = 'go Go GO Stop stop'
+  let expected = {'go': 3, 'stop': 2}
+  AssertEqual expected, WordCount(phrase)
+
+Execute (with apostrophes):
+  let phrase   = "First: don't laugh. Then: don't cry."
+  let expected = {'first': 1, 'don''t': 2, 'laugh': 1, 'then': 1, 'cry': 1}
+  AssertEqual expected, WordCount(phrase)
+
+Execute (with quotations):
+  let phrase   = "Joe can't tell between 'large' and large."
+  let expected = {'joe': 1, 'can''t': 1, 'tell': 1, 'between': 1, 'large': 2, 'and': 1}
+  AssertEqual expected, WordCount(phrase)

data/tracks/vimscript/exercises/word-count/word_count.vim

@@ -0,0 +1,14 @@
+"
+" Given a phrase, return a dictionary containing the count of occurrences of
+" each word.
+"
+" Example:
+"
+"   :echo WordCount('olly olly in come free')
+"   {'olly': 2, 'come': 1, 'in': 1, 'free': 1}
+"
+function! WordCount(phrase) abort
+
+  " your solution goes here
+
+endfunction

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trackler
 version: !ruby/object:Gem::Version
-  version: 2.1.0.20
+  version: 2.1.0.21
 platform: ruby
 authors:
 - Katrina Owen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-25 00:00:00.000000000 Z
+date: 2017-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -3991,6 +3991,7 @@ files:
 - tracks/haskell/exercises/pangram/stack.yaml
 - tracks/haskell/exercises/pangram/test/Tests.hs
 - tracks/haskell/exercises/parallel-letter-frequency/HINTS.md
+- tracks/haskell/exercises/parallel-letter-frequency/bench/Benchmark.hs
 - tracks/haskell/exercises/parallel-letter-frequency/examples/success-standard/package.yaml
 - tracks/haskell/exercises/parallel-letter-frequency/examples/success-standard/src/Frequency.hs
 - tracks/haskell/exercises/parallel-letter-frequency/package.yaml
@@ -9060,6 +9061,9 @@ files:
 - tracks/vimscript/exercises/anagram/anagram.vader
 - tracks/vimscript/exercises/anagram/anagram.vim
 - tracks/vimscript/exercises/anagram/example.vim
+- tracks/vimscript/exercises/atbash-cipher/atbash_cipher.vader
+- tracks/vimscript/exercises/atbash-cipher/atbash_cipher.vim
+- tracks/vimscript/exercises/atbash-cipher/example.vim
 - tracks/vimscript/exercises/bob/bob.vader
 - tracks/vimscript/exercises/bob/bob.vim
 - tracks/vimscript/exercises/bob/example.vim
@@ -9081,6 +9085,9 @@ files:
 - tracks/vimscript/exercises/rna-transcription/example.vim
 - tracks/vimscript/exercises/rna-transcription/rna_transcription.vader
 - tracks/vimscript/exercises/rna-transcription/rna_transcription.vim
+- tracks/vimscript/exercises/word-count/example.vim
+- tracks/vimscript/exercises/word-count/word_count.vader
+- tracks/vimscript/exercises/word-count/word_count.vim
 - tracks/vimscript/img/icon.png
 homepage: http://exercism.io
 licenses: