diff --git a/Boolean.CSharp.Main/Core.cs b/Boolean.CSharp.Main/Core.cs index e09c536..e3d716c 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"); /* 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 @@ -38,12 +38,12 @@ Within the constructor the 'string Make' variable has scope within the construct e.g. In the Constructor signature: public Car(string Make, string Model) e.g. Instantiating: Car car = new Car("Volkswagen", "Beetle"); */ - - //TODO: 1. Change car instantiation code above, pass in the make AND model. + //TODO: 1. Change car instantiation code above, pass in the make AND model. + Car car = new Car("Volkswagen", "Beetle"); //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 - + return car; @@ -92,7 +92,7 @@ public Bicycle Question3() //See there is somewhere to store the number of wheels the bike has //but no constructor to set this //TODO: 3. Add a constructor to the Bicycle class that populates the _wheelCount variable - Bicycle bike = new Bicycle(); + Bicycle bike = new Bicycle(2); return bike; @@ -108,7 +108,7 @@ public Unicycle Question4() //TIP see we already have an internal member for the unicyclist name: _nameOfUnicyclist so you can use this to store the name internally // it is good practice to name internal class variable with an _ at the beginning - Unicycle unicycle = new Unicycle(); + Unicycle unicycle = new Unicycle("Jonatan"); @@ -132,8 +132,9 @@ 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 + plane.FlightDetails("Flight is cancelled"); //write code here diff --git a/Boolean.CSharp.Main/Extension.cs b/Boolean.CSharp.Main/Extension.cs index 80c1db6..61cbebf 100644 --- a/Boolean.CSharp.Main/Extension.cs +++ b/Boolean.CSharp.Main/Extension.cs @@ -12,18 +12,60 @@ 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 numOne, float numTwo) + { + return numOne + numTwo; + } //TODO: 2. add, which accepts two doubles and returns a double (both doubles added together) + public double add (double numOne, double numTwo) + { + return numOne + numTwo; + } //TODO: 3. subtract, which accepts two floats and returns a float (first float minus second float) + public float subtract(float numOne, float numTwo) + { + return numOne - numTwo; + } //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 text, char c) + { + string result = text.Replace(c.ToString(), ""); + return result; + } //TODO: 5. multiply, which accepts two ints and returns an int (first int multiplied by second int) + public int multiply (int numOne, int numTwo) + { + return numOne * numTwo; + } //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 text, int number) + { + + string result = $"{text}"; + for (int i = 0; i < number-1; i++) + { + result += $",{text}"; + Console.WriteLine(result); + } + return result; + } + //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[] numberList, int number) + { + int[] result = new int[numberList.Length]; + for (int i = 0; i < numberList.Length; i++) + { + result[i] = int.Parse(numberList[i]) * number; + } + + return result; + } } } diff --git a/Boolean.CSharp.Main/Misc/Bicycle.cs b/Boolean.CSharp.Main/Misc/Bicycle.cs index f218c0e..7d8efcc 100644 --- a/Boolean.CSharp.Main/Misc/Bicycle.cs +++ b/Boolean.CSharp.Main/Misc/Bicycle.cs @@ -11,5 +11,11 @@ public class Bicycle private int _wheelCount; public int WheelCount { get; set; } + + public Bicycle(int wheelCount) + { + _wheelCount = wheelCount; + WheelCount = wheelCount; + } } } 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..9aa7766 100644 --- a/Boolean.CSharp.Main/Misc/Unicycle.cs +++ b/Boolean.CSharp.Main/Misc/Unicycle.cs @@ -12,5 +12,10 @@ public class Unicycle public string NameOfUnicyclist { get => _nameOfUnicyclist; set => _nameOfUnicyclist = value; } public int WheelCount { get; set; } = 1; + + public Unicycle(string nameOfUnicyclist) + { + _nameOfUnicyclist = nameOfUnicyclist; + } } }