trackler 2.1.0.40 → 2.1.0.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb7b55ba97eeed894dce4891877a33184b8ff108
-  data.tar.gz: 7e5d39a933d5f377fca1d19b0211815877a46df8
+  metadata.gz: 459eb1c7e1f02ca9820277f1b0c2d702b6eff98f
+  data.tar.gz: 9aa711fe94d135c348739c92dbe9cbc6705a8f56
 SHA512:
-  metadata.gz: fab2f459cf90bc7993f1f86a95b33093b2affb33bf0751d58a9004bf34e2fa6f9bfffbd572cb6a5c422178ab35456fef648affeed00a03524f926f7b66547826
-  data.tar.gz: 2745237c7192a89c5e98515770eadf7387bba1c3d302f11d35b3e1f6db8e3574fac00f871b4f032d72f1b6d9a7a32b12477b2df432374f5c456d61e2a0390f00
+  metadata.gz: 708eaabff40770358ec9088fd995750a7fbf1a82c0f4af9262b66db028ad747287ed411dbdd5e3ccb644243551706d3961dede0824bc567a0cd32ec33cb76b18
+  data.tar.gz: dff6a0a9f1eae6c6da446a08701d3105441ee311309348afc528fa673d0e8b00dd756f2c91cac35320816ac4b65aa953ac497f8f518a677c4fd68c48a337d462

data/bin/update

@@ -1,8 +1,8 @@
 #!/bin/bash
 
-git checkout master
-git fetch origin master
-git reset --hard origin/master
+# git checkout master
+# git fetch origin master
+# git reset --hard origin/master
 
 git submodule foreach git pull origin master
 

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

@@ -1,6 +1,6 @@
 {
   "exercise": "bowling",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "comments": [
     "Students should implement roll and score methods.",
     "Roll should accept a single integer.",
@@ -91,31 +91,31 @@
     "previous_rolls": [10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10],
     "expected": 300
   }, {
-    "description": "rolls can not score negative points",
+    "description": "rolls cannot score negative points",
     "property": "roll",
     "previous_rolls": [],
     "roll": -1,
     "expected": {"error": "Negative roll is invalid"}
   }, {
-    "description": "a roll can not score more than 10 points",
+    "description": "a roll cannot score more than 10 points",
     "property": "roll",
     "previous_rolls": [],
     "roll": 11,
     "expected": {"error": "Pin count exceeds pins on the lane"}
   }, {
-    "description": "two rolls in a frame can not score more than 10 points",
+    "description": "two rolls in a frame cannot score more than 10 points",
     "property": "roll",
     "previous_rolls": [5],
     "roll": 6,
     "expected": {"error": "Pin count exceeds pins on the lane"}
   }, {
-    "description": "bonus roll after a strike in the last frame can not score more than 10 points",
+    "description": "bonus roll after a strike in the last frame cannot score more than 10 points",
     "property": "roll",
     "previous_rolls": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10],
     "roll": 11,
     "expected": {"error": "Pin count exceeds pins on the lane"}
   }, {
-    "description": "two bonus rolls after a strike in the last frame can not score more than 10 points",
+    "description": "two bonus rolls after a strike in the last frame cannot score more than 10 points",
     "property": "roll",
     "previous_rolls": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 5],
     "roll": 6,
@@ -126,24 +126,24 @@
     "previous_rolls": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 10, 6],
     "expected": 26
   }, {
-    "description": "the second bonus rolls after a strike in the last frame can not be a strike if the first one is not a strike",
+    "description": "the second bonus rolls after a strike in the last frame cannot be a strike if the first one is not a strike",
     "property": "roll",
     "previous_rolls": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 6],
     "roll": 10,
     "expected": {"error": "Pin count exceeds pins on the lane"}
   }, {
-    "description": "second bonus roll after a strike in the last frame can not score than 10 points",
+    "description": "second bonus roll after a strike in the last frame cannot score more than 10 points",
     "property": "roll",
     "previous_rolls": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 10],
     "roll": 11,
     "expected": {"error": "Pin count exceeds pins on the lane"}
   }, {
-    "description": "an unstarted game can not be scored",
+    "description": "an unstarted game cannot be scored",
     "property": "score",
     "previous_rolls": [],
     "expected": {"error": "Score cannot be taken until the end of the game"}
   }, {
-    "description": "an incomplete game can not be scored",
+    "description": "an incomplete game cannot be scored",
     "property": "score",
     "previous_rolls": [0, 0],
     "expected": {"error": "Score cannot be taken until the end of the game"}

data/lib/trackler/version.rb

@@ -1,3 +1,3 @@
 module Trackler
-  VERSION = "2.1.0.40"
+  VERSION = "2.1.0.41"
 end

data/tracks/delphi/config.json

@@ -90,6 +90,15 @@
         "Recursion"
       ]
     },
