Finished ig

Coordinate.cpp

@@ -1,11 +1,11 @@
 #include "Coordinate.h"
 
 Coordinate::Coordinate() {
-    x = 0;
+	x = 0;
-    y = 0;
+	y = 0;
 }
 
 Coordinate::Coordinate(const double X, const double Y) {
-    x = X;
+	x = X;
-    y = Y;
+	y = Y;
 }

Coordinate.h

@@ -1,12 +1,12 @@
 #ifndef COORDINATE_H
 #define COORDINATE_H
 class Coordinate {
-    public:
+  public:
-        Coordinate();
+	Coordinate();
-        Coordinate(const double X, const double Y);
+	Coordinate(const double X, const double Y);
 
-        double x;
+	double x;
-        double y;
+	double y;
 };
 
 #endif // COORDINATE_H

EquilateralTriangle.cpp

@@ -1,12 +1,14 @@
 #include "EquilateralTriangle.h"
+
 #include "GeometryUtils.h"
 
 bool EquilateralTriangle::validate() {
-    double sideOne = calculate_distance(mVertices[0], mVertices[1]);
+	double sideOne = calculate_distance(mVertices[0], mVertices[1]);
-    double sideTwo = calculate_distance(mVertices[1], mVertices[2]);
+	double sideTwo = calculate_distance(mVertices[1], mVertices[2]);
-    double sideThree = calculate_distance(mVertices[2], mVertices[0]);
+	double sideThree = calculate_distance(mVertices[2], mVertices[0]);
 
-    // Equilateral triangles must (a) Be a triangle and (b) Have three equal sides
+	// Equilateral triangles must (a) Be a triangle and (b) Have three equal
-    return lengths_make_triangle(sideOne, sideTwo, sideThree)
+	// sides
-        && (double_eq(sideOne, sideTwo) && double_eq(sideTwo, sideThree));
+	return lengths_make_triangle(sideOne, sideTwo, sideThree) &&
+		   (double_eq(sideOne, sideTwo) && double_eq(sideTwo, sideThree));
 }

EquilateralTriangle.h

@@ -2,8 +2,8 @@
 #define EQUILATERAL_TRIANGLE_H
 #include "Triangle.h"
 class EquilateralTriangle : public ATriangle {
-    public:
+  public:
-        bool validate() override;
+	bool validate() override;
 };
 
 #endif // EQUILATERAL_TRIANGLE_H

GeometryUtils.cpp

@@ -1,34 +1,33 @@
-#include <cmath>
-
 #include "GeometryUtils.h"
 
-const double EPSILON = std::numeric_limits<double>::epsilon();
+#include <cmath>
+
+const double EPSILON = 1e-7;
 
 bool double_eq(double first, double second) {
-    if (std::abs(first - second) <= EPSILON) {
+	if (std::abs(first - second) <= EPSILON) {
-        return true;
+		return true;
-    } else {
+	} else {
-        return false;
+		return false;
-    }
+	}
 }
 
