diff --git a/Boolean.CSharp.Main/Core.cs b/Boolean.CSharp.Main/Core.cs index e09c536..d19d06f 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 @@ -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("Snorre"); @@ -132,10 +132,10 @@ 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 + plane.FlightDetails("The plane is cancelled."); + //write code here return plane; } diff --git a/Boolean.CSharp.Main/Extension.cs b/Boolean.CSharp.Main/Extension.cs index 80c1db6..41cdde0 100644 --- a/Boolean.CSharp.Main/Extension.cs +++ b/Boolean.CSharp.Main/Extension.cs @@ -7,23 +7,62 @@ 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 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 str, char c) + { + string result = ""; + foreach (char ch in str) + { + if (ch != c) + { + result += ch; + } + } + 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 str, int num) + { + string result = ""; + for (int i = 0; i < num; i++) + { + if(i != 0) + { + result += "," + str; + } + else + { + result += str; + } + + } + 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[] collection, int num) + { + int[] result = new int[collection.Length]; + for (int i = 0;i < collection.Length; i++) + { + result[i] = multiply(int.Parse(collection[i]), num); + } + return result; + } } } diff --git a/Boolean.CSharp.Main/Misc/Bicycle.cs b/Boolean.CSharp.Main/Misc/Bicycle.cs index f218c0e..7c0517e 100644 --- a/Boolean.CSharp.Main/Misc/Bicycle.cs +++ b/Boolean.CSharp.Main/Misc/Bicycle.cs @@ -8,8 +8,20 @@ namespace Boolean.CSharp.Main.Misc { public class Bicycle { + public Bicycle() + { + _wheelCount = 2; + } + public Bicycle(int wheelcount) + { + _wheelCount = wheelcount; + } private int _wheelCount; - public int WheelCount { get; set; } + public int WheelCount + { + get => _wheelCount; + set => _wheelCount = value; + } } } diff --git a/Boolean.CSharp.Main/Misc/Car.cs b/Boolean.CSharp.Main/Misc/Car.cs index d810f5f..4f129ac 100644 --- a/Boolean.CSharp.Main/Misc/Car.cs +++ b/Boolean.CSharp.Main/Misc/Car.cs @@ -22,6 +22,11 @@ public Car(string Make) _make = Make; _model = string.Empty; } + public Car(string Make, string Model) + { + _make = Make; + _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..af74e9f 100644 --- a/Boolean.CSharp.Main/Misc/Unicycle.cs +++ b/Boolean.CSharp.Main/Misc/Unicycle.cs @@ -10,6 +10,16 @@ public class Unicycle { private string _nameOfUnicyclist; + public Unicycle() + { + _nameOfUnicyclist = string.Empty; + } + + public Unicycle(string nameOfUnicyclist) + { + _nameOfUnicyclist = nameOfUnicyclist; + } + public string NameOfUnicyclist { get => _nameOfUnicyclist; set => _nameOfUnicyclist = value; } public int WheelCount { get; set; } = 1; }