diff --git a/Boolean.CSharp.Main/Core.cs b/Boolean.CSharp.Main/Core.cs index e09c536..945a96e 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,13 @@ 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. + 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; @@ -75,7 +76,7 @@ Having to 2 constructors is an example of Overloading. */ //TODO 2. Ensure both constructors on the Motorbike class set the cc of the Motorcycle to 373. - Motorbike myMotorbike = new Motorbike("KTM", "Duke"); + Motorbike myMotorbike = new Motorbike("KTM", "Duke", 373); if(myMotorbike.CC > 0) { @@ -92,7 +93,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(4); return bike; @@ -108,10 +109,8 @@ 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("Aziz"); - - return unicycle; } @@ -132,12 +131,14 @@ 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 - return plane; + //write code here + Aeroplane Cmessage = new Aeroplane(); + Cmessage.FlightDetails("Flight Cancelled"); + + return Cmessage; } } diff --git a/Boolean.CSharp.Main/Extension.cs b/Boolean.CSharp.Main/Extension.cs index 80c1db6..4785c2b 100644 --- a/Boolean.CSharp.Main/Extension.cs +++ b/Boolean.CSharp.Main/Extension.cs @@ -7,23 +7,55 @@ namespace Boolean.CSharp.Main { 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 num1, float num2) + { + return num1 + num2; + } //TODO: 2. add, which accepts two doubles and returns a double (both doubles added together) + public double add(double num1, double num2) + { + return num1 + num2; + } - //TODO: 3. subtract, which accepts two floats and returns a float (first float minus second float) - //TODO: 4. subtract, which accepts a String and a char and returns a string with all instances of the provided char removed + //TODO: 3. subtract, which accepts two floats and returns a float (first float minus second float) + + public float subtract(float num1, float num2) + { + return num1 - num2; + } + + //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 inputString, char charToRemove) + { + return inputString.Replace(charToRemove.ToString(), string.Empty); + } //TODO: 5. multiply, which accepts two ints and returns an int (first int multiplied by second int) + public int multiply(int num1, int num2) + { + return num1 * num2; + } + //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 inputString, int repeatCount) + { + return string.Join(",", new string[repeatCount].Select(_ => inputString)); + } + + //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[] stringNumbers, int multiplier) + { + return Array.ConvertAll(stringNumbers, s => int.Parse(s) * multiplier); + } } } diff --git a/Boolean.CSharp.Main/Misc/Bicycle.cs b/Boolean.CSharp.Main/Misc/Bicycle.cs index f218c0e..a576888 100644 --- a/Boolean.CSharp.Main/Misc/Bicycle.cs +++ b/Boolean.CSharp.Main/Misc/Bicycle.cs @@ -10,6 +10,17 @@ public class Bicycle { private int _wheelCount; - public int WheelCount { get; set; } + + public Bicycle(int wheelCount) + { + _wheelCount = wheelCount; + } + + // Public property to access the wheel count + public int WheelCount + { + get { return _wheelCount; } + set { _wheelCount = value; } + } } } diff --git a/Boolean.CSharp.Main/Misc/Car.cs b/Boolean.CSharp.Main/Misc/Car.cs index b50f8f7..bffa467 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 { get => _make; set => _make = value; } diff --git a/Boolean.CSharp.Main/Misc/Motorbike.cs b/Boolean.CSharp.Main/Misc/Motorbike.cs index b57180f..3b34874 100644 --- a/Boolean.CSharp.Main/Misc/Motorbike.cs +++ b/Boolean.CSharp.Main/Misc/Motorbike.cs @@ -11,7 +11,7 @@ public class Motorbike { private string _make; private string _model; - private int _cc = 0; + private int _cc = 373; public Motorbike() @@ -20,15 +20,28 @@ public Motorbike() _make = string.Empty; _model = string.Empty; } - public Motorbike(string Make, string Model) - { + public Motorbike(string Make, string Model, int CC) + + { + _cc = CC; _make = Make; _model = Model; } - public string Make { get; } - public string Model { get; } - public int CC { get; } + public string Make + { + get { return _make; } + } + + public string Model + { + get { return _model; } + } + + public int CC + { + get { return _cc; } + } } } diff --git a/Boolean.CSharp.Main/Misc/Unicycle.cs b/Boolean.CSharp.Main/Misc/Unicycle.cs index 461cb23..2ed84ce 100644 --- a/Boolean.CSharp.Main/Misc/Unicycle.cs +++ b/Boolean.CSharp.Main/Misc/Unicycle.cs @@ -10,6 +10,11 @@ public class Unicycle { private string _nameOfUnicyclist; + public Unicycle(string riderName) + { + _nameOfUnicyclist = riderName; + } + public string NameOfUnicyclist { get => _nameOfUnicyclist; set => _nameOfUnicyclist = value; } public int WheelCount { get; set; } = 1; }