-double calculate_distance(Coordinate& firstPoint, Coordinate& secondPoint) {
+double calculate_distance(Coordinate &firstPoint, Coordinate &secondPoint) {
-    return std::sqrt(
+	return std::sqrt(std::pow(secondPoint.x - firstPoint.x, 2) +
-        std::pow(secondPoint.x - firstPoint.x, 2)
+					 std::pow(secondPoint.y - firstPoint.y, 2));
-        + std::pow(secondPoint.y - firstPoint.y, 2)
-    );
 }
 
 bool lengths_make_triangle(double sideOne, double sideTwo, double sideThree) {
-    // Not a triangle if one of the side lengths is 0
+	// Not a triangle if one of the side lengths is 0
-    if (sideOne <= EPSILON || sideTwo <= EPSILON || sideThree <= EPSILON) {
+	if (sideOne <= 0 || sideTwo <= 0 || sideThree <= 0) {
-        return false;
+		return false;
-    }
+	}
 
-    // Not a triangle if the sum of any two side lengths >= the third length
+	// Not a triangle if the sum of any two side lengths >= the third length
-    if (sideOne + sideTwo <= sideThree || sideTwo + sideThree <= sideOne || sideThree + sideOne <= sideTwo) {
+	if (sideOne + sideTwo <= sideThree || sideTwo + sideThree <= sideOne ||
-        return false;
+		sideThree + sideOne <= sideTwo) {
-    }
+		return false;
+	}
 
-    return true;
+	return true;
 }

GeometryUtils.h

@@ -1,10 +1,12 @@
 #ifndef GEOMETRY_UTILS_H
 #define GEOMETRY_UTILS_H
 #include "Coordinate.h"
+
 #include <limits>
 
 /**
- * @brief Compares two doubles to see if they are equal, within the system epsilon range
+ * @brief Compares two doubles to see if they are equal, within the system
+ * epsilon range
  *
  * @param first The first value to compare
  * @param second The second value to compare
@@ -20,10 +22,11 @@ bool double_eq(double first, double second);
  * @param secondPoint The second coordinate point to compare the first to
  * @return double The pythagorean distance between the two points
  */
-double calculate_distance(Coordinate& firstPoint, Coordinate& secondPoint);
+double calculate_distance(Coordinate &firstPoint, Coordinate &secondPoint);
 
 /**
- * @brief Returns true if all of the side lengths in the specified array make a triangle
+ * @brief Returns true if all of the side lengths in the specified array make a
+ * triangle
  *
  * @param sideOne The first side to check for "triangle-ness"
  * @param sideTwo The second side to check for "triangle-ness"

IsoscelesTriangle.cpp

@@ -1,12 +1,15 @@
 #include "IsoscelesTriangle.h"
+
 #include "GeometryUtils.h"
 
 bool IsoscelesTriangle::validate() {
-    double sideOne = calculate_distance(mVertices[0], mVertices[1]);
+	double sideOne = calculate_distance(mVertices[0], mVertices[1]);
-    double sideTwo = calculate_distance(mVertices[1], mVertices[2]);
+	double sideTwo = calculate_distance(mVertices[1], mVertices[2]);
-    double sideThree = calculate_distance(mVertices[2], mVertices[0]);
+	double sideThree = calculate_distance(mVertices[2], mVertices[0]);
 
-    // Isosceles triangles must (a) Be a triangle and (b) Have two sides that equal each other
+	// Isosceles triangles must (a) Be a triangle and (b) Have two sides that
-    return lengths_make_triangle(sideOne, sideTwo, sideThree)
+	// equal each other
-        && (double_eq(sideOne, sideTwo) || double_eq(sideTwo, sideThree) || double_eq(sideThree, sideOne));
+	return lengths_make_triangle(sideOne, sideTwo, sideThree) &&
+		   (double_eq(sideOne, sideTwo) || double_eq(sideTwo, sideThree) ||
+			double_eq(sideThree, sideOne));
 }

IsoscelesTriangle.h

@@ -2,8 +2,8 @@
 #define ISOSCELES_TRIANGLE_H
 #include "Triangle.h"
 class IsoscelesTriangle : public ATriangle {
-    public:
+  public:
-        bool validate() override;
+	bool validate() override;
 };
 
 #endif // ISOSCELES_TRIANGLE_H

Makefile

@@ -3,7 +3,7 @@ SRC_FILES = main.cpp Coordinate.cpp Triangle.cpp Polygon.cpp ScaleneTriangle.cpp
 
 # Tyler's custom makefile extensions for CSCI200 (anyone can use these if they want)
 .DEFAULT_GOAL := all # Necessary so `make` doesn't run the "pack" target, as it is declared before "all"
-.PHONY: pack clean-run c run fmt
+.PHONY: pack clean-run c run fmt r
 
 ## Adds only the necessary files for build into a .tar.gz file, named appropriately
 ARCHIVED_FILES = Makefile $(SRC_FILES) $(SRC_FILES:.cpp=.h) $(SRC_FILES:.cpp=.hpp)
@@ -25,6 +25,7 @@ c: clean
 ## Simply builds and then executes the program
 run: all
 	./$(TARGET)
+r: run
 
 ## Formats all cpp, h, and hpp files with clang-format, using my personal clang-format config
 fmt:
@@ -43,7 +44,7 @@ setup: setupsrc depend
 
 # NO EDITS NEEDED BELOW THIS LINE
 
-CXX = g++
+CXX ?= g++
 CXXFLAGS = -O2
 CXXFLAGS_DEBUG = -g
 CXXFLAGS_WARN = -Wall -Wextra -Wunreachable-code -Wshadow -Wpedantic
@@ -106,7 +107,7 @@ main.o: main.cpp Coordinate.h EquilateralTriangle.h Triangle.h Polygon.h \
  IsoscelesTriangle.h Rhombus.h Quadrilateral.h ScaleneTriangle.h
 Coordinate.o: Coordinate.cpp Coordinate.h
 Triangle.o: Triangle.cpp Triangle.h Polygon.h Coordinate.h
-Polygon.o: Polygon.cpp Coordinate.h Polygon.h
+Polygon.o: Polygon.cpp Polygon.h Coordinate.h
 ScaleneTriangle.o: ScaleneTriangle.cpp ScaleneTriangle.h Triangle.h \
  Polygon.h Coordinate.h GeometryUtils.h
 GeometryUtils.o: GeometryUtils.cpp GeometryUtils.h Coordinate.h

Polygon.cpp

@@ -1,33 +1,30 @@
+#include "Polygon.h"
+
+#include "Coordinate.h"
+
 #include <SFML/Graphics/ConvexShape.hpp>
 #include <SFML/Graphics/RenderTarget.hpp>
 
-#include "Coordinate.h"
-#include "Polygon.h"
-
 APolygon::APolygon() {
-    _color = sf::Color::White;
+	_color = sf::Color::White;
-    mNumVertices = 0;
+	mNumVertices = 0;
-    mVertices = nullptr;
+	mVertices = nullptr;
 }
 
-APolygon::~APolygon() {
+APolygon::~APolygon() { delete[] mVertices; }
-    delete[] mVertices;
-}
 
-void APolygon::setColor(const sf::Color COLOR) {
+void APolygon::setColor(const sf::Color COLOR) { _color = COLOR; }
-    _color = COLOR;
-}
 
-void APolygon::draw(sf::RenderTarget& window) {
+void APolygon::draw(sf::RenderTarget &window) {
-    sf::ConvexShape shape(mNumVertices);
+	sf::ConvexShape shape(mNumVertices);
-    for (int i = 0; i < mNumVertices; i++) {
+	for (int i = 0; i < mNumVertices; i++) {
-        shape.setPoint(i, sf::Vector2f(mVertices[i].x, mVertices[i].y));
+		shape.setPoint(i, sf::Vector2f(mVertices[i].x, mVertices[i].y));
-    }
+	}
-    shape.setFillColor(_color);
+	shape.setFillColor(_color);
 
-    window.draw(shape);
+	window.draw(shape);
 }
 
 void APolygon::setCoordinate(const int IDX, const Coordinate COORD) {
-    mVertices[IDX] = COORD;
+	mVertices[IDX] = COORD;
 }

Polygon.h

@@ -1,51 +1,54 @@
 #ifndef POLYGON_H
 #define POLYGON_H
-#include <SFML/Graphics.hpp>
-
 #include "Coordinate.h"
 
-class APolygon {
+#include <SFML/Graphics.hpp>
-    public:
-        /**
-         * @brief Construct a new Polygon object, with a white color and 0 vertices
-         */
-        APolygon();
-        /**
-         * @brief Destroy the APolygon object
-         */
-        virtual ~APolygon();
 
-        /**
+class APolygon {
-         * @brief Sets the color of this polygon
+  public:
-         * 
+	/**
-         * @param COLOR The color to change the polygon to
+	 * @brief Construct a new Polygon object, with a white color and 0 vertices
-         */
+	 */
-        void setColor(const sf::Color COLOR);
+	APolygon();
-        /**
+	/**
-         * @brief Draws this polygon to a SFML render target
+	 * @brief Destroy the APolygon object
-         * 
+	 */
-         * @param window The render target to draw the polygon on
+	virtual ~APolygon();
-         */
+
-        void draw(sf::RenderTarget& window);
+	/**
-        /**
+	 * @brief Sets the color of this polygon
-         * @brief Sets the coordinate point at a specific vertex of this polygon
+	 *
-         * 
+	 * @param COLOR The color to change the polygon to
-         * @param IDX The index of the vertex to change
+	 */
-         * @param COORD The coordinate location to set the vertex to
+	void setColor(const sf::Color COLOR);
-         */
+	/**
-        void setCoordinate(const int IDX, const Coordinate COORD);
+	 * @brief Draws this polygon to a SFML render target
-        /**
+	 *
-         * @brief Returns if the created polygon is valid or not
+	 * @param window The render target to draw the polygon on
-         * 
+	 */
-         * @return true All of the vertices of the polygon line up with the current polygon type
+	void draw(sf::RenderTarget &window);
-         * @return false The vertices are invalid for the current polygon type
+	/**
-         */
+	 * @brief Sets the coordinate point at a specific vertex of this polygon
-        virtual bool validate() = 0;
+	 *
-    protected:
+	 * @param IDX The index of the vertex to change
-        short mNumVertices;
+	 * @param COORD The coordinate location to set the vertex to
-        Coordinate* mVertices;
+	 */
-    private:
+	void setCoordinate(const int IDX, const Coordinate COORD);
-        sf::Color _color;
+	/**
+	 * @brief Returns if the created polygon is valid or not
+	 *
+	 * @return true All of the vertices of the polygon line up with the current
+	 * polygon type
+	 * @return false The vertices are invalid for the current polygon type
+	 */
+	virtual bool validate() = 0;
+
+  protected:
+	short mNumVertices;
+	Coordinate *mVertices;
+
+  private:
+	sf::Color _color;
 };
 
 #endif // POLYGON_H

