diff --git a/csharp-fundamentals-lists.Main/Core.cs b/csharp-fundamentals-lists.Main/Core.cs index 185c6d3..643716b 100644 --- a/csharp-fundamentals-lists.Main/Core.cs +++ b/csharp-fundamentals-lists.Main/Core.cs @@ -19,7 +19,7 @@ public class Core public Core() { - + } public List Question1() @@ -31,26 +31,31 @@ public List Question1() // TODO: 1. Find the add method and add two more flavours of ice cream: "Phish Food", "Peanut Butter Cup" //write code here + _iceCreams.Add("Phish Food"); + _iceCreams.Add("Peanut Butter Cup"); + + - return _iceCreams; + return _iceCreams; } public int Question2() { - + //TODO: find the lists method that returns the number of ice creams in the list and return this. - // remove exception and write code here - throw new NotImplementedException(); + return _iceCreams.Count; } public List Question3() { // The code below concatenates this.MoreIceCream to the _iceCreams list into a new results list. - //TODO: you can 'chain' methods on the _iceCream list, so add another Concat to include EvenMoreIceCream (this is defined below) to the result list . e.g. _iceCreams.Concat(this.MoreIceCream).Concat(other list to concat).ToList() + // TODO: you can 'chain' methods on the _iceCream list, so add another Concat to + // include EvenMoreIceCream (this is defined below) to the result list . e.g. + // _iceCreams.Concat(this.MoreIceCream).Concat(other list to concat).ToList() + + List results = _iceCreams.Concat(this.MoreIceCream).Concat(this.EvenMoreIceCream).ToList(); - List results = _iceCreams.Concat(this.MoreIceCream).ToList(); - return results; // remove exception and write code here @@ -59,14 +64,14 @@ public List Question3() public List Question4() { - //TODO: Remove the duplicates using the .Distinct() placing just before the .ToList() - // copy the List declaration line from Question3 and add the .Distinct() into the chain. e.g. _iceCreams.Concat(this.MoreIceCream).Concat(other list to concat).Distinct().ToList() + // copy the List declaration line from Question3 and add the .Distinct() into the chain. + // e.g. _iceCreams.Concat(this.MoreIceCream).Concat(other list to concat).Distinct().ToList() // be sure to include the MoreIceCream and EvenMoreIceCream lists - List results = _iceCreams; - // remove exception and write code here + List results = _iceCreams.Concat(this.MoreIceCream).Concat(this.EvenMoreIceCream).Distinct().ToList(); + return results; }