Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions Boolean.CSharp.Main/Core.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;

Expand All @@ -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("Vegard");



Expand All @@ -132,10 +132,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("Planes from LHR to JFK is cancelled");

return plane;
}
Expand Down
48 changes: 41 additions & 7 deletions Boolean.CSharp.Main/Extension.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,61 @@


using System.Reflection.Metadata.Ecma335;
using System.Security;

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 stringOne, char charOne)
{
return stringOne.Replace(charOne.ToString(), "");
}
//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"

public string multiply(string stringOne, int num)
{
string newString = stringOne + ",";
for (int i = 1; i < num-1; i++)
{
newString += stringOne + ",";
}
newString += stringOne;
return newString;
}
//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[] stringArray, int num)
{
int[] array = new int[num];
for (int i = 0; i < stringArray.Length; i++)
{
array[i] = int.Parse(stringArray[i]) * num;
}
return array;
}
}
}
11 changes: 10 additions & 1 deletion Boolean.CSharp.Main/Misc/Bicycle.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,22 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using static System.Net.Mime.MediaTypeNames;

namespace Boolean.CSharp.Main.Misc
{
public class Bicycle
{
private int _wheelCount;

public int WheelCount { get; set; }
public Bicycle(int wheelcount)
{
_wheelCount = wheelcount;
}
public int WheelCount
{
get => _wheelCount;
set => _wheelCount = value;
}
}
}
4 changes: 2 additions & 2 deletions Boolean.CSharp.Main/Misc/Car.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions Boolean.CSharp.Main/Misc/Motorbike.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ public Motorbike()

public Motorbike(string Make, string Model)
{
_cc = 373;
_make = Make;
_model = Model;
}
Expand Down
4 changes: 4 additions & 0 deletions Boolean.CSharp.Main/Misc/Unicycle.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ public class Unicycle
{
private string _nameOfUnicyclist;

public Unicycle(string name)
{
_nameOfUnicyclist = name;
}
public string NameOfUnicyclist { get => _nameOfUnicyclist; set => _nameOfUnicyclist = value; }
public int WheelCount { get; set; } = 1;
}
Expand Down
2 changes: 1 addition & 1 deletion Boolean.CSharp.Test/ExtensionTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public void TestQuestion6()
Extension extension = new Extension();

string result = extension.multiply(source, 3);

Assert.IsTrue("Hello,Hello,Hello" == result);
}
[Test]
Expand Down
Loading