ReadData function

1 files changed, 24 insertions, 14 deletions

diff --git a/BlankConsoleLab/BlankConsoleLab.cpp b/BlankConsoleLab/BlankConsoleLab.cpp
index 617f37b..cdbaea6 100644
--- a/BlankConsoleLab/BlankConsoleLab.cpp
+++ b/BlankConsoleLab/BlankConsoleLab.cpp
@@ -27,18 +27,28 @@ int main()
 
 }
 
-int ReadData(ifstream& inFile, ofstream& outFile, char name[][MAX], int age[])
+int ReadData(ifstream& inFile, int pick[], int drop[], int psgr[], float dist[], float fare[], float toll[], float tfare[])
 {
-    int counter = 0;
-    inFile >> name[counter] >> age[counter];
-
-    while (!inFile.eof())
-    {
-        cout << setiosflags(ios::left) << setw(25)
-            << name[counter] << resetiosflags(ios::left)
-            << setw(4) << age[counter] << endl;
-        counter++;
-        inFile >> name[counter] >> age[counter];
-    }
-
-    return counter;
\ No newline at end of file
+	int counter = 0;
+	inFile >> pick[counter] >> drop[counter] >> psgr[counter] >> dist[counter] >> fare[counter] >> toll[counter]; // Priming Read
+
+	while (!inFile.eof())
+	{
+		tfare[counter] = fare[counter] + toll[counter];
+
+		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] << resetiosflags(ios::left)
+			<< setw(14) << tfare[counter] << resetiosflags(ios::left)
+			<< endl;
+		counter++;
+		inFile >> pick[counter] >> drop[counter] >> psgr[counter] >> dist[counter] >> fare[counter] >> toll[counter] >> tfare[counter];
+	}
+
+	return counter;
+}
+