Added headers to input file data display

2 files changed, 28 insertions, 19 deletions

diff --git a/BlankConsoleLab/BlankConsoleLab.cpp b/BlankConsoleLab/BlankConsoleLab.cpp
index 6c331be..15d941d 100644
--- a/BlankConsoleLab/BlankConsoleLab.cpp
+++ b/BlankConsoleLab/BlankConsoleLab.cpp
@@ -18,16 +18,13 @@ using std::ifstream;
 using std::ofstream;
 
 const int MAX = 50;
+int psgrsum = 0;
+float totalsum = 0;
 
 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[], float total[], float cmp[], int counter);
-
 void PrintTotalsAndSummary(ofstream& out, int totalRecords, int totalPassengers, float totalSum);
 
-int psgrsum = 0;
-float totalsum = 0;
-
 
 int main()
 {
@@ -87,8 +84,17 @@ int ReadData(ifstream& inFile, int pick[], int drop[], int psgr[], float dist[],
 	int counter = 0;
 	inFile >> pick[counter] >> drop[counter] >> psgr[counter] >> dist[counter] >> fare[counter] >> toll[counter]; // Priming Read
 
+	cout << "Data read from file:" << 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;
+
 	while (!inFile.eof())
 	{
+
 		cout << setiosflags(ios::left) 
 			<< setw(5)  << pick[counter] << resetiosflags(ios::left)
 			<< setw(10) << drop[counter] << resetiosflags(ios::left)
@@ -108,7 +114,7 @@ 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[], float total[], float cpm[],
 	int counter)
 {
-	outFile << "   Here is the Output File" << endl;
+	outFile << "Here is the Output File" << endl;
 	outFile << endl;
 	outFile << setw(5) << "Pickup" << resetiosflags(ios::left)
 			<< setw(10) << "Dropoff" << resetiosflags(ios::left)
@@ -146,14 +152,16 @@ void PrintTotalsAndSummary(ofstream& outFile, int totalRecords, int totalPasseng
 	float avgcost = 0;
 	avgcost = totalSum / totalPassengers;
 	// To screen
-	cout << "Total Records: " << totalRecords << "." << endl;
-	cout << "Total Passengers: " << totalPassengers << "." << endl;
-	cout << "Total Cost: " << totalSum << "." << endl;
-	cout << "Average Cost: " << avgcost << "." << endl;
+	cout << endl;
+	cout << "Total Records: " << totalRecords << endl;
+	cout << "Total Passengers: " << totalPassengers << endl;
+	cout << "Total Cost: " << totalSum << endl;
+	cout << "Average Cost: " << avgcost << endl;
 
 	// To file
-	outFile << "Total Records: " << totalRecords << "." << endl;
-	outFile << "Total Passengers: " << totalPassengers << "." << endl;
-	outFile << "Total Cost: " << totalSum << "." << endl;
-	outFile << "Average Cost: " << avgcost << "." << endl;
+	outFile << endl;
+	outFile << "Total Records: " << totalRecords << endl;
+	outFile << "Total Passengers: " << totalPassengers << endl;
+	outFile << "Total Cost: " << totalSum << endl;
+	outFile << "Average Cost: " << avgcost << endl;
 }
diff --git a/BlankConsoleLab/lab3_Report.txt b/BlankConsoleLab/lab3_Report.txt
index b4d1bb9..fb51871 100644
--- a/BlankConsoleLab/lab3_Report.txt
+++ b/BlankConsoleLab/lab3_Report.txt
@@ -1,4 +1,4 @@
-   Here is the Output File
+Here is the Output File
 
 Pickup   Dropoff  Passengers      Distance          Fare          Toll         Total       Cost per Mile
 129           7           3           1.3           7.5             0           7.5             5.76923
@@ -6,7 +6,8 @@ Pickup   Dropoff  Passengers      Distance          Fare          Toll         T
 7            41           1           4.6            15          5.76         20.76             4.51304
 150          61           2          6.75            23             0            23             3.40741
 112          17           1          3.84            15             0            15             3.90625
-Total Records: 5.
-Total Passengers: 8.
-Total Cost: 104.02.
-Average Cost: 13.0025.
+
+Total Records: 5
+Total Passengers: 8
+Total Cost: 104.02
+Average Cost: 13.0025