trackler 2.0.6.7 → 2.0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6cc0a77186d7fa2d5ea7277f76bbd16c0e610a52
-  data.tar.gz: bd56a7bb8a6d1a0d68cf50e13e3a0b8c555f2159
+  metadata.gz: 06eb068eafe08df34df6d6694c3addea1a148d25
+  data.tar.gz: 40fc285269f963be93d20e6aa3b6e88502f83713
 SHA512:
-  metadata.gz: b6ceea973ff044d16bb0976de1ce9ba06c91c6deec0abb8a09f2878e1f88e811f86bed65a4eeb36626b4146432220c451b3126b3bf8f05867ef62669ef9cda1e
-  data.tar.gz: 92c97e22e97b13a145ebaa8e4a61aa690907bb017bcfe7c2317199fd1eced5be3a45b1fcb5fc9b9cac1d31b7a60f1d620a36bce790555181fb30ac8a01a99a7c
+  metadata.gz: bdc0498d9f33dea2d191d3b728f8f33fc0808f4cfc17413674440ef0a6352a7a6e50389df6c434a2e243b1a25e9e97f3eb5ed7ee74383079c55b9b5692cd7206
+  data.tar.gz: 720ef4ddced6739a38e22c33ff657e8ca0b14b019d4d7940a587b18b0ed7d22572d7010b83c7c72b43ca1a8b003ab0081a7ae88aa64059a892e2b60e143a5e77

data/lib/trackler/version.rb

@@ -1,3 +1,3 @@
 module Trackler
-  VERSION = "2.0.6.7"
+  VERSION = "2.0.6.8"
 end

data/tracks/csharp/exercises/difference-of-squares/DifferenceOfSquaresTest.cs

@@ -75,8 +75,8 @@ public class DifferenceOfSquaresTests
 
     [Ignore("Remove to run test")]
     [Test]
-    public void Test_negative_numbers_throw_argument_exception()
+    public void Test_negative_numbers_throw_argument_out_of_range_exception()
     {
-        Assert.That(() => new Squares(-5), Throws.TypeOf<ArgumentException>());
+        Assert.That(() => new Squares(-5), Throws.TypeOf<ArgumentOutOfRangeException>());
     }
 }

data/tracks/csharp/exercises/difference-of-squares/Example.cs

@@ -9,7 +9,7 @@ public class Squares
     {
         if (max < 0)
         {
-            throw new ArgumentException("Max must be positive", "max");
+            throw new ArgumentOutOfRangeException("Max must be positive", "max");
         }
 
         this.max = max;

data/tracks/go/bin/test-without-stubs

@@ -10,7 +10,7 @@
 # That way no maintainer will mistakenly commit the deleted files,
 # which could otherwise happen after running tests locally.
 
-for dir in exercises/*; do
+for dir in exercises/*/; do
   stub=$(echo $(basename $dir) | tr - _)
   file="$dir/$stub.go"
   if [ -f $file ]; then
@@ -39,7 +39,7 @@ cleanup () {
 trap cleanup EXIT INT TERM
 
 if [ "$1" = "fmt" ]; then
-  for dir in exercises/*; do
+  for dir in exercises/*/; do
     cd $dir
     if [ -n "$(go fmt)" ]; then
       echo "please run 'go fmt' on $dir" >&2
@@ -51,7 +51,7 @@ if [ "$1" = "fmt" ]; then
 fi
 
 if [ "$1" = "vet" ]; then
-  for dir in exercises/*; do
+  for dir in exercises/*/; do
     cd $dir
     if ! go vet; then
       echo "please follow the 'go vet' suggestions in $dir" >&2

data/tracks/go/config.json

@@ -38,7 +38,12 @@
     {
       "difficulty": 1,
       "slug": "leap",
-      "topics": []
+      "topics": [
+        "Control-flow (conditionals)",
+        "Booleans",
+        "Integers",
+        "Logic"
+      ]
     },
     {
       "difficulty": 1,

data/tracks/java/exercises/etl/src/test/java/EtlTest.java

@@ -24,7 +24,7 @@ public class EtlTest {
         };
         expected = Collections.unmodifiableMap(expected);
 
-        assertEquals(etl.transform(old), expected);
+        assertEquals(expected, etl.transform(old));
     }
 
     @Test
@@ -47,7 +47,7 @@ public class EtlTest {
         };
         expected = Collections.unmodifiableMap(expected);
 
-        assertEquals(etl.transform(old), expected);
+        assertEquals(expected, etl.transform(old));
     }
 
     @Test
@@ -70,7 +70,7 @@ public class EtlTest {
         };
         expected = Collections.unmodifiableMap(expected);
 
-        assertEquals(etl.transform(old), expected);
+        assertEquals(expected, etl.transform(old));
     }
 
     @Test
