-> Declared the trivial destructors for all classes

-> Fully formatted toString methods for all classes
-> Added test cases in the main method for testing the implementations
-> Added validation on value for engine sizes in the  Car class

Author: eparrarod

Bicycle.cpp

@@ -5,10 +5,14 @@
 #include "Bicycle.h"
 
 
-Bicycle::Bicycle(int gearCount) {
+Bicycle::Bicycle(string brand, string model, int gearCount) {
+    setBrand(brand);
+    setModel(model);
     setGearCount(gearCount);
 }
 
+Bicycle::~Bicycle() = default;
+
 int Bicycle::getGearCount() {
     return myGearCount;
 }
@@ -24,5 +28,7 @@ double Bicycle::mileageEstimate(double time) {
 }
 
 string Bicycle::toString() {
-    return getBrand() + " " + getModel();
+    string s = "-> Bicycle\n\t";
+    return "-> Bicycle\n" + Vehicle::toString() + "\n\tGears: " +
+           to_string(myGearCount);
 }

Bicycle.h

@@ -13,7 +13,9 @@ class Bicycle : public Vehicle {
     int myGearCount;
 
 public:
-    explicit Bicycle(int gearCount = 1);
+    explicit Bicycle(string brand, string model, int gearCount = 1);
+
+    virtual ~Bicycle();
     int getGearCount();
     void setGearCount(int gearCount);
     virtual double mileageEstimate(double time);

Car.cpp

@@ -4,21 +4,33 @@
 
 #include "Car.h"
 
-
 Car::Car() {
     myEngineSize = "unknown";
+    setBrand("Custom");
+    setModel("VTx");
 }
 
-Car::Car(string engineSize) {
+Car::Car(string brand, string model, string fuelType, string engineSize) {
+    setBrand(brand);
+    setModel(model);
+    setFuelType(fuelType);
     setEngineSize(engineSize);
 }
 
+Car::~Car() = default;
+
 string Car::getEngineSize() {
     return myEngineSize;
 }
 
 void Car::setEngineSize(string engineSize) {
-    myEngineSize = engineSize;
+    if (engineSize == "unknown" || engineSize == "small" ||
+        engineSize == "medium" || engineSize == "grande") {
+        myEngineSize = engineSize;
+    } else {
+        myEngineSize = "unknown";
+    }
+
 }
 
 double Car::mileageEstimate(double time) {
@@ -27,4 +39,9 @@ double Car::mileageEstimate(double time) {
         mileage += mileage * 0.05;
     }
     return mileage;
+}
+
+string Car::toString() {
+    return "-> Car\n" + PoweredVehicle::toString() + "\n\tEngine Size: " +
+           getEngineSize();
 }

Car.h

@@ -11,19 +11,18 @@ class Car : public PoweredVehicle {
 
 private:
     string myEngineSize;
+
 public:
     Car();
 
-    explicit Car(string engineSize);
+    explicit Car(string brand, string model, string fuelType,
+                 string engineSize);
 
+    virtual ~Car();
     string getEngineSize();
-
     void setEngineSize(string engineSize);
-
     virtual double mileageEstimate(double time);
-
     virtual string toString();
-
 };
 
 

PoweredVehicle.cpp

@@ -1,4 +1,23 @@
 //
 // Created by Esteban Parra on 9/5/19.
 //
+#include "PoweredVehicle.h"
 
+
+PoweredVehicle::PoweredVehicle() {
+    setFuelType("unknown");
+}
+
+PoweredVehicle::~PoweredVehicle() = default;
+
+string PoweredVehicle::getFuelType() {
+    return fuelType;
+}
+
+void PoweredVehicle::setFuelType(string fuel) {
+    fuelType = fuel;
+}
+
+string PoweredVehicle::toString() {
+    return Vehicle::toString() + "\n\tFuelType: " + getFuelType();
+}

PoweredVehicle.h

@@ -14,10 +14,13 @@ protected :
 public:
     PoweredVehicle();
 
+    virtual ~PoweredVehicle();
     virtual string toString();
-
     virtual double mileageEstimate(double time) = 0;
 
+    string getFuelType();
+
+    void setFuelType(string fuel);
 };
 
 

Vehicle.cpp

@@ -9,6 +9,8 @@ Vehicle::Vehicle(string brand, string model) {
     setModel(model);
 }
 
+Vehicle::~Vehicle() = default;
+
 string Vehicle::getBrand() {
     return myBrand;
 }
@@ -26,5 +28,5 @@ void Vehicle::setModel(string model) {
 }
 
 string Vehicle::toString() {
-    return getBrand() + " " + getModel();
+    return "\tBrand= " + getBrand() + "\n\tModel= " + getModel();
 }

Vehicle.h

@@ -16,11 +16,12 @@ private :
 
 public:
     explicit Vehicle(string brand = "unknown", string model = "unknown");
+
+    virtual ~Vehicle();
     string getBrand();
     void setBrand(string brand);
     string getModel();
     void setModel(string model);
-
     virtual string toString();
     virtual double mileageEstimate(
             double time) = 0; // Method that computes how many miles can be traversed by the vehicle in the given amount of time. The time parameter is given in minutes

main.cpp

@@ -1,6 +1,40 @@
 #include <iostream>
+#include "Car.h"
+#include "Bicycle.h"
+
+void printVehiclesRoster(Vehicle **vehicles, int size);
 
 int main() {
-    std::cout << "Hello, World!" << std::endl;
+    std::cout << "Driving simulator" << std::endl;
+    int size = 6;
+    int capacity = 10;
+    Vehicle **vehiclesArray = new Vehicle *[capacity];
+
+    vehiclesArray[0] = new Car();
+    vehiclesArray[1] = new Bicycle("eTAP", "P5X");
+    vehiclesArray[2] = new Bicycle("R&A", "Dogma F8", 5);
+    vehiclesArray[3] = new Car("Tesla", "T2", "electricity", "large");
+    vehiclesArray[4] = new Bicycle("Mizuno", "Wave", 10);
+    vehiclesArray[5] = new Car("BMW", "X5", "diesel", "grande");
+
+    printVehiclesRoster(vehiclesArray, size);
+
+    if (vehiclesArray != 0) { // If it is not a null pointer
+        // do not use nullptr. It is not supported on linprog
+        for (int i = 0; i < size; i++) {
+            delete vehiclesArray[i];
+        }
+        delete[] vehiclesArray;
+    }
     return 0;
+}
+
+void printVehiclesRoster(Vehicle **vehicles, int size) {
+    double simulatedDistance = 130;
+    for (int i = 0; i < size; i++) {
+        cout << i << " " << vehicles[i]->toString() << endl;
+        cout << "\tWould travel: "
+             << vehicles[i]->mileageEstimate(simulatedDistance) << " miles in "
+             << simulatedDistance << " seconds" << endl;
+    }
 }