diff --git a/Boolean.CSharp.Main/Core.cs b/Boolean.CSharp.Main/Core.cs index e09c536..2bcd2dc 100644 --- a/Boolean.CSharp.Main/Core.cs +++ b/Boolean.CSharp.Main/Core.cs @@ -30,7 +30,7 @@ public Car(string Make) } */ - Car car = new Car("Volkswagen"); + Car car = new Car("Volkswagen", "Beetle"); /* When the car in instantiated, the constructor is passed a string in this case Volkswagen which is a Make of car is passed in. Within the constructor the 'string Make' variable has scope within the constructor and assiged to the _make member now visible to the whole class @@ -41,6 +41,8 @@ Within the constructor the 'string Make' variable has scope within the construct //TODO: 1. Change car instantiation code above, pass in the make AND model. + + //TIP if you click on the Car class name above, right click and then select 'Go to Definition' it'll take you straight to the code @@ -132,10 +134,11 @@ What are the parameters and types? */ Aeroplane plane = new Aeroplane(); plane.FlightDetails("LHR", "JFK"); - + //TODO: 5. Call the FlightDetails method that sets the cancelled message and cancel the flight - - //write code here + + //write code here + plane.FlightDetails("Flight is cancelled"); return plane; } diff --git a/Boolean.CSharp.Main/Extension.cs b/Boolean.CSharp.Main/Extension.cs index 80c1db6..7c3a20f 100644 --- a/Boolean.CSharp.Main/Extension.cs +++ b/Boolean.CSharp.Main/Extension.cs @@ -12,18 +12,57 @@ public class Extension //Implement the following methods: //TODO: 1. add, which accepts two floats and returns a float (both floats added together) + public float add(float val1, float val2) + { + return val1 + val2; + } //TODO: 2. add, which accepts two doubles and returns a double (both doubles added together) + public double add(double val1, double val2) + { + return val1 + val2; + } //TODO: 3. subtract, which accepts two floats and returns a float (first float minus second float) + public float subtract(float val1, float val2) + { + return val1 - val2; + } //TODO: 4. subtract, which accepts a String and a char and returns a string with all instances of the provided char removed + public string subtract(string str, char c) + { + return str.Replace(c.ToString(), ""); + + } //TODO: 5. multiply, which accepts two ints and returns an int (first int multiplied by second int) + public int multiply(int val1, int val2) + { + return val1 * val2; + } //TODO: 6. multiply, which accepts a string and an int, and returns a string containing the provided string as many times as the provided int separated by a comma. E.g. multiply("Hello", 3) -> "Hello,Hello,Hello" - - //TODO: 7. multiply, which accepts an array of Strings that each contain a number, and an int. The method should return an array of ints that contain the value of multiplying each String number by the provided int E.g. multiply(["2", "7", "3"], 3) -> [6, 21, 9] + public string multiply(string str, int val) + { + string s = ""; + for(int i = 0; i < val; i++) + { + s = s + str + ","; + } + s = s.Remove(s.Length-1, 1); + return s; + } + //TODO: 7. multiply, which accepts an array of Strings that each contain a number, and an int. The method should return an array of ints that contain the value of multiplying each String number by the provided int E.g. multiply(["2", "7", "3"], 3) -> [6, 21, 9] + public int[] multiply(string[] str, int val) + { + int[] newlist = new int[str.Count()]; + for(int i = 0; i < str.Count(); i++) + { + newlist[i] = int.Parse(str[i]) * val; + } + return newlist; + } } } diff --git a/Boolean.CSharp.Main/Misc/Bicycle.cs b/Boolean.CSharp.Main/Misc/Bicycle.cs index f218c0e..2fbf815 100644 --- a/Boolean.CSharp.Main/Misc/Bicycle.cs +++ b/Boolean.CSharp.Main/Misc/Bicycle.cs @@ -8,8 +8,14 @@ namespace Boolean.CSharp.Main.Misc { public class Bicycle { + private int _wheelCount; + public Bicycle() + { + WheelCount = 2; + } + public int WheelCount { get; set; } } } diff --git a/Boolean.CSharp.Main/Misc/Car.cs b/Boolean.CSharp.Main/Misc/Car.cs index d810f5f..2dde0d8 100644 --- a/Boolean.CSharp.Main/Misc/Car.cs +++ b/Boolean.CSharp.Main/Misc/Car.cs @@ -17,10 +17,10 @@ public Car() _model = string.Empty; _make = string.Empty; } - public Car(string Make) + public Car(string Make, string Model) { _make = Make; - _model = string.Empty; + _model = Model; } public string Make diff --git a/Boolean.CSharp.Main/Misc/Motorbike.cs b/Boolean.CSharp.Main/Misc/Motorbike.cs index 6fcf20b..700ad8a 100644 --- a/Boolean.CSharp.Main/Misc/Motorbike.cs +++ b/Boolean.CSharp.Main/Misc/Motorbike.cs @@ -22,6 +22,7 @@ public Motorbike() public Motorbike(string Make, string Model) { + _cc = 373; _make = Make; _model = Model; } diff --git a/Boolean.CSharp.Main/Misc/Unicycle.cs b/Boolean.CSharp.Main/Misc/Unicycle.cs index 461cb23..f011476 100644 --- a/Boolean.CSharp.Main/Misc/Unicycle.cs +++ b/Boolean.CSharp.Main/Misc/Unicycle.cs @@ -9,7 +9,10 @@ namespace Boolean.CSharp.Main.Misc public class Unicycle { private string _nameOfUnicyclist; - + public Unicycle() + { + _nameOfUnicyclist = "Oyvind Husveg"; + } public string NameOfUnicyclist { get => _nameOfUnicyclist; set => _nameOfUnicyclist = value; } public int WheelCount { get; set; } = 1; }