trackler 2.2.1.151 → 2.2.1.152

data/tracks/csharp/generators/Exercises/OcrNumbers.cs

@@ -1,6 +1,8 @@
 using System;
+using System.Collections.Generic;
 using Generators.Input;
 using Generators.Output;
+using Newtonsoft.Json.Linq;
 
 namespace Generators.Exercises
 {
@@ -10,14 +12,19 @@ protected override void UpdateCanonicalData(CanonicalData canonicalData)
         {
             foreach (var canonicalDataCase in canonicalData.Cases)
             {
-                canonicalDataCase.ExceptionThrown = (canonicalDataCase.Expected is long && canonicalDataCase.Expected <= 0) ? typeof(ArgumentException) : null;
-                canonicalDataCase.Properties["input"] = ToDigitStringRepresentation(canonicalDataCase.Properties["input"]);
+                canonicalDataCase.ExceptionThrown = (canonicalDataCase.Expected is int && canonicalDataCase.Expected <= 0) ? typeof(ArgumentException) : null;
+                canonicalDataCase.Input["rows"] = ToDigitStringRepresentation(canonicalDataCase.Input["rows"]);
                 canonicalDataCase.Expected = canonicalDataCase.Expected.ToString();
                 canonicalDataCase.UseVariableForTested = true;
                 canonicalDataCase.UseVariablesForInput = true;
             }
         }
-       
+
+        private UnescapedValue ToMultiLineString(JArray input)
+        {
+            return new UnescapedValue("Array.Empty<string>()");
+        }
+
         private UnescapedValue ToDigitStringRepresentation(string[] input)
         {
             const string template = @" {% for item in {{input}} %}{% if forloop.first == true %}""{{item}}"" + ""\n"" +{% continue %}{% endif %}
@@ -25,5 +32,7 @@ private UnescapedValue ToDigitStringRepresentation(string[] input)
 
             return new UnescapedValue(TemplateRenderer.RenderInline(template, new { input }));
         }
+
+        protected override HashSet<string> AddAdditionalNamespaces() => new HashSet<string> { typeof(Array).Namespace };
     }
 }

data/tracks/csharp/generators/Exercises/PascalsTriangle.cs

@@ -9,19 +9,12 @@ public class PascalsTriangle : GeneratorExercise
     {
         protected override void UpdateCanonicalData(CanonicalData canonicalData)
         {
-            //remove null case until canonical data is updated
-            var cases = canonicalData.Cases.ToList();
-            cases.RemoveAll(x => x.Properties["count"] == null);
-            canonicalData.Cases = cases.ToArray();
-
             foreach (var canonicalDataCase in canonicalData.Cases)
             {
                 canonicalDataCase.UseVariableForExpected = true;
                 canonicalDataCase.Property = "calculate";
                 if (!(canonicalDataCase.Expected is JArray))
                     canonicalDataCase.ExceptionThrown = typeof(ArgumentOutOfRangeException);
-                if (canonicalDataCase.Properties["count"] == null)
-                    canonicalDataCase.Properties["count"] = -1;
             }
         }
     }

data/tracks/csharp/generators/Exercises/ProteinTranslation.cs

@@ -0,0 +1,8 @@
+using Generators.Input;
+
+namespace Generators.Exercises
+{
+    public class ProteinTranslation : GeneratorExercise
+    {
+    }
+}

data/tracks/csharp/generators/Exercises/Proverb.cs

@@ -1,16 +1,18 @@
-using Generators.Output;
+using Generators.Input;
+using Generators.Output;
 
 namespace Generators.Exercises
 {
     public class Proverb : GeneratorExercise
     {
-        protected override string RenderTestMethodBodyAssert(TestMethodBody testMethodBody)
+        protected override void UpdateCanonicalData(CanonicalData canonicalData)
         {
-            if (testMethodBody.CanonicalDataCase.Properties["input"]["strings"] as string[] == null)
+            foreach (var canonicalDataCase in canonicalData.Cases)
             {
-                return TemplateRenderer.RenderInline("Assert.Empty(Proverb.Recite(new string[] { }));", new { });
+                canonicalDataCase.UseVariableForExpected = true;
+                canonicalDataCase.Input["strings"] = ConvertHelper.ToArray<string>(canonicalDataCase.Input["strings"]);
+                canonicalDataCase.Expected = ConvertHelper.ToArray<string>(canonicalDataCase.Expected);
             }
-            return base.RenderTestMethodBodyAssert(testMethodBody);
         }
     }
 }

