trackler 2.0.0.2 → 2.0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ecd79fc11b28fd57fad197537efd30d929a39a2
-  data.tar.gz: a260adf3ee20c762dc65638fb762284607c54761
+  metadata.gz: 13d90971009884bd820bdbe76a985c6a084b4a71
+  data.tar.gz: 45d64cda7e36d7934c5fe4827525ff6aa0555eb6
 SHA512:
-  metadata.gz: b74c1f2b78cfed39a431f5bdae4fa8822008aa987087985e9c1508d3f39710aaa32460d5e168c252d745ed579d319047734a533e38766b854e12e67a92ac8ddc
-  data.tar.gz: 4d597f2e379ed5010ab9d881051991a20d7afe9b3200e4d8d38d6de3560727b7c096c960aa9762291255e04d45cf6034df034f7e7ff49fb66788ee070d8f215d
+  metadata.gz: fb8974eb51e067fd796d4cc65ed3fe25df92f865ef5db6b24517036b3121ea31b73c5f62d4b49774c6dcf06b1d6fecbcad776dbb7a68f5d3ac98b4ef83f6fd6c
+  data.tar.gz: fd4f843c2e21324070fab9e4925c40a85901e760d2a557b9e6088758304204328cc3a834fd1c705a72e8c9f76f197fe4f0e35cb87b35727eeb581d0007ecdbce

data/common/exercises/forth/canonical-data.json

@@ -194,7 +194,7 @@
         "expected": []
       },
       {
-        "description": "removes the top value on the stack if it not is the only one",
+        "description": "removes the top value on the stack if it is not the only one",
         "input": [
           "1 2 drop"
         ],

data/common/exercises/pangram/canonical-data.json

@@ -39,16 +39,6 @@
         "description": "pangram with mixed case and punctuation",
         "input": "\"Five quacking Zephyrs jolt my wax bed.\"",
         "expected": true
-      },
-      {
-        "description": "pangram with non ascii characters",
-        "input": "Victor jagt zwölf Boxkämpfer quer über den großen Sylter Deich.",
-        "expected": true
-      },
-      {
-         "description": "Panagram in alphabet other than ASCII",
-         "input": "Широкая электрификация южных губерний даст мощный толчок подъёму сельского хозяйства.",
-         "expected": false
       }
    ]
 }

data/common/exercises/run-length-encoding/canonical-data.json

@@ -1,8 +1,28 @@
 {
    "#": [
-   	  "The tests deliberately check that single characters are encoded without count."
+      "The tests deliberately check that single characters are encoded without count."
    ],
    "cases": [
+      {
+        "description": "encode empty string",
+        "input": "",
+        "expected": ""
+      },
+      {
+        "description": "encode single characters only",
+        "input": "XYZ",
+        "expected": "XYZ"
+      },
+      {
+        "description": "decode empty string",
+        "input": "",
+        "expected": ""
+      },
+      {
+        "description": "decode single characters only",
+        "input": "XYZ",
+        "expected": "XYZ"
+      },
       {
          "description": "encode simple",
          "input": "AABBBCCCC",
@@ -27,16 +47,6 @@
         "description": "decode(encode(...)) combination",
         "input": "zzz ZZ  zZ",
         "expected": "zzz ZZ  zZ"
-      },
-      {
-        "description": "encode unicode",
-        "input": "⏰⚽⚽⚽⭐⭐⏰",
-        "expected": "⏰3⚽2⭐⏰"
-      },
-      {
-        "description": "decode unicode",
-        "input": "⏰3⚽2⭐⏰",
-        "expected": "⏰⚽⚽⚽⭐⭐⏰"
       }
    ]
 }

data/lib/trackler/version.rb

@@ -1,3 +1,3 @@
 module Trackler
-  VERSION = "2.0.0.2"
+  VERSION = "2.0.0.3"
 end

data/tracks/bash/SETUP.md

@@ -1,40 +1,3 @@
-# Welcome to Bash!
+Run the tests with:
 
