Adding the changes for lab 3

Author: DarthRubik

Shapes/Box.cpp

@@ -1,23 +1,72 @@
 #include "Box.hpp"
+#include "assert.h"
 
 
-
+Box::Box()
+{
+	this->setLength(0);
+	this->setWidth(0);
+	this->setHeight(0);
+}
 Box::Box(std::istream& stream)
 {
+	int length;
+	int width;
+	int height;
+
 	//Input from the stream
 	//the dimensions of the box
-	stream >> this->length;
-	stream >> this->width;
-	stream >> this->height;
-}
+	stream >> length;
+	stream >> width;
+	stream >> height;
 
-int Box::getSurfaceArea()
+	this->setLength(length);
+	this->setWidth(width);
+	this->setHeight(height);
+}
+Box::Box(int l,int w,int h)
+{
+	this->setLength(l);
+	this->setWidth(w);
+	this->setHeight(h);
+}
+Box::Box(const Box& other) : length(other.length), width(other.width), height(other.height)
+{
+}
+int Box::getLength() const
+{
+	return this->length;
+}
+int Box::getWidth() const
+{
+	return this->width;
+}
+int Box::getHeight() const
+{
+	return this->height;
+}
+void Box::setLength(int value)
+{
+	assert(value >= 0);
+	this->length = value;
+}
+void Box::setWidth(int value)
+{
+	assert(value >= 0);
+	this->width = value;
+}
+void Box::setHeight(int value)
+{
+	assert(value >= 0);
+	this->height = value;
+}
+int Box::getSurfaceArea() const
 {
 	return 2*(this->length*this->width + 
 		  this->width*this->height + 
 		  this->height*this->length);
 }
-int Box::getVolume()
+int Box::getVolume() const
 {
 	return this->length*this->width*this->height;
 }

Shapes/Box.hpp

@@ -1,3 +1,6 @@
+#ifndef BOX_HPP
+#define BOX_HPP
+
 #include <iostream>
 
 
@@ -7,16 +10,28 @@ class Box
 	int width;
 	int height;
 public:
-	//Default constructors and destructors
-	Box() = default;
+	Box();
+	Box(int length,int width, int height);
+	Box(const Box& other);
 	virtual ~Box() = default;
 
+
 	//This constructor uses the stream
 	//to find the dimensions of the box
 	Box(std::istream& stream);
 
+	int getLength() const;
+	int getWidth() const;
+	int getHeight() const;
+
+	void setLength(int value);
+	void setWidth(int value);
+	void setHeight(int value);
+
 	//These functions do exactly what
 	//they sound like
-	int getSurfaceArea();
-	int getVolume();
+	int getSurfaceArea() const;
+	int getVolume() const;
 };
+
+#endif

Shapes/Rectangle.cpp

@@ -1,20 +1,57 @@
 #include "Rectangle.hpp"
 #include <iostream>
+#include "assert.h"
 
 
-int Rectangle::getArea()
+int Rectangle::getArea() const
 {
 	return this->length*this->width;
 }
 
-int Rectangle::getPerimeter()
+int Rectangle::getPerimeter() const
 {
 	return this->length*2 + this->width*2;
 }
+int Rectangle::getLength() const
+{
+	return this->length;
+}
+int Rectangle::getWidth() const
+{
+	return this->width;
+}
+void Rectangle::setLength(int value) 
+{
+	assert(value >= 0);
+	this->length = value;
+}
+void Rectangle::setWidth(int value)
+{
+	assert(value >= 0);
+	this->width = value;
+}
 
 Rectangle::Rectangle(std::istream& stream)
 {
+	int length;
+	int width;
 	//Input from the stream the length and width
-	stream >> this->length;
-	stream >> this->width;
+	stream >> length;
+	stream >> width;
+
+	this->setLength(length);
+	this->setWidth(width);
+}
+Rectangle::Rectangle()
+{
+	this->setLength(0);
+	this->setWidth(0);
+}
+Rectangle::Rectangle(int length, int width)
+{
+	this->setLength(length);
+	this->setWidth(width);
+}
+Rectangle::Rectangle(const Rectangle& other) : length(other.length), width(other.width)
+{
 }

Shapes/Rectangle.hpp

@@ -1,3 +1,5 @@
+#ifndef RECTANGLE_HPP
+#define RECTANGLE_HPP
 #include <iostream>
 
 
@@ -8,15 +10,24 @@ class Rectangle
 public:
 	//These functions do exactly what
 	//you think they do
-	int getArea();
-	int getPerimeter();
+	int getArea() const;
+	int getPerimeter() const;
+
+	int getLength() const;
+	int getWidth() const;
+
+	void setLength(int value);
+	void setWidth(int value);
 
 	//This constructor will consume 
 	//some chars from the input stream
 	//to construct the box
 	Rectangle(std::istream& stream);
 
-	//Default constructor and destructor
-	Rectangle() = default;
+	Rectangle();
+	Rectangle(int l,int w);
+	Rectangle(const Rectangle& other);
 	virtual ~Rectangle() = default;
 };
+
+#endif

Shapes/ShapesMain.cpp

@@ -3,6 +3,25 @@
 #include "Box.hpp"
 #include "Rectangle.hpp"
 
+void PrintRectangle(Rectangle rectangle)
+{
+	std::cout << "Rectangle:\n"
+		<< "\tLength: " << rectangle.getLength() << '\n'
+		<< "\tWidth : " << rectangle.getWidth() << '\n'
+		<< "\tArea: " << rectangle.getArea() << '\n'
+		<< "\tPerimeter: " << rectangle.getPerimeter() 
+		<< std::endl << std::endl;
+}
+void PrintBox(Box box)
+{
+	std::cout << "Box:\n"
+		<< "\tLength: " << box.getLength() << '\n'
+		<< "\tWidth : " << box.getWidth() << '\n'
+		<< "\tHeight : " << box.getHeight() << '\n'
+		<< "\tVolume: " << box.getVolume() << '\n'
+		<< "\tSurface Area: " << box.getSurfaceArea() 
+		<< std::endl << std::endl;
+}
 
 int main(int arc, char** arv)
 {
@@ -33,18 +52,12 @@ int main(int arc, char** arv)
 			if (type == 'R')
 			{
 				Rectangle rectangle(file);
-				std::cout << "Rectangle:\n"
-					  << "\tArea: " << rectangle.getArea() << '\n'
-					  << "\tPerimeter: " << rectangle.getPerimeter() 
-					  << std::endl << std::endl;
+				PrintRectangle(rectangle);
 			}
 			else
 			{
 				Box box(file);
-				std::cout << "Box:\n"
-					  << "\tVolume: " << box.getVolume() << '\n'
-					  << "\tSurface Area: " << box.getSurfaceArea() 
-					  << std::endl << std::endl;
+				PrintBox(box);
 			}
 		}
 	}