data/tracks/csharp/generators/Exercises/QueenAttack.cs

@@ -65,9 +65,9 @@ private static void SetCreatePropertyData(CanonicalDataCase canonicalDataCase)
             canonicalDataCase.Description = validExpected ? canonicalDataCase.Description + " does not throw exception" : canonicalDataCase.Description;
 
             var coordinates = GetCoordinatesFromPosition(canonicalDataCase.Input["queen"]);
-            canonicalDataCase.Properties["X"] = coordinates.Item1;
-            canonicalDataCase.Properties["Y"] = coordinates.Item2;
-            
+            canonicalDataCase.Input["X"] = coordinates.Item1;
+            canonicalDataCase.Input["Y"] = coordinates.Item2;
+
             canonicalDataCase.SetInputParameters("X", "Y");
         }
     }

data/tracks/csharp/generators/Exercises/Rectangles.cs

@@ -0,0 +1,17 @@
+using Generators.Input;
+
+namespace Generators.Exercises
+{
+    public class Rectangles : GeneratorExercise
+    {
+        protected override void UpdateCanonicalData(CanonicalData canonicalData)
+        {
+            foreach (var canonicalDataCase in canonicalData.Cases)
+            {
+                canonicalDataCase.Property = "count";
+                canonicalDataCase.Input["strings"] = canonicalDataCase.Input["strings"] as string[] ?? new string[0];
+                canonicalDataCase.UseVariablesForInput = true;
+            }
+        }
+    }
+}

data/tracks/csharp/generators/Exercises/RobotSimulator.cs

