Added total and cost per mile output column

1 files changed, 20 insertions, 8 deletions

diff --git a/BlankConsoleLab/BlankConsoleLab.cpp b/BlankConsoleLab/BlankConsoleLab.cpp
index 6e94674..17c70f9 100644
--- a/BlankConsoleLab/BlankConsoleLab.cpp
+++ b/BlankConsoleLab/BlankConsoleLab.cpp
@@ -6,7 +6,6 @@
 #include <iostream>
 #include <fstream>
 #include <iomanip>
-#include <string>
 
 
 using std::cout;
@@ -14,15 +13,15 @@ using std::cin;
 using std::endl;
 using std::setw;
 using std::ios;
+using std::string;
 using std::ifstream;
 using std::ofstream;
-using std::string;
 
 const int MAX = 50;
 
 int ReadData(ifstream& inFile, int pick[], int drop[], int psgr[], float dist[], float fare[], float toll[]);
 
-void WriteOutputFile(ofstream& outFile, int pick[], int drop[], int psgr[], float dist[], float fare[], float toll[], int counter);
+void WriteOutputFile(ofstream& outFile, int pick[], int drop[], int psgr[], float dist[], float fare[], float toll[], float total[], float cmp[], int counter);
 
 void PrintTotalsAndSummary(ofstream& out, int totalRecords);
 
@@ -38,6 +37,8 @@ int main()
 	float dist[MAX];
 	float fare[MAX];
 	float toll[MAX];
+	float total[MAX];
+	float cpm[MAX];
 	int record_counter(0);
 
 	string fnameinput;
@@ -49,7 +50,6 @@ int main()
 
 	ifstream inFile;
 
-	// Notice how this automatically opens the file
 	ofstream outFile("lab3_Report.txt");
 
 	inFile.open(fnameinput);
@@ -61,7 +61,7 @@ int main()
 
 		if (outFile.is_open())
 		{
-			WriteOutputFile(outFile, pick, drop, psgr, dist, fare, toll, record_counter);
+			WriteOutputFile(outFile, pick, drop, psgr, dist, fare, toll, total, cpm, record_counter);
 			PrintTotalsAndSummary(outFile, record_counter);
 			outFile.close();
 		}
@@ -104,22 +104,34 @@ int ReadData(ifstream& inFile, int pick[], int drop[], int psgr[], float dist[],
 }
 
 
-void WriteOutputFile(ofstream& outFile, int pick[], int drop[], int psgr[], float dist[], float fare[], float toll[],
+void WriteOutputFile(ofstream& outFile, int pick[], int drop[], int psgr[], float dist[], float fare[], float toll[], float total[], float cpm[],
 	int counter)
 {
 	outFile << "   Here is the Output File" << endl;
 	outFile << endl;
-	outFile << setw(5) << "Pickup" << setw(10) << "Dropoff" << setw(12) << "Passengers" << setw(14) << "Distance" << setw(14) << "Fare" << setw(14) << "Toll" << 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;
 
 	for (int r = 0; r <= counter - 1; r++)
 	{
+		total[r] = fare[r] + toll[r];
+		cpm[r] = total[r] / dist[r];
+
 		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]
+			<< setw(14) << toll[r] << resetiosflags(ios::left)
+			<< setw(14) << total[r] << resetiosflags(ios::left)
+			<< setw(20) << cpm[r] 
 			<< endl;
 	}
 }