trackler 2.0.7.0 → 2.0.8.1

data/tracks/java/exercises/palindrome-products/src/example/java/Palindromes.java

@@ -1,77 +1,43 @@
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.SortedMap;
-import java.util.TreeMap;
+import java.util.*;
 
 public class Palindromes {
 
-    public static class PalindromeSortedSetBuilder {
-
-        private int minFactor = 1;
-        private int maxFactor = 1;
-
-        public PalindromeSortedSetBuilder() {
-        }
-
-        public PalindromeSortedSetBuilder withFactorsLessThanOrEqualTo(
-                final int maxFactor) {
-            this.maxFactor = maxFactor;
-            return this;
-        }
-
-        public PalindromeSortedSetBuilder withFactorsGreaterThanOrEqualTo(
-                final int minFactor) {
-            this.minFactor = minFactor;
-            return this;
-        }
-
-        public SortedMap<Long, List<List<Integer>>> build() {
-            SortedMap<Long, List<List<Integer>>> palindromes = new TreeMap<>();
-            long num;
-            List<List<Integer>> factors;
-            for (int i = this.maxFactor; i >= this.minFactor; i--) {
-                for (int j = this.maxFactor; j >= i; j--) {
-                    num = i * j;
-                    if (isPalindrome(num)) {
-                        factors = palindromes.get(num);
-                        if (factors == null) {
-                            factors = new ArrayList<>();
-                        }
-                        factors.add(Arrays.asList(i, j));
-                        palindromes.put(num, factors);
+    public static SortedMap<Long, List<List<Integer>>> getPalindromeProductsWithFactors(int minFactor, int maxFactor) {
+        SortedMap<Long, List<List<Integer>>> palindromeSortedList = new TreeMap<>();
+        long num;
+        List<List<Integer>> factors;
+        for (int i = maxFactor; i >= minFactor; i--) {
+            for (int j = maxFactor; j >= i; j--) {
+                num = i * j;
+                if (isPalindrome(num)) {
+                    factors = palindromeSortedList.get(num);
+                    if (factors == null) {
+                        factors = new ArrayList<>();
                     }
+                    factors.add(Arrays.asList(i, j));
+                    palindromeSortedList.put(num, factors);
                 }
             }
-            return Collections.unmodifiableSortedMap(palindromes);
         }
+        return Collections.unmodifiableSortedMap(palindromeSortedList);
+    }
 
-        // http://stackoverflow.com/questions/23984654/how-to-print-all-palindromes-upto-1000-without-using-any-string-stringbuilder
-        private long reverseNumber(long number) {
-            if (number < 10l) {
-                return number;
-            }
-            long result = 0;
-            long tmp = number;
-            while (tmp > 0) {
-                result = result * 10 + (tmp % 10);
-                tmp /= 10;
-
-            }
-            return result;
+    // http://stackoverflow.com/questions/23984654/how-to-print-all-palindromes-upto-1000-without-using-any-string-stringbuilder
+    private static long reverseNumber(long number) {
+        if (number < 10l) {
+            return number;
         }
+        long result = 0;
+        long tmp = number;
+        while (tmp > 0) {
+            result = result * 10 + (tmp % 10);
+            tmp /= 10;
 
-        private boolean isPalindrome(long number) {
-            return number == reverseNumber(number);
         }
+        return result;
     }
 
-    private Palindromes() {
-    }
-
-    public static PalindromeSortedSetBuilder getPalindromeSortedListBuilder() {
-        return new PalindromeSortedSetBuilder();
+    private static boolean isPalindrome(long number) {
+        return number == reverseNumber(number);
     }
 }

data/tracks/java/exercises/palindrome-products/src/test/java/PalindromesTest.java

@@ -1,14 +1,13 @@
+import org.junit.Ignore;
+import org.junit.Test;
 
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.SortedMap;
 import java.util.stream.Collectors;
-import static junit.framework.TestCase.assertEquals;
-import static junit.framework.TestCase.assertFalse;
-import static junit.framework.TestCase.assertNotNull;
-import org.junit.Ignore;
-import org.junit.Test;
+
+import static junit.framework.TestCase.*;
 
 public class PalindromesTest {
 
@@ -22,22 +21,9 @@ public class PalindromesTest {
         );
         final long expectedValue = 9l;
 
-        final SortedMap<Long, List<List<Integer>>> palindromes
-                = Palindromes.getPalindromeSortedListBuilder()
-                        .withFactorsLessThanOrEqualTo(9).build();
-
-        assertNotNull(palindromes);
-        assertFalse(palindromes.isEmpty());
-
-        long actualValue = palindromes.lastKey();
-        assertEquals(expectedValue, actualValue);
+        final SortedMap<Long, List<List<Integer>>> palindromes = Palindromes.getPalindromeProductsWithFactors(1, 9);
 
-        List<List<Integer>> actual = palindromes
-                .get(palindromes.lastKey())
-                .stream()
-                .sorted((a, b) -> Integer.compare(a.get(0), b.get(0)))
-                .collect(Collectors.toList());
-        assertEquals(expected, actual);
+        checkPalindromeWithFactorsMatchesExpected(expected, expectedValue, palindromes, palindromes.lastKey());
     }
 
     @Test
@@ -50,24 +36,9 @@ public class PalindromesTest {
         );
         final long expectedValue = 9009l;
 
-        final SortedMap<Long, List<List<Integer>>> palindromes
-                = Palindromes.getPalindromeSortedListBuilder()
-                        .withFactorsLessThanOrEqualTo(99)
-                        .withFactorsGreaterThanOrEqualTo(10)
-                        .build();
-
-        assertNotNull(palindromes);
-        assertFalse(palindromes.isEmpty());
+        final SortedMap<Long, List<List<Integer>>> palindromes = Palindromes.getPalindromeProductsWithFactors(10, 99);
 
-        long actualValue = palindromes.lastKey();
-        assertEquals(expectedValue, actualValue);
-
-        List<List<Integer>> actual = palindromes
-                .get(palindromes.lastKey())
-                .stream()
-                .sorted((a, b) -> Integer.compare(a.get(0), b.get(0)))
-                .collect(Collectors.toList());
-        assertEquals(expected, actual);
+        checkPalindromeWithFactorsMatchesExpected(expected, expectedValue, palindromes, palindromes.lastKey());
     }
 
     @Test
@@ -80,24 +51,9 @@ public class PalindromesTest {
         );
         final long expectedValue = 121l;
 
-        final SortedMap<Long, List<List<Integer>>> palindromes
-                = Palindromes.getPalindromeSortedListBuilder()
-                        .withFactorsLessThanOrEqualTo(99)
-                        .withFactorsGreaterThanOrEqualTo(10)
-                        .build();
-
-        assertNotNull(palindromes);
-        assertFalse(palindromes.isEmpty());
+        final SortedMap<Long, List<List<Integer>>> palindromes = Palindromes.getPalindromeProductsWithFactors(10, 99);
 
-        long actualValue = palindromes.firstKey();
-        assertEquals(expectedValue, actualValue);
-
-        List<List<Integer>> actual = palindromes
-                .get(palindromes.firstKey())
-                .stream()
-                .sorted((a, b) -> Integer.compare(a.get(0), b.get(0)))
-                .collect(Collectors.toList());
-        assertEquals(expected, actual);
+        checkPalindromeWithFactorsMatchesExpected(expected, expectedValue, palindromes, palindromes.firstKey());
     }
 
     @Test
@@ -110,24 +66,9 @@ public class PalindromesTest {
         );
         final long expectedValue = 906609l;
 
-        final SortedMap<Long, List<List<Integer>>> palindromes
-                = Palindromes.getPalindromeSortedListBuilder()
-                        .withFactorsLessThanOrEqualTo(999)
-                        .withFactorsGreaterThanOrEqualTo(100)
-                        .build();
-
-        assertNotNull(palindromes);
-        assertFalse(palindromes.isEmpty());
+        final SortedMap<Long, List<List<Integer>>> palindromes = Palindromes.getPalindromeProductsWithFactors(100, 999);
 
-        long actualValue = palindromes.lastKey();
-        assertEquals(expectedValue, actualValue);
-
-        List<List<Integer>> actual = palindromes
-                .get(palindromes.lastKey())
-                .stream()
-                .sorted((a, b) -> Integer.compare(a.get(0), b.get(0)))
-                .collect(Collectors.toList());
-        assertEquals(expected, actual);
+        checkPalindromeWithFactorsMatchesExpected(expected, expectedValue, palindromes, palindromes.lastKey());
     }
 
     @Test
@@ -140,23 +81,25 @@ public class PalindromesTest {
         );
         final long expectedValue = 10201l;
 
-        final SortedMap<Long, List<List<Integer>>> palindromes
-                = Palindromes.getPalindromeSortedListBuilder()
-                        .withFactorsLessThanOrEqualTo(999)
-                        .withFactorsGreaterThanOrEqualTo(100)
-                        .build();
+        final SortedMap<Long, List<List<Integer>>> palindromes = Palindromes.getPalindromeProductsWithFactors(100, 999);
+
+        checkPalindromeWithFactorsMatchesExpected(expected, expectedValue, palindromes, palindromes.firstKey());
+    }
 
-        assertNotNull(palindromes);
-        assertFalse(palindromes.isEmpty());
+    private void checkPalindromeWithFactorsMatchesExpected(List<List<Integer>> expectedPalindromeFactors,
+                                                           long expectedValueOfPalindrome,
+                                                           SortedMap<Long, List<List<Integer>>> actualPalindromes,
+                                                           long actualValueOfPalindrome) {
+        assertNotNull(actualPalindromes);
+        assertFalse(actualPalindromes.isEmpty());
 
-        long actualValue = palindromes.firstKey();
-        assertEquals(expectedValue, actualValue);
+        assertEquals(expectedValueOfPalindrome, actualValueOfPalindrome);
 
-        List<List<Integer>> actual = palindromes
-                .get(palindromes.firstKey())
+        List<List<Integer>> actualPalindromeFactors = actualPalindromes
+                .get(actualValueOfPalindrome)
                 .stream()
                 .sorted((a, b) -> Integer.compare(a.get(0), b.get(0)))
                 .collect(Collectors.toList());
-        assertEquals(expected, actual);
+        assertEquals(expectedPalindromeFactors, actualPalindromeFactors);
     }
 }

data/tracks/java/exercises/settings.gradle

@@ -25,6 +25,7 @@ include 'hexadecimal'
 include 'hello-world'
 include 'largest-series-product'
 include 'linked-list'
+include 'list-ops'
 include 'luhn'
 include 'matrix'
 include 'meetup'

data/tracks/julia/config.json

@@ -8,8 +8,7 @@
       "slug": "hello-world",
       "difficulty": 1,
       "topics": [
-        "strings",
-        "string interpolation"
+        "strings"
       ]
     },
     {

data/tracks/julia/exercises/hello-world/example.jl

@@ -1,3 +1,3 @@
-function hello(name::AbstractString="World")
-    return "Hello, $(name)!"
+function hello()
+    return "Hello, World!"
 end

data/tracks/julia/exercises/hello-world/runtests.jl

@@ -2,11 +2,6 @@ using Base.Test
 
 include("hello-world.jl")
 
-@testset "no name" begin
+@testset "Say Hi!" begin
     @test hello() == "Hello, World!"
 end
-
-@testset "names" begin
-    @test hello("Alice") == "Hello, Alice!"
-    @test hello("Bob") == "Hello, Bob!"
-end

data/tracks/lua/exercises/TRACK_HINTS.md

@@ -0,0 +1,8 @@
+## Running the tests
+
+To run the tests, run the command `busted .` from within the exercise directory.
+
+## Further information
+
+For more detailed information about the Lua track, including how to get help if
+you're having trouble, please visit the exercism.io [Lua language page](http://exercism.io/languages/lua/about).

data/tracks/lua/exercises/hello-world/example.lua

@@ -1,8 +1,7 @@
 local hello_world = {}
 
-function hello_world.hello( name )
-  if not name or name == '' then name = 'world' end
-  return 'Hello, ' .. name .. '!'
+function hello_world.hello()
+  return 'Hello, World!'
 end
 
 return hello_world

data/tracks/lua/exercises/hello-world/hello-world.lua

@@ -0,0 +1,18 @@
+-- This is a "stub" file.  It's a little start on your solution.
+-- It's not a complete solution though; you have to write some code.
+
+-- Table to be returned by the hello-world module.
+local hello_world = {}
+
+-- Add the hello() function to the table returned by this module.
+function hello_world.hello()
+  -- Write some code here to pass the test suite.
+
+  -- When you have a working solution, REMOVE ALL THE STOCK COMMENTS.
+  -- They're here to help you get started but they only clutter a finished solution.
+  -- If you leave them in, reviewers will protest!
+  return ''
+end
+
+-- Return the hello_world table to make it accessible as a module.
+return hello_world

data/tracks/lua/exercises/hello-world/hello-world_spec.lua

@@ -1,18 +1,12 @@
+-- Require the hello-world module
 local hello_world = require('hello-world')
 
+-- Define a module named hello-world. This module should return a single
+-- function named hello that takes no arguments and returns a string.
+
 describe('hello-world', function()
-  it('says hello world with no name', function()
+  it('says hello world', function()
     local result = hello_world.hello()
-    assert.are.equal('Hello, world!', result)
-  end)
-
-  it('says hello to Bob', function()
-    local result = hello_world.hello('Bob')
-    assert.are.equal('Hello, Bob!', result)
-  end)
-
-  it('says hello to Sally', function()
-    local result = hello_world.hello('Sally')
-    assert.are.equal('Hello, Sally!', result)
+    assert.are.equal('Hello, World!', result)
   end)
 end)

data/tracks/ocaml/exercises/phone-number/example.ml

@@ -1,21 +1,11 @@
 open Core.Std
 
 let number s =
-  let s' = String.filter ~f:Char.is_digit s in
-  match String.length s' with
-  | 10                            -> Some s'
-  | 11 when String.get s' 0 = '1' -> Some (String.drop_prefix s' 1)
-  | _                             -> None
-
-let split_number s =
-  (String.slice s 0 3, String.slice s 3 6, String.slice s 6 10)
-
-let area_code s = 
-  let open Option in (* >>| for Option *)
-  number s >>| split_number >>| (fun (area, _, _) -> area)
-
-let pretty s =
-  let open Option in
-  number s
-  >>| split_number
-  >>| fun (area, exch, subscr) -> sprintf "(%s) %s-%s" area exch subscr
+  if not @@ String.is_empty (String.filter ~f:(Char.is_alpha) s)
+  then None
+  else
+    let s = String.filter ~f:(Char.is_digit) s in
+    match String.length s with
+    | 10                            -> Some s
+    | 11 when String.get s 0 = '1'  -> Some (String.drop_prefix s 1)
+    | _                             -> None

data/tracks/ocaml/exercises/phone-number/phone_number.mli

@@ -1,8 +1,2 @@
 (** Extract the digits from a valid phone number. *)
-val number : string -> string option
-
-(** Extract the area code from a valid phone number. *)
-val area_code : string -> string option
-
-(** Pretty print a valid phone number. *)
-val pretty : string -> string option
+val number : string -> string option

data/tracks/ocaml/exercises/phone-number/test.ml

@@ -1,5 +1,6 @@
 open Core.Std
 open OUnit2
+open Phone_number
 
 let option_to_string f = function
   | None   -> "None"
@@ -8,28 +9,28 @@ let option_to_string f = function
 let ae exp got _test_ctxt =
   assert_equal ~printer:(option_to_string String.to_string) exp got
 
-let tests =
-  ["cleans number">::
-     ae (Some "1234567890") (Phone_number.number "(123) 456-7890");
-   "cleans number with dots">::
-     ae (Some "1234567890") (Phone_number.number "123.456.7890");
-   "valid when 11 digits and first is 1">::
-     ae (Some "1234567890") (Phone_number.number "11234567890");
-   "invalid when 11 digits">::
-     ae None (Phone_number.number "21234567890");
-   "invalid when 9 digits">::
-     ae None (Phone_number.number "123456789");
-   "area code">::
-     ae (Some "123") (Phone_number.area_code "1234567890");
-   "area code of invalid number">::
-     ae None (Phone_number.area_code "1234567890123");
-   "pretty print">::
-     ae (Some "(123) 456-7890") (Phone_number.pretty "1234567890");
-   "pretty print with full us phone number">::
-     ae (Some "(123) 456-7890") (Phone_number.pretty "11234567890");
-   "pretty print invalid number">::
-     ae None (Phone_number.pretty "123456789");
-  ]
+let number_tests = [
+   "cleans the number" >::
+      ae (Some "1234567890") (number "(123) 456-7890");
+   "cleans numbers with dots" >::
+      ae (Some "1234567890") (number "123.456.7890");
+   "cleans numbers with multiple spaces" >::
+      ae (Some "1234567890") (number "123 456   7890   ");
+   "invalid when 9 digits" >::
+      ae None (number "123456789");
+   "invalid when 11 digits" >::
+      ae None (number "21234567890");
+   "valid when 11 digits and starting with 1" >::
+      ae (Some "1234567890") (number "11234567890");
+   "invalid when 12 digits" >::
+      ae None (number "321234567890");
+   "invalid with letters" >::
+      ae None (number "123-abc-7890");
+   "invalid with punctuations" >::
+      ae None (number "123-@:!-7890");
+   "invalid with right number of digits but letters mixed in" >::
+      ae None (number "1a2b3c4d5e6f7g8h9i0j");
+]
 
 let () =
-  run_test_tt_main ("phone-number tests" >::: tests)
+  run_test_tt_main ("phone-number tests" >::: number_tests)