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
17 changes: 8 additions & 9 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", "Bettle");
/* 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 All @@ -43,9 +43,6 @@ Within the constructor the 'string Make' variable has scope within the construct

//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;

}
Expand Down Expand Up @@ -76,6 +73,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");
myMotorbike.CC = 373;

if(myMotorbike.CC > 0)
{
Expand All @@ -93,6 +91,7 @@ public Bicycle Question3()
//but no constructor to set this
//TODO: 3. Add a constructor to the Bicycle class that populates the _wheelCount variable
Bicycle bike = new Bicycle();
bike.WheelCount = 2;

return bike;

Expand All @@ -109,9 +108,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.NameOfUnicyclist = "Isabell";



return unicycle;

}
Expand All @@ -132,10 +130,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("Cancelled due weather");

return plane;
}
Expand Down
61 changes: 56 additions & 5 deletions Boolean.CSharp.Main/Extension.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@



using Boolean.CSharp.Main.Misc;
using NUnit.Framework.Internal.Execution;
using System.Reflection.Metadata.Ecma335;
using System.Security.Cryptography.X509Certificates;
using System.Xml.Linq;

namespace Boolean.CSharp.Main
{
Expand All @@ -12,18 +16,65 @@ 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 f1, float f2)
{
return f1 + f2;

}
//TODO: 2. add, which accepts two doubles and returns a double (both doubles added together)
public double add(double d1, double d2)
{
return d1 + d2;

//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 f1, float f2)
{
return f1 - f2;

}

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

}

//TODO: 5. multiply, which accepts two ints and returns an int (first int multiplied by second int)
public int multiply(int i1, int i2)
{
return i1 * i2;
}

//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 s, int i2)
{
string result = "";

for (int i = 0; i < i2; i++) {
result = String.Concat(result, s);

if (i < i2 - 1)
{
result = String.Concat(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[] s, int i2)
{
int[] newArray = new int[s.Length];
for (int i = 0; i < s.Length; i++)
{
int number = int.Parse(s[i]);
newArray[i] = number * i2;
}

return newArray;
}
}
}
}
8 changes: 6 additions & 2 deletions Boolean.CSharp.Main/Misc/Bicycle.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ public class Bicycle
{
private int _wheelCount;

public int WheelCount { get; set; }
public int WheelCount
{
get { return _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 @@ -37,6 +37,7 @@ public string Model
public int CC
{
get { return _cc; }
set { _cc = value; }
}
}
}
4 changes: 4 additions & 0 deletions Boolean.CSharp.Test/ExtensionTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@ public void TestQuestion6()

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

Console.Write(result);

Assert.IsTrue("Hello,Hello,Hello" == result);
}
[Test]
Expand All @@ -103,6 +105,8 @@ public void TestQuestion7()

int[] answer = { 6, 21, 9 };

Console.Write("Result is " + result);

Assert.IsTrue(result.SequenceEqual(answer));


Expand Down
Loading