Add files via upload

headers/output.hpp

@@ -0,0 +1,16 @@
+#ifndef HEADERS_OUTPUT
+#define HEADERS_OUTPUT
+
+#include <string>
+
+
+void printLabel(int, int);
+void printSeparators(int, int, std::string);
+
+void printHeader(int, int, int);
+void printFooter(int, int, int);
+
+
+#endif
+
+

src/main.cpp

@@ -3,6 +3,7 @@
 #include <cmath>
 
 #include "../headers/genericFunctions.hpp"
+#include "../headers/output.hpp"
 
 
 using std::cout;
@@ -45,6 +46,15 @@ int main()
 		}
 
 
+		//=== separators - no idea where to put this rn, lol
+		int amountSeparators = amountColumns * 32;
+		if (upperBound >= 1e+006)
+		{
+			amountSeparators *= 1.25;
+		}
+		amountSeparators += 4;
+
+
 		//=== output of corrected user input
 		clearScreen();
 		cout << " \n"
@@ -54,39 +64,7 @@ int main()
 
 
 		//=== output - header ===
-		int amountSeparators = 0;
-
-		cout << " \n"
-			 << " \n prime numbers in given range: \n"
-			 << " \n";
-
-		cout << " ";
-		for (int col = 0; col < amountColumns; col++)
-		{
-			cout << "++++++[ number  ";
-			if (upperBound >= 1e+006)
-			{
-				cout << "\t ";
-			}
-			cout << "| difference ]++";
-		}
-
-		amountSeparators = amountColumns * 32;
-		if (upperBound >= 1e+006)
-		{
-			amountSeparators *= 1.25;
-		}
-		amountSeparators += 4;
-
-		cout << "++++ \n ";
-		for (int sep = 0; sep < amountSeparators; sep++)
-		{
-			cout << "-";
-		}
-		cout << " \n"
-			 << " \n"
-			 << " \n"
-			 << " ";
+		header(amountColumns, upperBound);
 
 
 		//=== primary function - finding prime numbers in given range
@@ -156,21 +134,7 @@ int main()
 		//=== output - footer
 		cout << " \n\n ";
 
-		for (int sep = 0; sep < amountSeparators; sep++)
-		{
-			cout << "-";
-		}
-		cout << " \n ";
-
-		for (int col = 0; col < amountColumns; col++)
-		{
-			cout << "++++++[ number  ";
-			if (upperBound >= 1e+006)
-			{
-				cout << "\t ";
-			}
-			cout << "| difference ]++";
-		}
+		//tableLabelling(amountColumns, upperBound);
 
 		cout
 		<< "++++"
@@ -189,7 +153,7 @@ int main()
 		<< amountPrimes / (upperBound - lowerBound + 1) * 100 << "%"
 		<< " \n\n ";
 
-		for (int sep = 0; sep < amountSeparators / 2; sep++)
+		for(int sep = 0; sep < amountSeparators / 2; sep++)
 		{
 			cout << "- ";
 		}

src/output.cpp

@@ -0,0 +1,74 @@
+#include <iostream>
+#include <string>
+
+#include "../headers/genericFunctions.hpp"
+
+
+using std::cout;
+using std::string;
+
+
+
+
+void printLabel(int amountColumns, int upperBound)
+{
+	for (int col = 0; col < amountColumns; col++)
+	{
+		cout << "++++++[ number  ";
+		if (upperBound >= 1e+006)
+		{
+			cout << "\t ";
+		}
+		cout << "| difference ]++";
+	}
+}
+
+
+void printSeparators(int amountSeparators, int amountColumns, string separator)
+{
+	for (int i = 0; i < amountSeparators; i++)
+	{
+		cout << separator;
+	}
+	cout << " \n ";
+}
+
+// ─
+
+
+void printHeader(int amountColumns, int amountSeparators, int upperBound)
+{
+
+
+	cout
+	<< " \n"
+	<< " \n prime numbers in given range: \n"
+	<< " \n"
+	<< " ";
+
+	printLabel(amountColumns, upperBound);
+	cout << "++++ \n ";
+
+	printSeparators(amountSeparators, amountColumns, "─");
+
+	cout
+	<< " \n"
+	<< " \n"
+	<< " \n"
+	<< " ";
+}
+
+
+void printFooter(int amountColumns, int amountSeparators, int upperBound)
+{
+	cout
+	<< " \n"
+	<< " \n"
+	<< " ";
+
+	printSeparators(amountSeparators, amountColumns, "─");
+
+	printLabel(amountColumns, upperBound);
+
+	printSeparators(amountSeparators/2, amountColumns, "─ ");
+}