@@ -16,11 +16,11 @@ protected override void UpdateCanonicalData(CanonicalData canonicalData)
 
             foreach (var canonicalDataCase in canonicalData.Cases)
             {
-                var positionVal = new UnescapedValue(GetCoordinateInstance(canonicalDataCase.Input["input"][position]));
-                var directionVal = new UnescapedValue(GetDirectionEnum(canonicalDataCase.Input["input"][direction]));
+                var positionVal = new UnescapedValue(GetCoordinateInstance(canonicalDataCase.Input[position]));
+                var directionVal = new UnescapedValue(GetDirectionEnum(canonicalDataCase.Input[direction]));
 
-                canonicalDataCase.Properties[direction] = directionVal;
-                canonicalDataCase.Properties[coordinate] = positionVal;
+                canonicalDataCase.Input[direction] = directionVal;
+                canonicalDataCase.Input[coordinate] = positionVal;
 
                 canonicalDataCase.SetConstructorInputParameters(direction, coordinate);
 
@@ -65,7 +65,7 @@ private string RenderInstructionsMethodBodyAct(TestMethodBody testMethodBody)
             var templateParameters = new
             {
                 MethodInvocation = "Simulate",
-                Instructions = testMethodBody.CanonicalDataCase.Properties["input"]["instructions"]
+                Instructions = testMethodBody.CanonicalDataCase.Input["instructions"]
             };
 
             return TemplateRenderer.RenderInline(template, templateParameters);
@@ -92,7 +92,7 @@ protected override string RenderTestMethodBodyAssert(TestMethodBody testMethodBo
             {
                 Direction = !string.IsNullOrEmpty(direction) ? GetDirectionEnum(direction) : null,
                 X = position?["x"],
-                Y = position?["y"] 
+                Y = position?["y"]
             };
 
             return TemplateRenderer.RenderInline(template.ToString(), templateParameters);

data/tracks/csharp/generators/Exercises/SaddlePoints.cs

@@ -13,13 +13,13 @@ protected override void UpdateCanonicalData(CanonicalData canonicalData)
             {
                 canonicalDataCase.TestedMethodType = TestedMethodType.Instance;
                 canonicalDataCase.Property = "Calculate";
-                canonicalDataCase.SetConstructorInputParameters("input");
+                canonicalDataCase.SetConstructorInputParameters("matrix");
                 canonicalDataCase.UseVariablesForConstructorParameters = true;
                 canonicalDataCase.UseVariablesForInput = true;
                 canonicalDataCase.UseVariableForTested = true;
                 canonicalDataCase.UseVariableForExpected = true;
 
-                canonicalDataCase.Properties["input"] = (canonicalDataCase.Properties["input"] as JArray).ToObject<int[,]>();
+                canonicalDataCase.Input["matrix"] = (canonicalDataCase.Input["matrix"] as JArray).ToObject<int[,]>();
 
                 var array = canonicalDataCase.Expected as Array;
 

data/tracks/csharp/generators/Exercises/Say.cs

@@ -10,7 +10,7 @@ protected override void UpdateCanonicalData(CanonicalData canonicalData)
             foreach (var canonicalDataCase in canonicalData.Cases)
             {
                 canonicalDataCase.Property = "InEnglish";
-                canonicalDataCase.ExceptionThrown = canonicalDataCase.Expected is long ? typeof(ArgumentOutOfRangeException) : null;
+                canonicalDataCase.ExceptionThrown = canonicalDataCase.Expected is int ? typeof(ArgumentOutOfRangeException) : null;
             }
         }
     }

data/tracks/csharp/generators/Exercises/ScaleGenerator.cs

@@ -0,0 +1,15 @@
+using Generators.Input;
+
+namespace Generators.Exercises
+{
+    public class ScaleGenerator : GeneratorExercise
+    {
+        protected override void UpdateCanonicalData(CanonicalData canonicalData)
+        {
+            foreach (var canonicalDataCase in canonicalData.Cases)
+            {
+                canonicalDataCase.UseVariableForExpected = true;
+            }
+        }
+    }
+}

data/tracks/csharp/generators/Exercises/SpiralMatrix.cs

@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Generators.Input;
+using Generators.Output;
+using Newtonsoft.Json.Linq;
+
+namespace Generators.Exercises
+{
+    public class SpiralMatrix : GeneratorExercise
+    {
+        protected override void UpdateCanonicalData(CanonicalData canonicalData)
+        {
+            foreach (var canonicalDataCase in canonicalData.Cases)
+            {
+                canonicalDataCase.Property = "GetMatrix";
+                canonicalDataCase.UseVariableForExpected = true;
+                canonicalDataCase.Expected = ConvertExpected(canonicalDataCase.Expected);
+            }
+        }
+
+        private dynamic ConvertExpected(dynamic expected)
+        {
+            var jArray = (JArray)expected;
+
+            if (jArray.Count == 0)
+                return new int[0, 0];
+
+            var rows = jArray.Count;
+            var cols = jArray[0].Count();
+
+            var matrix = new int[rows, cols];
+
+            for (var y = 0; y < rows; y++)
+            {
+                for (var x = 0; x < cols; x++)
+                {
+                    matrix[y, x] = jArray[y][x].ToObject<int>();
+                }
+            }
+
+            return matrix;
+        }
+    }
+}

data/tracks/csharp/generators/Exercises/Sublist.cs

@@ -18,13 +18,12 @@ private UnescapedValue InputValues(int[] list)
         protected override void UpdateCanonicalData(CanonicalData canonicalData)
         {
             foreach (var canonicalDataCase in canonicalData.Cases)
-            {              
-                var input = canonicalDataCase.Properties["input"] as Dictionary<string, object>;
-                input["listOne"] = InputValues(input["listOne"] as int[]);
-                input["listTwo"] = InputValues(input["listTwo"] as int[]);
+            {
+                canonicalDataCase.Input["listOne"] = InputValues(canonicalDataCase.Input["listOne"] as int[]);
+                canonicalDataCase.Input["listTwo"] = InputValues(canonicalDataCase.Input["listTwo"] as int[]);
 
                 canonicalDataCase.Property = "classify";
-                canonicalDataCase.Properties["expected"] = new UnescapedValue($"SublistType.{(canonicalDataCase.Properties["expected"] as string).Dehumanize()}");
+                canonicalDataCase.Expected = new UnescapedValue($"SublistType.{(canonicalDataCase.Expected as string).Dehumanize()}");
             }
         }
     }

data/tracks/csharp/generators/Exercises/SumOfMultiples.cs

@@ -1,6 +1,15 @@
-namespace Generators.Exercises
+using Generators.Input;
+
+namespace Generators.Exercises
 {
     public class SumOfMultiples : GeneratorExercise
     {
+        protected override void UpdateCanonicalData(CanonicalData canonicalData)
+        {
+            foreach (var canonicalDataCase in canonicalData.Cases)
+            {
+                canonicalDataCase.Input["factors"] = ConvertHelper.ToArray<int>(canonicalDataCase.Input["factors"]);
+            }
+        }
     }
 }

data/tracks/csharp/generators/Exercises/Tournament.cs

@@ -1,6 +1,8 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using Generators.Input;
 using Generators.Output;
+using Newtonsoft.Json.Linq;
 
 namespace Generators.Exercises
 {
@@ -10,11 +12,12 @@ protected override void UpdateCanonicalData(CanonicalData canonicalData)
         {
             foreach (var canonicalDataCase in canonicalData.Cases)
             {
+                canonicalDataCase.Property = "RunTally";
                 canonicalDataCase.TestedMethodType = TestedMethodType.Static;
                 canonicalDataCase.UseVariablesForInput = true;
                 canonicalDataCase.UseVariableForExpected = true;
-                canonicalDataCase.Properties["input"] = ToMultiLineString(canonicalDataCase.Properties["input"]);
-                canonicalDataCase.Expected = ToMultiLineString(canonicalDataCase.Expected);
+                canonicalDataCase.Input["rows"] = ConvertHelper.ToMultiLineString(canonicalDataCase.Input["rows"], "");
+                canonicalDataCase.Expected = ConvertHelper.ToMultiLineString(canonicalDataCase.Expected);
             }
         }
 
@@ -22,6 +25,7 @@ protected override HashSet<string> AddAdditionalNamespaces()
         {
             return new HashSet<string>
             {
+                typeof(Array).Namespace,
                 typeof(System.String).Namespace,
                 typeof(System.IO.Stream).Namespace,
                 typeof(System.Text.UTF8Encoding).Namespace
@@ -30,18 +34,10 @@ protected override HashSet<string> AddAdditionalNamespaces()
 
         protected override string RenderTestMethodBodyAssert(TestMethodBody testMethodBody)
         {
-            string template = @"Assert.Equal(expected, RunTally(input).Trim());";
+            string template = @"Assert.Equal(expected, RunTally(rows));";
             return TemplateRenderer.RenderInline(template, new { });
         }
 
-        private UnescapedValue ToMultiLineString(string[] input)
-        {
-            const string template = @"{% if input.size == 0 %}string.Empty{% else %}{% for item in {{input}} %}{% if forloop.length == 1 %}""{{item}}""{% break %}{% endif %}""{{item}}""{% if forloop.last == false %} + Environment.NewLine +{% endif %}
-               {% endfor %}.Trim(){% endif %}";
-        
-            return new UnescapedValue(TemplateRenderer.RenderInline(template, new { input }));
-        }
-
         protected override string[] RenderAdditionalMethods()
         {
             var methods = @"
@@ -50,17 +46,13 @@ private string RunTally(string input)
     var encoding = new UTF8Encoding();
 
     using (var inStream = new MemoryStream(encoding.GetBytes(input)))
+    using (var outStream = new MemoryStream())
     {
-        using (var outStream = new MemoryStream())
-        {
-            Tournament.Tally(inStream, outStream);
-            return encoding.GetString(outStream.ToArray());
-        }
+        Tournament.Tally(inStream, outStream);
+        return encoding.GetString(outStream.ToArray());
     }
 }";
             return methods.Split("", System.StringSplitOptions.None);
         }
-
-
     }
 }

data/tracks/csharp/generators/Exercises/Transpose.cs

@@ -9,8 +9,8 @@ protected override void UpdateCanonicalData(CanonicalData canonicalData)
             foreach (var canonicalDataCase in canonicalData.Cases)
             {
                 canonicalDataCase.Property = "String";
-                canonicalDataCase.Properties["input"] = ConvertHelper.ToMultiLineString(canonicalDataCase.Properties["input"]);
-                canonicalDataCase.Expected = ConvertHelper.ToMultiLineString(canonicalDataCase.Expected);
+                canonicalDataCase.Input["lines"] = ConvertHelper.ToMultiLineString(canonicalDataCase.Input["lines"], "");
+                canonicalDataCase.Expected = ConvertHelper.ToMultiLineString(canonicalDataCase.Expected, "");
 
                 canonicalDataCase.UseVariablesForInput = true;
                 canonicalDataCase.UseVariableForExpected = true;

data/tracks/csharp/generators/Exercises/Triangle.cs

@@ -16,7 +16,7 @@ protected override void UpdateCanonicalData(CanonicalData canonicalData)
                 else if (data.Property == "scalene")
                     data.Property = "IsScalene";
 
-                data.Properties["sides"] = SplitArrayToValues(data.Properties["sides"]);
+                data.Input["sides"] = SplitArrayToValues(data.Input["sides"]);
                 data.SetInputParameters("sides");
                 data.UseFullDescriptionPath = true;
 
@@ -29,7 +29,5 @@ private UnescapedValue SplitArrayToValues(IEnumerable input)
 
             return new UnescapedValue(TemplateRenderer.RenderInline(template, new { input }));
         }
-
-
     }
 }