Quadrilateral.cpp

@@ -1,7 +1,8 @@
 #include "Quadrilateral.h"
+
 #include "Coordinate.h"
 
 AQuadrilateral::AQuadrilateral() {
-    mNumVertices = 4;
+	mNumVertices = 4;
-    mVertices = new Coordinate[4];
+	mVertices = new Coordinate[4];
 }

Quadrilateral.h

@@ -2,8 +2,8 @@
 #define QUADRILATERAL_H
 #include "Polygon.h"
 class AQuadrilateral : public APolygon {
-    public:
+  public:
-        AQuadrilateral();
+	AQuadrilateral();
 };
 
 #endif // QUADRILATERAL_H

Rhombus.cpp

@@ -1,26 +1,28 @@
 #include "Rhombus.h"
+
 #include "GeometryUtils.h"
 #include "IsoscelesTriangle.h"
 
 bool Rhombus::validate() {
-    double sideOne = calculate_distance(mVertices[0], mVertices[1]);
+	double sideOne = calculate_distance(mVertices[0], mVertices[1]);
-    double sideTwo = calculate_distance(mVertices[1], mVertices[2]);
+	double sideTwo = calculate_distance(mVertices[1], mVertices[2]);
-    double sideThree = calculate_distance(mVertices[2], mVertices[3]);
+	double sideThree = calculate_distance(mVertices[2], mVertices[3]);
-    double sideFour = calculate_distance(mVertices[3], mVertices[0]);
+	double sideFour = calculate_distance(mVertices[3], mVertices[0]);
 
-    IsoscelesTriangle firstTriangle;
+	IsoscelesTriangle firstTriangle;
-    firstTriangle.setCoordinate(0, mVertices[0]);
+	firstTriangle.setCoordinate(0, mVertices[0]);
-    firstTriangle.setCoordinate(1, mVertices[1]);
+	firstTriangle.setCoordinate(1, mVertices[1]);
-    firstTriangle.setCoordinate(2, mVertices[2]);
+	firstTriangle.setCoordinate(2, mVertices[2]);
 
-    IsoscelesTriangle secondTriangle;
+	IsoscelesTriangle secondTriangle;
-    secondTriangle.setCoordinate(0, mVertices[0]);
+	secondTriangle.setCoordinate(0, mVertices[0]);
-    secondTriangle.setCoordinate(1, mVertices[2]);
+	secondTriangle.setCoordinate(1, mVertices[2]);
-    secondTriangle.setCoordinate(2, mVertices[3]);
+	secondTriangle.setCoordinate(2, mVertices[3]);
 
-    // A valid rhombus must (a) Have vertices (0, 1, 2) make a valid isosceles triangle,
+	// A valid rhombus must (a) Have vertices (0, 1, 2) make a valid isosceles
-    // (b) Have vertices (0, 2, 3) make a valid isosceles triangle, and (c) Have all
+	// triangle, (b) Have vertices (0, 2, 3) make a valid isosceles triangle,
-    // sides of equal length
+	// and (c) Have all sides of equal length
-    return firstTriangle.validate() && secondTriangle.validate()
+	return firstTriangle.validate() && secondTriangle.validate() &&
-        && (double_eq(sideOne, sideTwo) && double_eq(sideTwo, sideThree) && double_eq(sideThree, sideFour));
+		   (double_eq(sideOne, sideTwo) && double_eq(sideTwo, sideThree) &&
+			double_eq(sideThree, sideFour));
 }

