trackler 2.0.8.49 → 2.0.8.50

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48201089c77e7b81845af6440956854c37235757
-  data.tar.gz: c8df11ee44d68548e4dc45916eb772d42db76d18
+  metadata.gz: 2b20ae176f6c856990f4e8c19aba7f9a57413eb0
+  data.tar.gz: 9caaf6ade8db9ed4f780f70fe1f00bd7d3db67fd
 SHA512:
-  metadata.gz: 8c8ee5ad1aa4951cc1960e272f54ee5928757809050c731a15c4c68c76031b1ec7410315dd58479dea955c5f889fdcfd9cf2bcb35c3676c912df549b317cd59f
-  data.tar.gz: 8871ec457aebdc4366e1c910a2a2fdf95a44e309d32ea9d113435f3d5f23f2c5d2e9913e19708dd13f72460d5163a6f45f3682f89ecaea041fb4bef555c6d159
+  metadata.gz: 72764fd62759d31ac5d878b4018ffb622f498301c619a63a7d8969bbc01508197639bc5c2e9ee7f09118b8d254f63ad777109a7f8094f4f8c5a421c6b2ba2862
+  data.tar.gz: ea4f65efe06b9679130b05197cd1e0f32c09c4f764b487693321ce9d9a999a4ea461c22d3d18cd90b88186761adcd53f0c0c77836e1aa2564ef674b7c08e8650

data/lib/trackler/version.rb

@@ -1,3 +1,3 @@
 module Trackler
-  VERSION = "2.0.8.49"
+  VERSION = "2.0.8.50"
 end

data/tracks/java/.github/stale.yml

@@ -0,0 +1,8 @@
+# Issues or Pull Requests with these labels will never be considered stale
+exemptLabels:
+  - "first-timers only"
+  - "good first patch"
+  - "policy"
+
+# Label to use when marking as stale
+staleLabel: stale

data/tracks/java/exercises/book-store/src/example/java/Bookstore.java

