diff --git a/csharp-fundamentals-maps.Main/Core.cs b/csharp-fundamentals-maps.Main/Core.cs index 8f4d84a..fc2c3ae 100644 --- a/csharp-fundamentals-maps.Main/Core.cs +++ b/csharp-fundamentals-maps.Main/Core.cs @@ -48,11 +48,8 @@ in the createPerson method public string getValue(string key) { - - - return string.Empty; - - + Dictionary map = createPerson(); + return map[key]; } //TODO: 2. Modify below method named hasKey that accepts two parameters: @@ -64,9 +61,12 @@ in the provided dictionary */ public bool hasKey(Dictionary dictionary, string isitthere) { + if (dictionary.ContainsKey(isitthere)) { + return true; + } return false; - - } + + } //TODO: 3. Modify method named getValueOrDefault that accepts two parameters: @@ -78,7 +78,10 @@ public bool hasKey(Dictionary dictionary, string isitthere) */ public int getValueOrDefault(Dictionary dictionary, string isitthere) { - return 0; + if (dictionary.ContainsKey(isitthere)) { + return dictionary[isitthere]; + } + return -1; } @@ -105,10 +108,13 @@ public List buildSecretPhrase(int[] numbers) map.Add(96, "nice"); // Write your code below this comment... - + foreach(var number in numbers) + { + results.Add(map[number]); + } // // ...and above this comment return results; } } -} +} \ No newline at end of file diff --git a/csharp-fundamentals-maps.Main/Extension.cs b/csharp-fundamentals-maps.Main/Extension.cs index 2deb96d..607f967 100644 --- a/csharp-fundamentals-maps.Main/Extension.cs +++ b/csharp-fundamentals-maps.Main/Extension.cs @@ -16,7 +16,7 @@ public Extension() _planets = new Dictionary(); _planets.Add("Jupiter", 5.2f); _planets.Add("Uranus", 19.2f); - _planets.Add("Pluto", 39f); + //_planets.Add("Pluto", 39f); _planets.Add("Mercury", 0.39f); _planets.Add("Saturn", 9.54f); _planets.Add("Earth", 1f); @@ -36,7 +36,10 @@ public Dictionary LettersInName() // the planet name and the number of letters in its name // iterate the _planets using a foreach object to load the result dictionary. - + foreach(var planet in _planets) + { + result.Add(planet.Key, planet.Key.Length); + } return result; } @@ -50,9 +53,11 @@ public Dictionary OrderedPlanets() { return _planets.OrderBy(x => x.Value).ToDictionary(x => x.Key, x => x.Value); } + public Dictionary OrderedPlanetsByDescending() { - return _planets.OrderBy(x => x.Value).ToDictionary(x => x.Key, x => x.Value); + return _planets.OrderByDescending(x => x.Value).ToDictionary(x => x.Key, x => x.Value); + } //TODO: modify the OrderedPlanetsByDescending so it is not dictionary is not doing an OrderBy but OrderByDescending @@ -67,8 +72,10 @@ public Dictionary OrderedPlanetsByDescending() public string FurthestFromTheSun() { - return string.Empty; + KeyValuePair result = OrderedPlanets().Last(); + return result.Key; } + public string ClosestToTheSun() { KeyValuePair result = OrderedPlanets().First();