diff --git a/csharp-fundamentals-lists.Main/Core.cs b/csharp-fundamentals-lists.Main/Core.cs index 185c6d3..d7620d5 100644 --- a/csharp-fundamentals-lists.Main/Core.cs +++ b/csharp-fundamentals-lists.Main/Core.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Reflection.Metadata.Ecma335; using System.Text; using System.Threading.Tasks; @@ -31,17 +32,17 @@ 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; } 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(); + //TODO: find the lists method that returns the number of ice creams in the list and return this. + return _iceCreams.Count; } public List Question3() { @@ -50,7 +51,9 @@ public List Question3() //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).ToList(); - + + results = _iceCreams.Concat(this.EvenMoreIceCream).ToList(); + return results; // remove exception and write code here @@ -63,9 +66,10 @@ 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() // be sure to include the MoreIceCream and EvenMoreIceCream lists + List results = _iceCreams.Concat(this.MoreIceCream).ToList(); + results = _iceCreams.Concat(this.EvenMoreIceCream).Distinct().ToList(); - List results = _iceCreams; // remove exception and write code here return results; }