@@ -1,61 +1,57 @@
-import java.awt.print.Printable;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
-public class Bookstore{
+class Bookstore {
 
-	private static int BOOK_PRICE = 8, MAX_GROUP_SIZE = 5;
-	private List<Integer> books;
-	private static double[] DISCOUNT_TIERS = {0,5,10,20,25};   	
+  private static final int BOOK_PRICE = 8, MAX_GROUP_SIZE = 5;
 
-	public Bookstore (List<Integer> books){
-		this.books = books;
-	}	
-	
+  private static double[] DISCOUNT_TIERS = {0, 5, 10, 20, 25};
 
+  private List<Integer> books;
 
+  Bookstore(List<Integer> books) {
+    this.books = books;
+  }
 
-	public double calculateTotalCost(){
-		return calculateTotalCost(this.books,0);
-	}
+  double calculateTotalCost() {
+    return calculateTotalCost(this.books, 0);
+  }
 
-	private double calculateTotalCost (List<Integer> books,double priceSoFar ){
-		double minPrice = Double.MAX_VALUE;
+  private double calculateTotalCost(List<Integer> books, double priceSoFar) {
+    if (books.size() == 0) {
+      return priceSoFar;
+    }
 
+    List<Integer> availableBookNumbers = books.stream()
+        .distinct()
+        .collect(Collectors.toList());
 
-		if(books.size() == 0){
-			return priceSoFar;
-		}
+    double minPrice = Double.MAX_VALUE;
 
-		List<Integer> groups = (ArrayList<Integer>) books.stream().distinct().collect(Collectors.toList());
+    for (int i = 0; i < availableBookNumbers.size(); i++) {
+      List<Integer> newGroupBooks = new ArrayList<>(availableBookNumbers.subList(0, i + 1));
+      List<Integer> remainingBooks = new ArrayList<>(books);
 
-		
-		double price = 0;
+      for (final Integer newGroupBook : newGroupBooks) {
+        //noinspection UseBulkOperation - we want to remove _one_ of each book number, not _all_ of each book number.
+        remainingBooks.remove(newGroupBook);
+      }
 
-		for(int i = 0;i<groups.size();i++){
-			books.remove(groups.get(i));	
-		}
-				
-		try {
-			price = calculateTotalCost(books,priceSoFar + costPerGroup(groups.size()));
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		
-		minPrice = Math.min(minPrice, price);
-		return minPrice;
+      double price = calculateTotalCost(remainingBooks, priceSoFar + costOfGroupSize(newGroupBooks.size()));
 
+      minPrice = Math.min(minPrice, price);
+    }
 
-	}
+    return minPrice;
+  }
 
-	private double costPerGroup(int groupSize) throws Exception{
-		if (groupSize < 1 || groupSize > MAX_GROUP_SIZE){
-        		throw new Exception("Invalid group size : " + groupSize );
-     		}
-    		return BOOK_PRICE * groupSize * (100 - DISCOUNT_TIERS[groupSize-1])/100;
-	}
+  private double costOfGroupSize(int groupSize) {
+    if (groupSize < 1 || groupSize > MAX_GROUP_SIZE) {
+      throw new IllegalStateException("Invalid group size : " + groupSize);
+    }
 
+    return BOOK_PRICE * groupSize * (100 - DISCOUNT_TIERS[groupSize - 1]) / 100;
+  }
 
 }

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

@@ -1,5 +1,6 @@
 import static org.junit.Assert.assertEquals;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -7,112 +8,112 @@ import java.util.Arrays;
 import org.junit.Ignore;
 import org.junit.Test;
 
-public class BookstoreTest{
-
-	@Test
-	public void onlyASingleBook(){
-		List<Integer> books = new ArrayList<>(Arrays.asList(1));
-		Bookstore bookstore = new Bookstore(books);
-		assertEquals(8,bookstore.calculateTotalCost(),2);
-	}
-	
-	@Ignore
-	@Test
-	public void twoOfSameBook(){
-		List<Integer> books = new ArrayList<>(Arrays.asList(1,1));
-		Bookstore bookstore = new Bookstore(books);
-		assertEquals(16,bookstore.calculateTotalCost(),2);
-	}
-
-	@Ignore
-	@Test
-	public void emptyBasket(){
-		List<Integer> books = new ArrayList<>();
-		Bookstore bookstore = new Bookstore(books);
-		assertEquals(0,bookstore.calculateTotalCost(),2);
-	}
-
-	@Ignore
-	@Test
-	public void twoDifferentBooks(){
-		List<Integer> books = new ArrayList<>(Arrays.asList(1,2));
-		Bookstore bookstore = new Bookstore(books);
-		assertEquals(15.20,bookstore.calculateTotalCost(),2);
-	}
-
-	@Ignore
-	@Test
-	public void threeDifferentBooks(){
-		List<Integer> books = new ArrayList<>(Arrays.asList(1,2,3));
-		Bookstore bookstore = new Bookstore(books);
-		assertEquals(21.6,bookstore.calculateTotalCost(),2);
-	}
-
-	@Ignore
-	@Test
-	public void fourDifferentBooks(){
-		ArrayList<Integer> books = new ArrayList<>(Arrays.asList(1,2,3,4));
-		Bookstore bookstore = new Bookstore(books);
-		assertEquals(25.6,bookstore.calculateTotalCost(),2);
-
-	}
-
-	@Ignore
-	@Test
-	public void fiveDifferentBooks(){
-		ArrayList<Integer> books = new ArrayList<>(Arrays.asList(1,2,3,4,5));
-		Bookstore bookstore = new Bookstore(books);
-		assertEquals(30,bookstore.calculateTotalCost(),2);
-	}
-
-	@Ignore
-	@Test
-	public void twoGroupsOfFourIsCheaperThanGroupOfFivePlusGroupOfThree(){
-		List<Integer> books = new ArrayList<>(Arrays.asList(1,1,2,2,3,3,4,5));
-		Bookstore bookstore = new Bookstore(books);
-		assertEquals(51.20,bookstore.calculateTotalCost(),2);
-	}
-
-	@Ignore
-	@Test
-	public void groupOfFourPlusGroupOfTwoIsCheaperThanTwoGroupsOfThree(){
-		List<Integer> books = new ArrayList<>(Arrays.asList(1,1,2,2,3,4));
-		Bookstore bookstore = new Bookstore(books);
-		assertEquals(40.8,bookstore.calculateTotalCost(),2);
-	}
-
-	@Ignore
-	@Test
-	public void twoEachOfFirst4BooksAnd1CopyEachOfRest(){
-		Integer[] p = {1,1,2,2,3,3,4,4,5};
-		List<Integer> books = new ArrayList<>(Arrays.asList(1,1,2,2,3,3,4,4,5));
-		Bookstore bookstore = new Bookstore(books);
-		assertEquals(55.60,bookstore.calculateTotalCost(),2);
-	}
-
-	@Ignore
-	@Test
-	public void twoCopiesOfEachBook(){
-		List<Integer> books = new ArrayList<>(Arrays.asList(1,1,2,2,3,3,4,4,5,5));
-		Bookstore bookstore = new Bookstore(books);
-		assertEquals(60.00,bookstore.calculateTotalCost(),2);
-	}
-
-	@Ignore
-	@Test
-	public void threeCopiesOfFirstBookAnd2EachOfRemaining(){
-		List<Integer> books = new ArrayList<>(Arrays.asList(1,1,2,2,3,3,4,4,5,5,1));
-		Bookstore bookstore = new Bookstore(books);
-		assertEquals(68.00,bookstore.calculateTotalCost(),2);
-	}
-
-	@Ignore
-	@Test
-	public void threeEachOFirst2BooksAnd2EachOfRemainingBooks(){
-		List<Integer> books = new ArrayList<>(Arrays.asList(1,1,2,2,3,3,4,4,5,5,1,2));
-		Bookstore bookstore = new Bookstore(books);
-		assertEquals(75.20,bookstore.calculateTotalCost(),2);
-	}
+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;
+
+  @Test
+  public void onlyASingleBook() {
+    List<Integer> books = new ArrayList<>(Collections.singletonList(1));
+    Bookstore bookstore = new Bookstore(books);
+    assertEquals(8, bookstore.calculateTotalCost(), EQUALITY_TOLERANCE);
+  }
+
+  @Ignore
+  @Test
+  public void twoOfSameBook() {
+    List<Integer> books = new ArrayList<>(Arrays.asList(1, 1));
+    Bookstore bookstore = new Bookstore(books);
+    assertEquals(16, bookstore.calculateTotalCost(), EQUALITY_TOLERANCE);
+  }
+
+  @Ignore
+  @Test
+  public void emptyBasket() {
+    List<Integer> books = new ArrayList<>();
+    Bookstore bookstore = new Bookstore(books);
+    assertEquals(0, bookstore.calculateTotalCost(), EQUALITY_TOLERANCE);
+  }
+
+  @Ignore
+  @Test
+  public void twoDifferentBooks() {
+    List<Integer> books = new ArrayList<>(Arrays.asList(1, 2));
+    Bookstore bookstore = new Bookstore(books);
+    assertEquals(15.20, bookstore.calculateTotalCost(), EQUALITY_TOLERANCE);
+  }
+
+  @Ignore
+  @Test
+  public void threeDifferentBooks() {
+    List<Integer> books = new ArrayList<>(Arrays.asList(1, 2, 3));
+    Bookstore bookstore = new Bookstore(books);
+    assertEquals(21.6, bookstore.calculateTotalCost(), EQUALITY_TOLERANCE);
+  }
+
+  @Ignore
+  @Test
+  public void fourDifferentBooks() {
+    List<Integer> books = new ArrayList<>(Arrays.asList(1, 2, 3, 4));
+    Bookstore bookstore = new Bookstore(books);
+    assertEquals(25.6, bookstore.calculateTotalCost(), EQUALITY_TOLERANCE);
+  }
+
+  @Ignore
+  @Test
+  public void fiveDifferentBooks() {
+    List<Integer> books = new ArrayList<>(Arrays.asList(1, 2, 3, 4, 5));
+    Bookstore bookstore = new Bookstore(books);
+    assertEquals(30, bookstore.calculateTotalCost(), EQUALITY_TOLERANCE);
+  }
+
+  @Ignore
+  @Test
+  public void twoGroupsOfFourIsCheaperThanGroupOfFivePlusGroupOfThree() {
+    List<Integer> books = new ArrayList<>(Arrays.asList(1, 1, 2, 2, 3, 3, 4, 5));
+    Bookstore bookstore = new Bookstore(books);
+    assertEquals(51.20, bookstore.calculateTotalCost(), EQUALITY_TOLERANCE);
+  }
+
+  @Ignore
+  @Test
+  public void groupOfFourPlusGroupOfTwoIsCheaperThanTwoGroupsOfThree() {
+    List<Integer> books = new ArrayList<>(Arrays.asList(1, 1, 2, 2, 3, 4));
+    Bookstore bookstore = new Bookstore(books);
+    assertEquals(40.8, bookstore.calculateTotalCost(), EQUALITY_TOLERANCE);
+  }
+
+  @Ignore
+  @Test
+  public void twoEachOfFirst4BooksAnd1CopyEachOfRest() {
+    List<Integer> books = new ArrayList<>(Arrays.asList(1, 1, 2, 2, 3, 3, 4, 4, 5));
+    Bookstore bookstore = new Bookstore(books);
+    assertEquals(55.60, bookstore.calculateTotalCost(), EQUALITY_TOLERANCE);
+  }
+
+  @Ignore
+  @Test
+  public void twoCopiesOfEachBook() {
+    List<Integer> books = new ArrayList<>(Arrays.asList(1, 1, 2, 2, 3, 3, 4, 4, 5, 5));
+    Bookstore bookstore = new Bookstore(books);
+    assertEquals(60.00, bookstore.calculateTotalCost(), EQUALITY_TOLERANCE);
+  }
+
+  @Ignore
+  @Test
+  public void threeCopiesOfFirstBookAnd2EachOfRemaining() {
+    List<Integer> books = new ArrayList<>(Arrays.asList(1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 1));
+    Bookstore bookstore = new Bookstore(books);
+    assertEquals(68.00, bookstore.calculateTotalCost(), EQUALITY_TOLERANCE);
+  }
+
+  @Ignore
+  @Test
+  public void threeEachOFirst2BooksAnd2EachOfRemainingBooks() {
+    List<Integer> books = new ArrayList<>(Arrays.asList(1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 1, 2));
+    Bookstore bookstore = new Bookstore(books);
+    assertEquals(75.20, bookstore.calculateTotalCost(), EQUALITY_TOLERANCE);
+  }
 
 }
-

data/tracks/java/exercises/palindrome-products/src/example/java/{Palindromes.java → PalindromeCalculator.java}

@@ -1,8 +1,8 @@
 import java.util.*;
 
-public class Palindromes {
+public class PalindromeCalculator {
 
-    public static SortedMap<Long, List<List<Integer>>> getPalindromeProductsWithFactors(int minFactor, int maxFactor) {
+    public SortedMap<Long, List<List<Integer>>> getPalindromeProductsWithFactors(int minFactor, int maxFactor) {
         SortedMap<Long, List<List<Integer>>> palindromeSortedList = new TreeMap<>();
         long num;
         List<List<Integer>> factors;
@@ -23,7 +23,7 @@ public class Palindromes {
     }
 
     // http://stackoverflow.com/questions/23984654/how-to-print-all-palindromes-upto-1000-without-using-any-string-stringbuilder
-    private static long reverseNumber(long number) {
+    private long reverseNumber(long number) {
         if (number < 10l) {
             return number;
         }
@@ -37,7 +37,7 @@ public class Palindromes {
         return result;
     }
 
-    private static boolean isPalindrome(long number) {
+    private boolean isPalindrome(long number) {
         return number == reverseNumber(number);
     }
 }

data/tracks/java/exercises/palindrome-products/src/test/java/{PalindromesTest.java → PalindromeCalculatorTest.java}

@@ -1,3 +1,4 @@
+import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
@@ -9,7 +10,13 @@ import java.util.stream.Collectors;
 
 import static junit.framework.TestCase.*;
 
-public class PalindromesTest {
+public class PalindromeCalculatorTest {
+    private PalindromeCalculator palindromeCalculator;
+
+    @Before
+    public void setup() {
+        palindromeCalculator = new PalindromeCalculator();
+    }
 
     @Test
     public void largestPalindromeFromSingleDigitFactors() {
@@ -21,7 +28,7 @@ public class PalindromesTest {
         );
         final long expectedValue = 9l;
 
-        final SortedMap<Long, List<List<Integer>>> palindromes = Palindromes.getPalindromeProductsWithFactors(1, 9);
+        final SortedMap<Long, List<List<Integer>>> palindromes = palindromeCalculator.getPalindromeProductsWithFactors(1, 9);
 
         checkPalindromeWithFactorsMatchesExpected(expected, expectedValue, palindromes, palindromes.lastKey());
     }
@@ -36,7 +43,7 @@ public class PalindromesTest {
         );
         final long expectedValue = 9009l;
 
-        final SortedMap<Long, List<List<Integer>>> palindromes = Palindromes.getPalindromeProductsWithFactors(10, 99);
+        final SortedMap<Long, List<List<Integer>>> palindromes = palindromeCalculator.getPalindromeProductsWithFactors(10, 99);
 
         checkPalindromeWithFactorsMatchesExpected(expected, expectedValue, palindromes, palindromes.lastKey());
     }
@@ -51,7 +58,7 @@ public class PalindromesTest {
         );
         final long expectedValue = 121l;
 
-        final SortedMap<Long, List<List<Integer>>> palindromes = Palindromes.getPalindromeProductsWithFactors(10, 99);
+        final SortedMap<Long, List<List<Integer>>> palindromes = palindromeCalculator.getPalindromeProductsWithFactors(10, 99);
 
         checkPalindromeWithFactorsMatchesExpected(expected, expectedValue, palindromes, palindromes.firstKey());
     }
@@ -66,7 +73,7 @@ public class PalindromesTest {
         );
         final long expectedValue = 906609l;
 
-        final SortedMap<Long, List<List<Integer>>> palindromes = Palindromes.getPalindromeProductsWithFactors(100, 999);
+        final SortedMap<Long, List<List<Integer>>> palindromes = palindromeCalculator.getPalindromeProductsWithFactors(100, 999);
 
         checkPalindromeWithFactorsMatchesExpected(expected, expectedValue, palindromes, palindromes.lastKey());
     }
@@ -81,7 +88,7 @@ public class PalindromesTest {
         );
         final long expectedValue = 10201l;
 
-        final SortedMap<Long, List<List<Integer>>> palindromes = Palindromes.getPalindromeProductsWithFactors(100, 999);
+        final SortedMap<Long, List<List<Integer>>> palindromes = palindromeCalculator.getPalindromeProductsWithFactors(100, 999);
 
         checkPalindromeWithFactorsMatchesExpected(expected, expectedValue, palindromes, palindromes.firstKey());
     }

data/tracks/java/scripts/prune-extra-keep-files.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+for EXERCISE_DIRECTORY in $(find exercises -mindepth 2 -maxdepth 2 -type d -name "src"); do
+  STARTER_DIRECTORY="${EXERCISE_DIRECTORY}/main/java"
+  STARTER_FILE_COUNT=$(find "${STARTER_DIRECTORY}" -mindepth 1 -maxdepth 1 -type f -name "*.java" | wc -l)
+  KEEP_FILE_LOCATION="${STARTER_DIRECTORY}/.keep"
+
+  if (( ${STARTER_FILE_COUNT} > 0 )) && [[ -f "${KEEP_FILE_LOCATION}" ]]; then
+    echo "Removing unnecessary keep file ${KEEP_FILE_LOCATION}..."
+    rm "${KEEP_FILE_LOCATION}"
+  fi
+done

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trackler
 version: !ruby/object:Gem::Version
-  version: 2.0.8.49
+  version: 2.0.8.50
 platform: ruby
 authors:
 - Katrina Owen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-13 00:00:00.000000000 Z
+date: 2017-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -2433,6 +2433,7 @@ files:
 - tracks/elisp/exercises/word-count/word-count.el
 - tracks/elisp/img/icon.png
 - tracks/elixir/.git
+- tracks/elixir/.github/stale.yml
 - tracks/elixir/.gitignore
 - tracks/elixir/.travis.yml
 - tracks/elixir/LICENSE
@@ -4275,6 +4276,7 @@ files:
 - tracks/idris/img/icon.png
 - tracks/java/.Rhistory
 - tracks/java/.git
+- tracks/java/.github/stale.yml
 - tracks/java/.gitignore
 - tracks/java/.keep
 - tracks/java/.travis.yml
@@ -4463,9 +4465,9 @@ files:
 - tracks/java/exercises/octal/src/main/java/.keep
 - tracks/java/exercises/octal/src/test/java/OctalTest.java
 - tracks/java/exercises/palindrome-products/build.gradle
-- tracks/java/exercises/palindrome-products/src/example/java/Palindromes.java
+- tracks/java/exercises/palindrome-products/src/example/java/PalindromeCalculator.java
 - tracks/java/exercises/palindrome-products/src/main/java/.keep
-- tracks/java/exercises/palindrome-products/src/test/java/PalindromesTest.java
+- tracks/java/exercises/palindrome-products/src/test/java/PalindromeCalculatorTest.java
 - tracks/java/exercises/pangram/build.gradle
 - tracks/java/exercises/pangram/src/example/java/PangramChecker.java
 - tracks/java/exercises/pangram/src/main/java/PangramChecker.java
@@ -4604,6 +4606,7 @@ files:
 - tracks/java/img/icon.png
 - tracks/java/scripts/increase-test-logging.sh
 - tracks/java/scripts/insert-ignores.sh
+- tracks/java/scripts/prune-extra-keep-files.sh
 - tracks/javascript/.editorconfig
 - tracks/javascript/.git
 - tracks/javascript/.gitignore