Simplified codeHEADmaster

1 files changed, 53 insertions, 46 deletions

diff --git a/BlankConsoleLab/BlankConsoleLab.cpp b/BlankConsoleLab/BlankConsoleLab.cpp
index e3e7ff1..8654f18 100644
--- a/BlankConsoleLab/BlankConsoleLab.cpp
+++ b/BlankConsoleLab/BlankConsoleLab.cpp
@@ -90,23 +90,26 @@ int ReadData(ifstream& inFile, int pick[], int drop[], int psgr[], float dist[],
 	// Column headers
 	cout << "*****Data Read From File*****" << endl;
 	cout << endl;
-	cout << setw(5) << "Pickup" << resetiosflags(ios::left)
-		<< setw(10) << "Dropoff" << resetiosflags(ios::left)
-		<< setw(12) << "Passengers" << resetiosflags(ios::left)
-		<< setw(14) << "Distance" << resetiosflags(ios::left)
-		<< setw(14) << "Fare" << resetiosflags(ios::left)
-		<< setw(14) << "Toll" << endl;
+	cout << std::left
+		<< setw(15) << "Pickup"
+		<< setw(15) << "Dropoff"
+		<< setw(15) << "Passengers"
+		<< setw(15) << "Distance"
+		<< setw(15) << "Fare"
+		<< setw(15) << "Toll" 
+		<< endl;
 
 	while (!inFile.eof())
 	{
 		cout << setiosflags(ios::left) 
-			<< setw(5)  << pick[counter] << resetiosflags(ios::left)
-			<< setw(10) << drop[counter] << resetiosflags(ios::left)
-			<< setw(12) << psgr[counter] << resetiosflags(ios::left)
-			<< setw(14) << dist[counter] << resetiosflags(ios::left)
-			<< setw(14) << fare[counter] << resetiosflags(ios::left)
-			<< setw(14) << toll[counter]
+			<< setw(15)  << pick[counter]
+			<< setw(15) << drop[counter]
+			<< setw(15) << psgr[counter]
+			<< setw(15) << dist[counter]
+			<< setw(15) << fare[counter]
+			<< setw(15) << toll[counter]
 			<< endl;
+
 		counter++;
 		inFile >> pick[counter] >> drop[counter] >> psgr[counter] >> dist[counter] >> fare[counter] >> toll[counter];
 	}
@@ -122,26 +125,30 @@ void WriteOutputFile(ofstream& outFile, int pick[], int drop[], int psgr[], floa
 	// Column headers
 	outFile << "Here is the Output File" << endl;
 	outFile << endl;
-	outFile << setw(5) << "Pickup" << resetiosflags(ios::left)
-			<< setw(10) << "Dropoff" << resetiosflags(ios::left)
-			<< setw(12) << "Passengers" << resetiosflags(ios::left)
-			<< setw(14) << "Distance" << resetiosflags(ios::left)
-			<< setw(14) << "Fare" << resetiosflags(ios::left)
-			<< setw(14) << "Toll" << resetiosflags(ios::left)
-			<< setw(14) << "Total" << resetiosflags(ios::left)
-			<< setw(20) << "Cost per Mile" << endl;
+	outFile << std::left
+		<< setw(15) << "Pickup"
+		<< setw(15) << "Dropoff"
+		<< setw(15) << "Passengers"
+		<< setw(15) << "Distance"
+		<< setw(15) << "Fare"
+		<< setw(15) << "Toll"
+		<< setw(15) << "Total"
+		<< setw(15) << "Cost per Mile"
+		<< endl;
 
 	cout << endl;
 	cout << "*****Here is the Output File*****" << endl;
 	cout << endl;
-	cout << setw(5) << "Pickup" << resetiosflags(ios::left)
-		<< setw(10) << "Dropoff" << resetiosflags(ios::left)
-		<< setw(12) << "Passengers" << resetiosflags(ios::left)
-		<< setw(14) << "Distance" << resetiosflags(ios::left)
-		<< setw(14) << "Fare" << resetiosflags(ios::left)
-		<< setw(14) << "Toll" << resetiosflags(ios::left)
-		<< setw(14) << "Total" << resetiosflags(ios::left)
-		<< setw(20) << "Cost per Mile" << endl;
+	cout << std::left 
+		<< setw(15) << "Pickup"
+		<< setw(15) << "Dropoff"
+		<< setw(15) << "Passengers"
+		<< setw(15) << "Distance"
+		<< setw(15) << "Fare"
+		<< setw(15) << "Toll"
+		<< setw(15) << "Total"
+		<< setw(15) << "Cost per Mile" 
+		<< endl;
 
 	for (int r = 0; r <= counter - 1; r++)
 	{
@@ -154,26 +161,26 @@ void WriteOutputFile(ofstream& outFile, int pick[], int drop[], int psgr[], floa
 		totalsum += total[r];
 
 		// Transcribing data from file and adding total and cmp columns
-		outFile << setiosflags(ios::left) 
-			<< setw(5)	<< pick[r] << resetiosflags(ios::left)
-			<< setw(10) << drop[r] << resetiosflags(ios::left)
-			<< setw(12) << psgr[r] << resetiosflags(ios::left)
-			<< setw(14) << dist[r] << resetiosflags(ios::left)
-			<< setw(14) << fare[r] << resetiosflags(ios::left)
-			<< setw(14) << toll[r] << resetiosflags(ios::left)
-			<< setw(14) << total[r] << resetiosflags(ios::left)
-			<< setw(20) << cpm[r] 
+		outFile << std::left
+			<< setw(15) << pick[r]
+			<< setw(15) << drop[r]
+			<< setw(15) << psgr[r]
+			<< setw(15) << dist[r]
+			<< setw(15) << fare[r]
+			<< setw(15) << toll[r]
+			<< setw(15) << total[r]
+			<< setw(15) << cpm[r]
 			<< endl;
 
-		cout << setiosflags(ios::left)
-			<< setw(5) << pick[r] << resetiosflags(ios::left)
-			<< setw(10) << drop[r] << resetiosflags(ios::left)
-			<< setw(12) << psgr[r] << resetiosflags(ios::left)
-			<< setw(14) << dist[r] << resetiosflags(ios::left)
-			<< setw(14) << fare[r] << resetiosflags(ios::left)
-			<< setw(14) << toll[r] << resetiosflags(ios::left)
-			<< setw(14) << total[r] << resetiosflags(ios::left)
-			<< setw(20) << cpm[r]
+		cout << std::left
+			<< setw(15) << pick[r]
+			<< setw(15) << drop[r]
+			<< setw(15) << psgr[r]
+			<< setw(15) << dist[r]
+			<< setw(15) << fare[r]
+			<< setw(15) << toll[r]
+			<< setw(15) << total[r]
+			<< setw(15) << cpm[r]
 			<< endl;
 	}
 }