-Unlike many other languages here, bash is a bit of a special snowflake.
-If you are on a Mac or other unix-y platform, you almost definitely
-already have bash. In fact, anything you type into the terminal is
-likely going through bash.
-
-The downside to this is that there isn't much of a development
-ecosystem around bash like there is for other languages, and there are
-multiple verions of bash that can be frustratingly incompatible. Luckily
-we shouldn't hit those differences for these basic examples, and if you
-can get the tests to pass on your machine, we are doing great.
-
-## Installation
-
-As I said above, if you are on a unix-like OS (Mac OS X, Linux, Solaris,
-etc), you probably already have bash.
-
-## Testing
-
-As there isn't much of a bash ecosystem, there also isn't really a de
-facto leader in the bash testing area. For these examples we are using
-[bats](https://github.com/sstephenson/bats). You should be able to
-install it from your favorite package manager, on OS X with homebrew
-this would look something like this:
-
-```
-$ brew install bats
-==> Downloading
-https://github.com/sstephenson/bats/archive/v0.4.0.tar.gz
-==> Downloading from
-https://codeload.github.com/sstephenson/bats/tar.gz/v0.4.0
-########################################################################
-100.0%
-==> ./install.sh /opt/boxen/homebrew/Cellar/bats/0.4.0
-🍺  /opt/boxen/homebrew/Cellar/bats/0.4.0: 10 files, 60K, built in 2
-seconds
-```
-
-Run the tests with `bats whatever_test.sh`.
+    bats whatever_test.sh

data/tracks/bash/config.json

@@ -4,15 +4,6 @@
   "repository": "https://github.com/exercism/xbash",
   "checklist_issue": 4,
   "active": false,
-  "problems": [
-    "hello-world",
-    "gigasecond",
-    "leap",
-    "hamming",
-    "rna-transcription",
-    "raindrops",
-    "bob"
-  ],
   "exercises": [
     {
       "slug": "hello-world" ,

data/tracks/bash/exercises/hello-world/HINTS.md

@@ -0,0 +1,38 @@
+# Welcome to Bash!
+
+Unlike many other languages here, bash is a bit of a special snowflake.
+If you are on a Mac or other unix-y platform, you almost definitely
+already have bash. In fact, anything you type into the terminal is
+likely going through bash.
+
+The downside to this is that there isn't much of a development
+ecosystem around bash like there is for other languages, and there are
+multiple verions of bash that can be frustratingly incompatible. Luckily
+we shouldn't hit those differences for these basic examples, and if you
+can get the tests to pass on your machine, we are doing great.
+
+## Installation
+
+As I said above, if you are on a unix-like OS (Mac OS X, Linux, Solaris,
+etc), you probably already have bash.
+
+## Testing
+
+As there isn't much of a bash ecosystem, there also isn't really a de
+facto leader in the bash testing area. For these examples we are using
+[bats](https://github.com/sstephenson/bats). You should be able to
+install it from your favorite package manager, on OS X with homebrew
+this would look something like this:
+
+```
+$ brew install bats
+==> Downloading
+https://github.com/sstephenson/bats/archive/v0.4.0.tar.gz
+==> Downloading from
+https://codeload.github.com/sstephenson/bats/tar.gz/v0.4.0
+########################################################################
+100.0%
+==> ./install.sh /opt/boxen/homebrew/Cellar/bats/0.4.0
+🍺  /opt/boxen/homebrew/Cellar/bats/0.4.0: 10 files, 60K, built in 2
+seconds
+```

data/tracks/bash/exercises/hello-world/hello_world_test.sh

@@ -18,17 +18,3 @@
   [ "$status" -eq 0 ]
   [ "$output" = "Hello, Bob!" ]
 }
-
-@test 'When given an empty string it should have a space and punctuation, though admittedly this is strange.' {
-  run bash hello_world.sh ""
-
-  [ "$status" -eq 0 ]
-  [ "$output" = "Hello, !" ]
-}
-
-@test 'When given "Alice and Bob" it greets them both' {
-  run bash hello_world.sh Alice and Bob
-
-  [ "$status" -eq 0 ]
-  [ "$output" = "Hello, Alice and Bob!" ]
-}

data/tracks/haskell/.travis.yml

@@ -52,18 +52,7 @@ script:
     for exercise in ${TRAVIS_BUILD_DIR}/exercises/* ; do
         pushd ${exercise}
 
-        if [ -f src/Example.hs ]; then
-            # `stack --work-dir` fails if not targeting a subdirectory, so we just
-            # symbolic-link `.stack-work` to a subfolder in the cache directory.
-            mkdir -p "${HOME}/.foldercache/${exercise}/.stack-work"
-            ln -f -s "${HOME}/.foldercache/${exercise}/.stack-work"
-
-            # Here we prepare the exercise to be tested by Stack.
-            MODULE=`sed -n 's/ *module \+\([a-zA-Z0-9]\+\).*/\1/p' src/Example.hs`
-            mv src/Example.hs "src/${MODULE}.hs"
-
-            test_exercise
-        elif ! stat -t examples/*/ > /dev/null 2>&1; then
+        if ! stat -t examples/*/ > /dev/null 2>&1; then
             echo "No examples for ${exercise}!"
             exit 1
         else
@@ -74,7 +63,7 @@ script:
 
                 echo "testing ${example}"
                 rm -f src/*.hs
-                mv ${example}/*.hs src
+                mv ${example}/src/*.hs src
                 mv ${example}/package.yaml .
 
                 test_exercise

data/tracks/haskell/README.md

@@ -22,8 +22,9 @@ All exercises have the following structure:
 resolver for all the exercises.
 - `package.yaml` is a file in the [hpack](https://github.com/sol/hpack#readme)
 format that has all dependencies and build instructions for an exercise.
-- `src/Example.hs` is a sample solution passing the tests.
 - `src/ModuleName.hs` is a *stub solution*.
+- `src/examples/success-foo/package.yaml` has dependencies for the example solution named `foo`.
+- `src/examples/success-foo/src/ModuleName.hs` is the source code of the sample solution.
 - `test/Tests.hs` is the test suite.
 - `HINTS.md` is an optional file containing instructions and/or hints.
 

data/tracks/haskell/config.json

@@ -370,6 +370,12 @@
       "topics": [
       ]
     },
+    {
+      "slug": "alphametics",
+      "difficulty": 7,
+      "topics": [
+      ]
+    },
     {
       "slug": "connect",
       "difficulty": 8,

data/tracks/haskell/exercises/accumulate/examples/success-standard/package.yaml

@@ -0,0 +1,16 @@
+name: accumulate
+
+dependencies:
+  - base
+
+library:
+  exposed-modules: Accumulate
+  source-dirs: src
+
+tests:
+  test:
+    main: Tests.hs
+    source-dirs: test
+    dependencies:
+      - accumulate
+      - hspec

data/tracks/haskell/exercises/all-your-base/examples/success-standard/package.yaml

@@ -0,0 +1,16 @@
+name: all-your-base
+
+dependencies:
+  - base
+
+library:
+  exposed-modules: Base
+  source-dirs: src
+
+tests:
+  test:
+    main: Tests.hs
+    source-dirs: test
+    dependencies:
+      - all-your-base
+      - hspec

data/tracks/haskell/exercises/allergies/examples/success-standard/package.yaml

@@ -0,0 +1,16 @@
+name: allergies
+
+dependencies:
+  - base
+
+library:
+  exposed-modules: Allergies
+  source-dirs: src
+
+tests:
+  test:
+    main: Tests.hs
+    source-dirs: test
+    dependencies:
+      - allergies
+      - hspec

data/tracks/haskell/exercises/alphametics/HINTS.md

@@ -0,0 +1,5 @@
+## Hints
+
+You can solve this exercise with a brute force algorithm, but this will possibly have a poor runtime performance.
+Try to find a more sophisticated solution. Hint: You could try the column-wise addition algorithm that is usually taught in high school.
+

data/tracks/haskell/exercises/alphametics/examples/success-standard/package.yaml

@@ -0,0 +1,18 @@
+name: alphametics
+
+dependencies:
+  - base
+
+library:
+  exposed-modules: Alphametics
+  source-dirs: src
+  dependencies:
+    - parsec
+
+tests:
+  test:
+    main: Tests.hs
+    source-dirs: test
+    dependencies:
+      - alphametics
+      - hspec

data/tracks/haskell/exercises/alphametics/examples/success-standard/src/Alphametics.hs

@@ -0,0 +1,116 @@
+{-# LANGUAGE GADTs #-}
+module Alphametics (solve) where
+
+import Control.Monad (guard)
+import Data.List (foldl', find, union)
+import Data.Maybe (fromJust, isJust, listToMaybe)
+import Prelude hiding (Word)
+import Text.Parsec
+import Text.Parsec.String
+
+type Solution = [(Char, Int)]
+
+solve :: String -> Maybe Solution
+solve puzzle = do
+  boolTerm' <- parseTerm puzzle
+  let columns = [0..maxLength boolTerm' - 1]
+      emptySolutions = [([], (0, 0))]
+      solutions = foldl' (flip $ partialSolutions boolTerm') emptySolutions columns
+  fst <$> listToMaybe solutions
+
+parseTerm :: String -> Maybe (Term Bool)
+parseTerm str = either (const Nothing) Just parseResult
+  where parseResult = parse boolTerm "boolTerm" str
+
+type PartialResult = (Integer, Integer) -- (result, carry)
+type PartialSolution = (Solution, PartialResult)
+
+partialSolutions :: Term a -> Int -> [PartialSolution] -> [PartialSolution]
+partialSolutions (Word xs) col solutionsSoFar
+  | col >= length xs = solutionsSoFar -- pass, no more constraints from this word
+  | otherwise = mergePartialSolutions takeChar charSolutions solutionsSoFar
+  where
+    charSolutions = toCharSolution <$> [if firstChar then 1 else 0..9]
+    char' = reverse xs !! col  -- process from the right
+    firstChar = head xs == char'
+    toCharSolution x = ([(char', x)], (toInteger x, 0))
+    takeChar (x, _) (_, y) = Just (x, y)
+partialSolutions (Plus left right) col solutionsSoFar =
+  mergePartialSolutions addResults leftSolutions rightSolutions
+  where
+    leftSolutions = partialSolutions left col solutionsSoFar
+    rightSolutions = partialSolutions right col solutionsSoFar
+    addResults (x1, x2) (y1, _) = Just (x1 + y1, x2)
+partialSolutions (Equals left right) col solutionsSoFar =
+  mergePartialSolutions equateResults leftSolutions rightSolutions
+  where
+    equateResults (leftResult, leftCarry) (rightResult, _)
+      | rightResult == requiredResult = Just (0, carry)
+      | otherwise = Nothing
+      where (carry, requiredResult) = (leftResult + leftCarry) `divMod` 10
+    leftSolutions = partialSolutions left col solutionsSoFar
+    rightSolutions = partialSolutions right col solutionsSoFar
+
+mergePartialSolutions :: (PartialResult -> PartialResult -> Maybe PartialResult) ->
+  [PartialSolution] -> [PartialSolution] -> [PartialSolution]
+mergePartialSolutions mergeResults xs ys = do
+  (xSolution, xResult) <- xs
+  (ySolution, yResult) <- ys
+  let mergedSolution = mergeSolutions xSolution ySolution
+  guard $ (not . null) mergedSolution
+  let mergedResult = mergeResults xResult yResult
+  guard $ isJust mergedResult
+  return (mergedSolution, fromJust mergedResult)
+  where
+    mergeSolutions :: Solution -> Solution -> Solution
+    mergeSolutions s1 s2
+      | any conflict s1 = []
+      | otherwise       = s1 `union` s2
+      where
+        conflict (k1, v1) =
+          maybe False (/= v1) (lookup k1 s2) ||
+          maybe False ((/= k1) . fst) (find ((== v1) . snd) s2)
+
+data Term a where
+  Word :: String -> Term Integer
+  Equals :: (Eq a) => Term a -> Term a -> Term Bool
+  Plus :: Term Integer -> Term Integer -> Term Integer
+
+maxLength :: Term a -> Int
+maxLength (Word xs) = length xs
+maxLength (Equals l r) = max (maxLength l) (maxLength r)
+maxLength (Plus   l r) = max (maxLength l) (maxLength r)
+
+-- Term Parser
+boolTerm :: Parser (Term Bool)
+boolTerm = do
+  left  <- integerTerm
+  _     <- trimmed (string "==")
+  right <- integerTerm
+  return $ Equals left right
+
+integerTerm :: Parser (Term Integer)
+integerTerm = try integerOperation <|> simpleIntegerTerm
+
+integerOperation :: Parser (Term Integer)
+integerOperation = do
+  left  <- simpleIntegerTerm
+  op    <- integerOperator
+  right <- integerTerm
+  return $ op left right
+
+simpleIntegerTerm :: Parser (Term Integer)
+simpleIntegerTerm = word
+
+integerOperator :: Parser (Term Integer -> Term Integer -> Term Integer)
+integerOperator = plus
+
+word :: Parser (Term Integer)
+word = Word <$> many1 upper
+
+plus :: Parser (Term Integer -> Term Integer -> Term Integer)
+plus = trimmed (char '+') *> pure Plus
+
+trimmed :: Parser a -> Parser a
+trimmed p = spaces *> p <* spaces
+