@@ -120,6 +120,6 @@ public class EtlTest {
         };
         expected = Collections.unmodifiableMap(expected);
 
-        assertEquals(etl.transform(old), expected);
+        assertEquals(expected, etl.transform(old));
     }
 }

data/tracks/pascal/config.json

@@ -126,6 +126,15 @@
         "Queues",
         "Classes"
       ]
+    },
+    {
+      "slug": "saddle-points",
+      "difficulty": 4,
+      "topics": [
+        "Matrices",
+        "Arrays",
+        "Tuples"
+      ]
     }
   ],
   "ignored": [

data/tracks/pascal/exercises/saddle-points/TestSaddlePoints.dpr

@@ -0,0 +1,60 @@
+program TestSaddlePoints;
+
+{$IFNDEF TESTINSIGHT}
+{$APPTYPE CONSOLE}
+{$ENDIF}{$STRONGLINKTYPES ON}
+uses
+  System.SysUtils,
+  {$IFDEF TESTINSIGHT}
+  TestInsight.DUnitX,
+  {$ENDIF }
+  DUnitX.Loggers.Console,
+  DUnitX.Loggers.Xml.NUnit,
+  DUnitX.TestFramework,
+  uSaddlePointsTests in 'uSaddlePointsTests.pas',
+  uSaddlePoints in 'uSaddlePoints.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/pascal/exercises/saddle-points/uSaddlePointsExample.pas

@@ -0,0 +1,131 @@
+unit uSaddlePoints;
+
+interface
+uses uSaddlePointsTests;
+
+type
+  ISaddlePoints = interface(IInvokable)
+  ['{8C41B1A2-335D-4C6D-AF55-9F307F358227}']
+    function Calculate: TArray<TTuple<integer, integer>>;
+    function getStatus: string;
+    property ToString: string read getStatus;
+  end;
+
+  function newSaddlePoints(aValues: TArray<TArray<integer>>): ISaddlePoints;
+
+implementation
+uses SysUtils, Spring.Collections;
+
+type
+  TSaddlePoints = class(TInterfacedObject, ISaddlePoints)
+  private
+    fValues: TArray<TArray<integer>>;
+    fmaxRows: TArray<integer>;
+    fminCols: TArray<integer>;
+    fStatus: string;
+    function getMaxRows: TArray<integer>;
+    function getMinColumns: TArray<integer>;
+    function Coordinates: IList<TTuple<integer, integer>>;
+    function ColumnCount: integer;
+    function RowCount: integer;
+    function IsSaddlePoint(const coordinate: TTuple<integer, integer>): boolean;
+    function getStatus: string;
+  public
+    constructor create(aValues: TArray<TArray<integer>>);
+    function Calculate: TArray<TTuple<integer, integer>>;
+    property ToString: string read getStatus;
+  end;
+
+function newSaddlePoints(aValues: TArray<TArray<integer>>): ISaddlePoints;
+begin
+  result := TSaddlePoints.create(aValues);
+end;
+
+constructor TSaddlePoints.create(aValues: TArray<TArray<Integer>>);
+var I: integer;
+    J: integer;
+begin
+  fValues := copy(aValues);
+  fmaxRows := getMaxRows;
+  fminCols := getMinColumns;
+  fStatus := 'Calculation not performed';
+end;
+
+function TSaddlePoints.getStatus: string;
+begin
+  result := fStatus;
+end;
+
+function TSaddlePoints.getMaxRows: TArray<integer>;
+var I: integer;
+    J: integer;
+    lRow: IList<integer>;
+begin
+  lRow := TCollections.CreateList<integer>;
+  SetLength(result, RowCount);
+  for I := 0 to RowCount - 1 do
+  begin
+    for J := 0 to ColumnCount - 1 do
+      lRow.Add(fValues[I,J]);
+    result[I] := lRow.Max;
+    lRow.Clear;
+  end;
+end;
+
+function TSaddlePoints.getMinColumns: TArray<integer>;
+var I: integer;
+    J: integer;
+    lColumn: IList<integer>;
+begin
+  lColumn := TCollections.CreateList<integer>;
+  SetLength(result, ColumnCount);
+  for I := 0 to ColumnCount - 1 do
+  begin
+    for J := 0 to RowCount - 1 do
+      lColumn.Add(fValues[J,I]);
+    result[I] := lColumn.Min;
+    lColumn.Clear;
+  end;
+end;
+
+function TSaddlePoints.Coordinates: IList<TTuple<integer, integer>>;
+var I, J: integer;
+begin
+  result := TCollections.CreateList<TTuple<integer, integer>>;
+  for I := 0 to RowCount - 1 do
+    for J := 0 to ColumnCount - 1 do
+      result.Add(TTuple<integer, integer>.Create(I,J));
+end;
+
+function TSaddlePoints.Calculate: TArray<TTuple<integer, integer>>;
+var lTuple: TTuple<integer, integer>;
+begin
+  result := Coordinates.Where(IsSaddlePoint).ToArray;
+  if length(result) = 0 then
+    fStatus := 'No saddle points'
+  else
+  begin
+    fStatus := '';
+    for lTuple in result do
+      fStatus := fStatus + format('(%d,%d),',[lTuple.Value1, lTuple.Value2]);
+    fStatus := fStatus.Remove(fStatus.Length - 1);
+  end;
+end;
+
+function TSaddlePoints.ColumnCount: integer;
+begin
+  result := length(fValues[1]);
+end;
+
+function TSaddlePoints.RowCount: integer;
+begin
+  result := length(fValues);
+end;
+
+function TSaddlePoints.IsSaddlePoint(const coordinate: TTuple<integer, integer>): boolean;
+begin
+  result := (fmaxRows[coordinate.Value1] = fValues[coordinate.Value1, coordinate.Value2]) and
+            (fminCols[coordinate.Value2] = fValues[coordinate.Value1, coordinate.Value2]);
+end;
+
+end.

data/tracks/pascal/exercises/saddle-points/uSaddlePointsTests.pas

@@ -0,0 +1,161 @@
+unit uSaddlePointsTests;
+
+interface
+uses
+  DUnitX.TestFramework;
+
+type
+
+  [TestFixture]
+  TSaddlePointTests = class(TObject)
+  public
+    [Test]
+    procedure Readme_example;
+
+    [Test]
+    [Ignore('Comment this line to run test')]
+    procedure No_saddle_point;
+
+    [Test]
+    [Ignore('Comment this line to run test')]
+    procedure Saddle_point;
+
+    [Test]
+    [Ignore('Comment this line to run test')]
+    procedure Another_saddle_point;
+
+    [Test]
+    [Ignore('Comment this line to run test')]
+    procedure Multiple_saddle_points;
+
+    [Test]
+    [Ignore('Comment this line to run test')]
+    procedure Five_by_five_matrix;
+  end;
+
+  TTuple<T1, T2> = record
+  private
+    fValue1: T1;
+    fValue2: T2;
+  public
+    constructor Create(Value1: T1; Value2: T2);
+    property Value1 : T1 read fValue1;
+    property Value2 : T2 read fValue2;
+  end;
+
+implementation
+uses uSaddlePoints;
+
+constructor TTuple<T1, T2>.Create(Value1: T1; Value2: T2);
+begin
+  fValue1 := Value1;
+  fValue2 := Value2;
+end;
+
+
+procedure TSaddlePointTests.Readme_example;
+var SaddlePoints: ISaddlePoints;
+    values: TArray<TArray<integer>>;
+    expected: TArray<TTuple<integer,integer>>;
+begin
+  SetLength(values, 3, 3);
+  values[0,0] := 9; values[0,1] := 8; values[0,2] := 7;
+  values[1,0] := 5; values[1,1] := 3; values[1,2] := 2;
+  values[2,0] := 6; values[2,1] := 6; values[2,2] := 7;
+
+  SaddlePoints := newSaddlePoints(values);
+
+  SetLength(expected, 1);
+  expected[0] := TTuple<integer,integer>.Create(1,0);
+  Assert.AreEqual(expected,SaddlePoints.Calculate);
+end;
+
+procedure TSaddlePointTests.No_saddle_point;
+var SaddlePoints: ISaddlePoints;
+    values: TArray<TArray<integer>>;
+    expected: TArray<TTuple<integer,integer>>;
+begin
+  SetLength(values, 2, 2);
+  values[0,0] := 2; values[0,1] := 1;
+  values[1,0] := 1; values[1,1] := 2;
+
+  SaddlePoints := newSaddlePoints(values);
+
+  SetLength(expected, 0);
+  Assert.AreEqual(expected,SaddlePoints.Calculate);
+end;
+
+procedure TSaddlePointTests.Saddle_point;
+var SaddlePoints: ISaddlePoints;
+    values: TArray<TArray<integer>>;
+    expected: TArray<TTuple<integer,integer>>;
+begin
+  SetLength(values, 2, 2);
+  values[0,0] := 1; values[0,1] := 2;
+  values[1,0] := 3; values[1,1] := 4;
+
+  SaddlePoints := newSaddlePoints(values);
+
+  SetLength(expected, 1);
+  expected[0] := TTuple<integer,integer>.Create(0,1);
+  Assert.AreEqual(expected,SaddlePoints.Calculate);
+end;
+
+procedure TSaddlePointTests.Another_saddle_point;
+var SaddlePoints: ISaddlePoints;
+    values: TArray<TArray<integer>>;
+    expected: TArray<TTuple<integer,integer>>;
+begin
+  SetLength(values, 3, 5);
+  values[0,0] := 18; values[0,1] := 3;  values[0,2] := 39; values[0,3] := 19; values[0,4] := 91;
+  values[1,0] := 38; values[1,1] := 10; values[1,2] := 8;  values[1,3] := 77; values[1,4] := 320;
+  values[2,0] := 3;  values[2,1] := 4;  values[2,2] := 8;  values[2,3] := 6;  values[2,4] := 7;
+
+  SaddlePoints := newSaddlePoints(values);
+
+  SetLength(expected, 1);
+  expected[0] := TTuple<integer,integer>.Create(2,2);
+  Assert.AreEqual(expected,SaddlePoints.Calculate);
+end;
+
+procedure TSaddlePointTests.Multiple_saddle_points;
+var SaddlePoints: ISaddlePoints;
+    values: TArray<TArray<integer>>;
+    expected: TArray<TTuple<integer,integer>>;
+begin
+  SetLength(values, 3, 3);
+  values[0,0] := 4; values[0,1] := 5; values[0,2] := 4;
+  values[1,0] := 3; values[1,1] := 5; values[1,2] := 5;
+  values[2,0] := 1; values[2,1] := 5; values[2,2] := 4;
+
+  SaddlePoints := newSaddlePoints(values);
+
+  SetLength(expected, 3);
+  expected[0] := TTuple<integer,integer>.Create(0,1);
+  expected[1] := TTuple<integer,integer>.Create(1,1);
+  expected[2] := TTuple<integer,integer>.Create(2,1);
+  Assert.AreEqual(expected,SaddlePoints.Calculate);
+end;
+
+procedure TSaddlePointTests.Five_by_five_matrix;
+var SaddlePoints: ISaddlePoints;
+    values: TArray<TArray<integer>>;
+    expected: TArray<TTuple<integer,integer>>;
+begin
+  SetLength(values, 5, 5);
+  values[0,0] := 34; values[0,1] := 21; values[0,2] := 61; values[0,3] := 41; values[0,4] := 25;
+  values[1,0] := 14; values[1,1] := 42; values[1,2] := 60; values[1,3] := 14; values[1,4] := 31;
+  values[2,0] := 54; values[2,1] := 45; values[2,2] := 55; values[2,3] := 42; values[2,4] := 23;
+  values[3,0] := 33; values[3,1] := 15; values[3,2] := 61; values[3,3] := 31; values[3,4] := 35;
+  values[4,0] := 21; values[4,1] := 52; values[4,2] := 63; values[4,3] := 13; values[4,4] := 23;
+
+  SaddlePoints := newSaddlePoints(values);
+
+  SetLength(expected, 1);
+  expected[0] := TTuple<integer,integer>.Create(2,2);
+  Assert.AreEqual(expected, SaddlePoints.Calculate);
+end;
+
+initialization
+  TDUnitX.RegisterTestFixture(TSaddlePointTests);
+end.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trackler
 version: !ruby/object:Gem::Version
-  version: 2.0.6.7
+  version: 2.0.6.8
 platform: ruby
 authors:
 - Katrina Owen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-09 00:00:00.000000000 Z
+date: 2017-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -2654,7 +2654,6 @@ files:
 - tracks/go/.travis.yml
 - tracks/go/LICENSE
 - tracks/go/README.md
-- tracks/go/SETUP.md
 - tracks/go/bin/fetch-configlet
 - tracks/go/bin/test-without-stubs
 - tracks/go/config.json
@@ -2663,6 +2662,7 @@ files:
 - tracks/go/docs/LEARNING.md
 - tracks/go/docs/RESOURCES.md
 - tracks/go/docs/TESTS.md
+- tracks/go/exercises/TRACK_HINTS.md
 - tracks/go/exercises/accumulate/accumulate_test.go
 - tracks/go/exercises/accumulate/example.go
 - tracks/go/exercises/acronym/acronym_test.go
@@ -5138,7 +5138,11 @@ files:
 - tracks/pascal/exercises/phone-number/PhoneNumberTests.dpr
 - tracks/pascal/exercises/phone-number/uPhoneNumberExample.pas
 - tracks/pascal/exercises/phone-number/uPhoneNumberTests.pas
+- tracks/pascal/exercises/saddle-points/TestSaddlePoints.dpr
+- tracks/pascal/exercises/saddle-points/uSaddlePointsExample.pas
+- tracks/pascal/exercises/saddle-points/uSaddlePointsTests.pas
 - tracks/pascal/img/.keep
+- tracks/pascal/img/Delphi-icon.png.keep
 - tracks/pascal/img/icon.png
 - tracks/perl5/.git
 - tracks/perl5/.gitignore