+    {
+      "slug": "collatz-conjecture",
+      "difficulty": 2,
+      "topics": [
+        "Algorithms",
+        "Looping",
+        "Raising Exceptions"
+      ]
+    },
     {
       "slug": "beer-song",
       "difficulty": 3,

data/tracks/delphi/exercises/collatz-conjecture/Collatzconjecture.dpr

@@ -0,0 +1,60 @@
+program Collatzconjecture;
+
+{$IFNDEF TESTINSIGHT}
+{$APPTYPE CONSOLE}
+{$ENDIF}{$STRONGLINKTYPES ON}
+uses
+  System.SysUtils,
+  {$IFDEF TESTINSIGHT}
+  TestInsight.DUnitX,
+  {$ENDIF }
+  DUnitX.Loggers.Console,
+  DUnitX.Loggers.Xml.NUnit,
+  DUnitX.TestFramework,
+  uCollatzconjectureTest in 'uCollatzconjectureTest.pas',
+  uCollatzconjecture in 'uCollatzconjecture.pas';
+
+var
+  runner : ITestRunner;
+  results : IRunResults;
+  logger : ITestLogger;
+  nunitLogger : ITestLogger;
+begin
+{$IFDEF TESTINSIGHT}
+  TestInsight.DUnitX.RunRegisteredTests;
+  exit;
+{$ENDIF}
+  try
+    //Check command line options, will exit if invalid
+    TDUnitX.CheckCommandLine;
+    //Create the test runner
+    runner := TDUnitX.CreateRunner;
+    //Tell the runner to use RTTI to find Fixtures
+    runner.UseRTTI := True;
+    //tell the runner how we will log things
+    //Log to the console window
+    logger := TDUnitXConsoleLogger.Create(true);
+    runner.AddLogger(logger);
+    //Generate an NUnit compatible XML File
+    nunitLogger := TDUnitXXMLNUnitFileLogger.Create(TDUnitX.Options.XMLOutputFile);
+    runner.AddLogger(nunitLogger);
+    runner.FailsOnNoAsserts := False; //When true, Assertions must be made during tests;
+
+    //Run tests
+    results := runner.Execute;
+    if not results.AllPassed then
+      System.ExitCode := EXIT_ERRORS;
+
+    {$IFNDEF CI}
+    //We don't want this happening when running under CI.
+    if TDUnitX.Options.ExitBehavior = TDUnitXExitBehavior.Pause then
+    begin
+      System.Write('Done.. press <Enter> key to quit.');
+      System.Readln;
+    end;
+    {$ENDIF}
+  except
+    on E: Exception do
+      System.Writeln(E.ClassName, ': ', E.Message);
+  end;
+end.

data/tracks/delphi/exercises/collatz-conjecture/uCollatzconjectureExample.pas

@@ -0,0 +1,35 @@
+unit uCollatzconjecture;
+
+interface
+uses System.SysUtils;
+
+type
+  EIllegalNumber = class(Exception);
+
+  function collatzSteps(aNumber: integer): integer;
+
+implementation
+
+function collatzSteps(aNumber: integer): integer;
+
+  function computeCollatzValue(aValue: integer): integer;
+  begin
+    if odd(aValue) then
+      result := aValue * 3 + 1
+    else
+      result := aValue div 2;
+  end;
+
+begin
+  if aNumber <= 0 then
+    raise EIllegalNumber.Create('error: Only positive numbers are allowed');
+
+  result := 0;
+  while (aNumber > 1) and (result < 1000) do
+  begin
+    aNumber := computeCollatzValue(aNumber);
+    inc(result);
+  end;
+end;
+
+end.

data/tracks/delphi/exercises/collatz-conjecture/uCollatzconjectureTest.pas

@@ -0,0 +1,83 @@
+unit uCollatzconjectureTest;
+
+interface
+uses
+  DUnitX.TestFramework;
+
+type
+  [TestFixture]
+  CollatzconjectureTest = class(TObject)
+  public
+    [Testcase('Zero steps for one', '1, 0')]
+//    [Ignore('Comment the "[Ignore]" statement to run the test')]
+    procedure Zero_steps_for_one(const aNumber: integer; const aExpected: integer);
+
+    [Testcase('Divide if even','16, 4')]
+    [Ignore]
+    procedure Divide_if_even(const aNumber: integer; const aExpected: integer);
+
+    [Testcase('Even and odd steps','12, 9')]
+    [Ignore]
+    procedure Even_and_odd_steps(const aNumber: integer; const aExpected: integer);
+
+    [Testcase('Large number of even and odd steps', '1000000, 152')]
+    [Ignore]
+    procedure Large_number_of_even_and_odd_steps(const aNumber: integer; const aExpected: integer);
+
+    [Testcase('Zero is an error', '0,error: Only positive numbers are allowed')]
+    [Ignore]
+    procedure Zero_is_an_error(const aNumber: integer; const aExpected: string);
+
+    [Testcase('Negative value is an error', '-15,error: Only positive numbers are allowed')]
+    [Ignore]
+    procedure Negative_value_is_an_error(const aNumber: integer; const aExpected: string);
+  end;
+
+implementation
+uses uCollatzconjecture;
+
+procedure CollatzconjectureTest.Zero_steps_for_one(const aNumber: integer; const aExpected: integer);
+begin
+  Assert.AreEqual(aExpected, collatzSteps(aNumber));
+end;
+
+procedure CollatzconjectureTest.Divide_if_even(const aNumber: integer; const aExpected: integer);
+begin
+  Assert.AreEqual(aExpected, collatzSteps(aNumber));
+end;
+
+procedure CollatzconjectureTest.Even_and_odd_steps(const aNumber: integer; const aExpected: integer);
+begin
+  Assert.AreEqual(aExpected, collatzSteps(aNumber));
+end;
+
+procedure CollatzconjectureTest.Large_number_of_even_and_odd_steps(const aNumber: integer; const aExpected: integer);
+begin
+  Assert.AreEqual(aExpected, collatzSteps(aNumber));
+end;
+
+procedure CollatzconjectureTest.Zero_is_an_error(const aNumber: integer; const aExpected: string);
+var MyProc: TTestLocalMethod;
+begin
+  MyProc := procedure
+            begin
+              collatzSteps(aNumber);
+            end;
+
+  Assert.WillRaiseWithMessage(MyProc, EIllegalNumber, aExpected);
+end;
+
+procedure CollatzconjectureTest.Negative_value_is_an_error(const aNumber: integer; const aExpected: string);
+var MyProc: TTestLocalMethod;
+begin
+  MyProc := procedure
+            begin
+              collatzSteps(aNumber);
+            end;
+
+  Assert.WillRaiseWithMessage(MyProc, EIllegalNumber, aExpected);
+end;
+
+initialization
+  TDUnitX.RegisterTestFixture(CollatzconjectureTest);
+end.

data/tracks/java/exercises/acronym/src/main/java/Acronym.java

@@ -1,4 +1,4 @@
-final class Acronym {
+class Acronym {
 
     Acronym(String phrase) {
         throw new UnsupportedOperationException("Delete this statement and write your own implementation.");

data/tracks/java/exercises/all-your-base/src/main/java/BaseConverter.java

@@ -1,4 +1,4 @@
-final class BaseConverter {
+class BaseConverter {
 
 
 

data/tracks/java/exercises/bracket-push/src/main/java/BracketChecker.java

@@ -1,4 +1,4 @@
-final class BracketChecker {
+class BracketChecker {
 
 
 

data/tracks/java/exercises/change/src/main/java/ChangeCalculator.java

@@ -1,4 +1,4 @@
-final class ChangeCalculator {
+class ChangeCalculator {
 
 
 

data/tracks/java/exercises/diamond/src/main/java/DiamondPrinter.java

@@ -1,4 +1,4 @@
-final class DiamondPrinter {
+class DiamondPrinter {
 
 
 

data/tracks/java/exercises/flatten-array/src/main/java/Flattener.java

@@ -1,4 +1,4 @@
-final class Flattener {
+class Flattener {
 
 
 

data/tracks/java/exercises/luhn/src/main/java/LuhnValidator.java

@@ -1,4 +1,4 @@
-final class LuhnValidator {
+class LuhnValidator {
 
     boolean isValid(String candidate) {
         throw new UnsupportedOperationException("Delete this statement and write your own implementation.");

data/tracks/java/exercises/minesweeper/src/main/java/MinesweeperBoard.java

@@ -1,4 +1,4 @@
-public final class MinesweeperBoard {
+public class MinesweeperBoard {
 
 
 

data/tracks/java/exercises/ocr-numbers/src/main/java/OpticalCharacterReader.java

@@ -1,4 +1,4 @@
-final class OpticalCharacterReader {
+class OpticalCharacterReader {
 
 
 

data/tracks/java/exercises/perfect-numbers/src/main/java/NaturalNumber.java

@@ -1,4 +1,4 @@
-final class NaturalNumber {
+class NaturalNumber {
 
 
 

data/tracks/java/exercises/queen-attack/src/main/java/BoardCoordinate.java

@@ -1,4 +1,4 @@
-public final class BoardCoordinate {
+public class BoardCoordinate {
 
 
 

data/tracks/java/exercises/queen-attack/src/main/java/QueenAttackCalculator.java

@@ -1,4 +1,4 @@
-public final class QueenAttackCalculator {
+public class QueenAttackCalculator {
 
 
 

data/tracks/java/exercises/rectangles/src/main/java/RectangleCounter.java

@@ -1,4 +1,4 @@
-final class RectangleCounter {
+class RectangleCounter {
 
 
 

data/tracks/java/exercises/robot-simulator/src/main/java/GridPosition.java

@@ -1,4 +1,4 @@
-final class GridPosition {
+class GridPosition {
 
     final int x;
 

data/tracks/java/exercises/robot-simulator/src/main/java/Robot.java

@@ -1,4 +1,4 @@
-final class Robot {
+class Robot {
 
 
 

data/tracks/java/exercises/saddle-points/src/main/java/Matrix.java

@@ -1,4 +1,4 @@
-final class Matrix {
+class Matrix {
 
 
 

data/tracks/java/exercises/saddle-points/src/main/java/MatrixCoordinate.java

@@ -1,4 +1,4 @@
-final class MatrixCoordinate {
+class MatrixCoordinate {
 
   private final int row;
 

data/tracks/java/exercises/scrabble-score/src/main/java/Scrabble.java

@@ -1,4 +1,4 @@
-final class Scrabble {
+class Scrabble {
 
     Scrabble(String word) {
         throw new UnsupportedOperationException("Delete this statement and write your own implementation.");

data/tracks/java/exercises/secret-handshake/src/main/java/HandshakeCalculator.java

@@ -1,6 +1,6 @@
 import java.util.List;
 
-final class HandshakeCalculator {
+class HandshakeCalculator {
 
     List<Signal> calculateHandshake(int number) {
         throw new UnsupportedOperationException("Delete this statement and write your own implementation.");

data/tracks/java/exercises/sublist/src/main/java/RelationshipComputer.java

@@ -1,4 +1,4 @@
-final class RelationshipComputer<T> {
+class RelationshipComputer<T> {
 
 
 

data/tracks/java/exercises/wordy/src/main/java/WordProblemSolver.java

@@ -1,4 +1,4 @@
-final class WordProblemSolver {
+class WordProblemSolver {
 
 
 

data/tracks/vbnet/config.json

@@ -1,7 +1,7 @@
 {
   "slug": "vbnet",
   "language": "VB.NET",
-  "repository": "https://github.com/exercism/xvbnet",
+  "repository": "https://github.com/exercism/vbnet",
   "checklist_issue": 3,
   "active": false,
   "deprecated": [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trackler
 version: !ruby/object:Gem::Version
-  version: 2.1.0.40
+  version: 2.1.0.41
 platform: ruby
 authors:
 - Katrina Owen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-17 00:00:00.000000000 Z
+date: 2017-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -2036,6 +2036,9 @@ files:
 - tracks/delphi/exercises/clock/Clock.dpr
 - tracks/delphi/exercises/clock/uClockExample.pas
 - tracks/delphi/exercises/clock/uClockTest.pas
+- tracks/delphi/exercises/collatz-conjecture/Collatzconjecture.dpr
+- tracks/delphi/exercises/collatz-conjecture/uCollatzconjectureExample.pas
+- tracks/delphi/exercises/collatz-conjecture/uCollatzconjectureTest.pas
 - tracks/delphi/exercises/etl/ETL.dpr
 - tracks/delphi/exercises/etl/uETLexample.pas
 - tracks/delphi/exercises/etl/uETLtests.pas