data/tracks/csharp/generators/Exercises/TwelveDays.cs

@@ -16,11 +16,10 @@ protected override void UpdateCanonicalData(CanonicalData canonicalData)
             {
                 canonicalDataCase.UseVariableForExpected = true;
                 canonicalDataCase.Expected = ConvertHelper.ToMultiLineString(canonicalDataCase.Expected);
-                var properties = canonicalDataCase.Properties as Dictionary<string, object>;
-                var input = properties["input"] as Dictionary<string, object>;
-                if ((long)input["startVerse"] == (long)input["endVerse"])
+
+                if (canonicalDataCase.Input["startVerse"] == canonicalDataCase.Input["endVerse"])
                 {
-                    properties["input"] = input["startVerse"];
+                    canonicalDataCase.SetInputParameters("startVerse");
                 }
             }
         }

data/tracks/csharp/generators/Exercises/TwoBucket.cs

@@ -10,10 +10,10 @@ protected override void UpdateCanonicalData(CanonicalData canonicalData)
             foreach (var canonicalDataCase in canonicalData.Cases)
             {
                 canonicalDataCase.TestedMethodType = TestedMethodType.Instance;
-                canonicalDataCase.SetConstructorInputParameters("bucket_one", "bucket_two", "start_bucket");
+                canonicalDataCase.SetConstructorInputParameters("bucketOne", "bucketTwo", "startBucket");
 
-                var start_bucket = canonicalDataCase.Properties["start_bucket"];
-                canonicalDataCase.Properties["start_bucket"] = new UnescapedValue(start_bucket == "two" ? "Bucket.Two" : "Bucket.One");
+                var startBucket = canonicalDataCase.Input["startBucket"];
+                canonicalDataCase.Input["startBucket"] = new UnescapedValue(startBucket == "two" ? "Bucket.Two" : "Bucket.One");
             }
         }
 
@@ -39,8 +39,8 @@ protected override string RenderTestMethodBodyAssert(TestMethodBody testMethodBo
             var templateParameters = new
             {
                 MovesExpected = testMethodBody.CanonicalDataCase.Expected["moves"],
-                OtherBucketExpected = testMethodBody.CanonicalDataCase.Expected["other_bucket"],
-                GoalBucketExpected = testMethodBody.CanonicalDataCase.Expected["goal_bucket"],
+                OtherBucketExpected = testMethodBody.CanonicalDataCase.Expected["otherBucket"],
+                GoalBucketExpected = testMethodBody.CanonicalDataCase.Expected["goalBucket"],
             };
 
             return TemplateRenderer.RenderInline(template, templateParameters);

data/tracks/csharp/generators/Exercises/TwoFer.cs

@@ -1,6 +1,15 @@
-namespace Generators.Exercises
+using Generators.Input;
+
+namespace Generators.Exercises
 {
     public class TwoFer : GeneratorExercise
     {
+        protected override void UpdateCanonicalData(CanonicalData canonicalData)
+        {
+            foreach (var canonicalDataCase in canonicalData.Cases)
+            {
+                canonicalDataCase.Property = "Name";
+            }
+        }
     }
-}
+}