Rhombus.h

@@ -2,8 +2,8 @@
 #define RHOMBUS_H
 #include "Quadrilateral.h"
 class Rhombus : public AQuadrilateral {
-    public:
+  public:
-        bool validate() override;
+	bool validate() override;
 };
 
 #endif // RHOMBUS_H

ScaleneTriangle.cpp

@@ -1,12 +1,15 @@
 #include "ScaleneTriangle.h"
+
 #include "GeometryUtils.h"
 
 bool ScaleneTriangle::validate() {
-    double sideOne = calculate_distance(mVertices[0], mVertices[1]);
+	double sideOne = calculate_distance(mVertices[0], mVertices[1]);
-    double sideTwo = calculate_distance(mVertices[1], mVertices[2]);
+	double sideTwo = calculate_distance(mVertices[1], mVertices[2]);
-    double sideThree = calculate_distance(mVertices[2], mVertices[0]);
+	double sideThree = calculate_distance(mVertices[2], mVertices[0]);
 
-    // Scalene triangles must (a) Be a triangle and (b) Have no sides that equal each other
+	// Scalene triangles must (a) Be a triangle and (b) Have no sides that equal
-    return lengths_make_triangle(sideOne, sideTwo, sideThree)
+	// each other
-        && (!double_eq(sideOne, sideTwo) && !double_eq(sideTwo, sideThree) && !double_eq(sideThree, sideOne));
+	return lengths_make_triangle(sideOne, sideTwo, sideThree) &&
+		   (!double_eq(sideOne, sideTwo) && !double_eq(sideTwo, sideThree) &&
+			!double_eq(sideThree, sideOne));
 }

