working outputs

1 files changed, 17 insertions, 21 deletions

diff --git a/BlankConsoleLab/BlankConsoleLab.cpp b/BlankConsoleLab/BlankConsoleLab.cpp
index 6dbeb2b..b686577 100644
--- a/BlankConsoleLab/BlankConsoleLab.cpp
+++ b/BlankConsoleLab/BlankConsoleLab.cpp
@@ -32,7 +32,6 @@ int main()
 	float CostPerMile[MAX];
 	int record_counter(0);
 	ifstream inFile;
-	// Notice how this automatically opens the file
 	ofstream outFile("C:\\TEMP\\largeout.txt");
 	inFile.open("C:\\TEMP\\large.txt");
 
@@ -43,7 +42,6 @@ int main()
 		if (outFile.is_open())
 		{
 			WriteOutputFile(outFile, pick, drop, psgr, dist, fare, toll, record_counter, TotalFare, CostPerMile);
-			PrintTotalsAndSummary(outFile, record_counter);
 			outFile.close();
 		}
 		else
@@ -63,8 +61,8 @@ int main()
 int ReadData(ifstream& inFile, int pick[], int drop[], int psgr[], float dist[], float fare[], float toll[])
 {
 	int counter = 0;
-	int sum = 0;
-	int FareSum = 0;
+	float sum = 0;
+	float FareSum = 0;
 	inFile >> pick[counter] >> drop[counter] >> psgr[counter] >> dist[counter] >> fare[counter] >> toll[counter]; // Priming Read
 	cout << setiosflags(ios::left) << left << setw(20) << "PickUpLoc" << setiosflags(ios::left) << setw(20) << left << "DropOffLoc" << setiosflags(ios::left) << left << setw(20) << "PassengerCount"
 		<< setiosflags(ios::left) << left << setw(20) << "Distance" << setiosflags(ios::left) << left << setw(20) << "Fare" << setiosflags(ios::left) << left << setw(20) << "Toll"
@@ -84,7 +82,7 @@ int ReadData(ifstream& inFile, int pick[], int drop[], int psgr[], float dist[],
 			}
 		}
 		sum = sum + psgr[counter];
-		FareSum = FareSum + fare[counter] + toll[counter];
+		FareSum = FareSum + (fare[counter] + toll[counter]);
 		cout << setiosflags(ios::left) << setw(20) << pick[counter] << resetiosflags(ios::left) << left << setw(20) << drop[counter] << resetiosflags(ios::left) << left << setw(20) << psgr[counter]
 			<< resetiosflags(ios::left) << left << setw(20) << dist[counter] << resetiosflags(ios::left) << left << setw(20) << fare[counter] << resetiosflags(ios::left) << left << setw(20) << toll[counter]
 			<< resetiosflags(ios::left) << left << setw(20) << TotalFare[counter] << resetiosflags(ios::left) << left << setw(20) << setprecision(3) << CostPerMile[counter] << endl;
@@ -93,16 +91,19 @@ int ReadData(ifstream& inFile, int pick[], int drop[], int psgr[], float dist[],
 	}
 	
 	cout << endl << endl << "Total # of Passengers: " << sum;
-	cout << endl << "Total Fare: " << FareSum;
+	cout << endl << setprecision(6) << "Total Fare: " << FareSum;
+	cout << endl << setprecision(4) << "Average cost per person: " << FareSum / sum;
 	
 	return counter;
 }
 
 void WriteOutputFile(ofstream& outFile, int pick[], int drop[], int psgr[], float dist[], float fare[], float toll[], int counter, float TotalFare[], float CostPerMile[])
 {
-	int sum = 0;
-	int FareSum = 0;
-	outFile << "   Here is the Output File" << endl;
+	float sum = 0;
+	float FareSum = 0;
+	outFile << setiosflags(ios::left) << left << setw(20) << "PickUpLoc" << setiosflags(ios::left) << setw(20) << left << "DropOffLoc" << setiosflags(ios::left) << left << setw(20) << "PassengerCount"
+		<< setiosflags(ios::left) << left << setw(20) << "Distance" << setiosflags(ios::left) << left << setw(20) << "Fare" << setiosflags(ios::left) << left << setw(20) << "Toll"
+		<< setiosflags(ios::left) << left << setw(20) << "TotalFare" << setiosflags(ios::left) << left << setw(20) << "CostPerMile" << endl;
 	for (int r = 0; r <= counter - 1; r++)
 	{
 		TotalFare[r] = toll[r] + fare[r];
@@ -111,23 +112,18 @@ void WriteOutputFile(ofstream& outFile, int pick[], int drop[], int psgr[], floa
 			CostPerMile[r] = 0;
 		}
 		sum = sum + psgr[r];
-		FareSum = FareSum + fare[r] + toll[r];
-		outFile << setiosflags(ios::left) << left << setw(10) << pick[r] << resetiosflags(ios::left) << left << setw(10) << drop[r] << resetiosflags(ios::left) << left << setw(10) << psgr[r] << resetiosflags(ios::left) << left
-			<< setw(14) << dist[r] << resetiosflags(ios::left) << left << setw(10) << fare[r] << resetiosflags(ios::left) << left << setw(10) << toll[r] << resetiosflags(ios::left) << left << setw(14) << TotalFare[r]
-			<< resetiosflags(ios::left) << left << setw(14) << setprecision(3) << CostPerMile[r] << endl;
+		FareSum = FareSum + (fare[r] + toll[r]);
+		
+		outFile << setiosflags(ios::left) << left << setw(20) << pick[r] << resetiosflags(ios::left) << left << setw(20) << drop[r] << resetiosflags(ios::left) << left << setw(20) << psgr[r] << resetiosflags(ios::left) << left
+			<< setw(20) << dist[r] << resetiosflags(ios::left) << left << setw(20) << fare[r] << resetiosflags(ios::left) << left << setw(20) << toll[r] << resetiosflags(ios::left) << left << setw(20) << TotalFare[r]
+			<< resetiosflags(ios::left) << left << setw(20) << setprecision(3) << CostPerMile[r] << endl;
 	}
 	outFile << endl << endl << "Total # of Passengers: " << sum;
-	outFile << endl << "Total Fare: " << FareSum;
+	outFile << endl << setprecision(6) << "Total Fare: " << FareSum;
+	outFile << endl << setprecision(4) << "Average Cost Per Person: " << FareSum / sum << endl << endl;
 }
 
-void PrintTotalsAndSummary(ofstream& outFile, int totalRecords)
-{
-	// To screen
-	cout << "\n\n\t** Total Records: " << totalRecords << " **\n" << "\t\t The End \n";
 
-	// To file
-	outFile << "\n\n\t** Total Records: " << totalRecords << " **\n" << "\t\t The End \n";
-}