ScaleneTriangle.h

@@ -2,8 +2,8 @@
 #define SCALENE_TRIANGLE_H
 #include "Triangle.h"
 class ScaleneTriangle : public ATriangle {
-    public:
+  public:
-        bool validate() override;
+	bool validate() override;
 };
 
 #endif // SCALENE_TRIANGLE_H

Triangle.cpp

@@ -1,6 +1,6 @@
 #include "Triangle.h"
 
 ATriangle::ATriangle() {
-    mNumVertices = 3;
+	mNumVertices = 3;
-    mVertices = new Coordinate[3];
+	mVertices = new Coordinate[3];
 }

Triangle.h

@@ -2,8 +2,8 @@
 #define TRIANGLE_H
 #include "Polygon.h"
 class ATriangle : public APolygon {
-    public:
+  public:
-        ATriangle();
+	ATriangle();
 };
 
 #endif // TRIANGLE_H

main.cpp

@@ -14,6 +14,7 @@
 
 #include <fstream>
 #include <iostream>
+#include <memory>
 
 #include <cstdio>
 
@@ -32,10 +33,10 @@ int main(void) {
 		return 1;
 	}
 
-	std::vector<APolygon *> polygonList;
+	std::vector<std::unique_ptr<APolygon>> polygonList;
-	APolygon *currentPolygon;
+	std::unique_ptr<APolygon> currentPolygon;
 	char type;
-	double x1, y1, x2, y2, x3, y3, x4, y4;
+	double x1, y1, x2, y2, x3, y3, x4 = -1, y4 = -1;
 	int r, g, b;
 
 	while (true) {
@@ -51,16 +52,16 @@ int main(void) {
 
 		switch (type) {
 			case 'S':
-				currentPolygon = new ScaleneTriangle;
+				currentPolygon = std::make_unique<ScaleneTriangle>();
 				break;
 			case 'I':
-				currentPolygon = new IsoscelesTriangle;
+				currentPolygon = std::make_unique<IsoscelesTriangle>();
 				break;
 			case 'E':
-				currentPolygon = new EquilateralTriangle;
+				currentPolygon = std::make_unique<EquilateralTriangle>();
 				break;
 			case 'R':
-				currentPolygon = new Rhombus;
+				currentPolygon = std::make_unique<Rhombus>();
 				break;
 			default:
 				std::cout << "polygon is invalid - \"" << type << " " << x1
@@ -80,16 +81,21 @@ int main(void) {
 
 		if (!currentPolygon->validate()) {
 			std::cout << "polygon is invalid - \"" << type << " " << x1 << " "
-					  << y1 << " " << x2 << " " << y2 << " " << x3 << " " << y3
+					  << y1 << " " << x2 << " " << y2 << " " << x3 << " " << y3;
-					  << " " << x4 << " " << y4 << " " << r << " " << g << " "
+			if (x4 != -1) {
-					  << b << "\"" << std::endl;
+				std::cout << " " << x4 << " " << y4;
+			}
+			std::cout << " " << r << " " << g << " " << b << "\"" << std::endl;
 		} else {
 			polygonList.push_back(currentPolygon);
 		}
 	};
 
 	// Start SFML Rendering logic
-	sf::RenderWindow window( sf::VideoMode(640, 640), ":3" );
+	sf::RenderWindow window(
+		sf::VideoMode(640, 640), ":3",
+		sf::Style::Titlebar | sf::Style::Close // Disable window resize
+	);
 	window.setVerticalSyncEnabled(true);
 
 	sf::Event event;