Push 2

1 files changed, 28 insertions, 17 deletions

diff --git a/BlankConsoleLab/BlankConsoleLab.cpp b/BlankConsoleLab/BlankConsoleLab.cpp
index bb8a6ba..2e3bb47 100644
--- a/BlankConsoleLab/BlankConsoleLab.cpp
+++ b/BlankConsoleLab/BlankConsoleLab.cpp
@@ -16,8 +16,8 @@ using std::ofstream;
  
 const int MAX = 100;
 
-int ReadData(ifstream& inFile, ofstream& outFile,int pickUP[],int DropO[],int Traveller[],float Dis[],float TollA[]);
-void WriteOutputFile(ofstream& outFile, int pickUP[], int DropO[], int Traveller[], float Dis[], float TollA[],
+int ReadData(ifstream& inFile, int pickUP[],int DropO[],int Traveller[],float Dis[],float FareA[],float TollA[]);
+void WriteOutputFile(ofstream& outFile, int pickUP[], int DropO[], int Traveller[], float Dis[],float FareA[], float TollA[],
     int counter);
 void PrintTotalsAndSummary(ofstream& out, int totalRecords);
 
@@ -25,27 +25,28 @@ int main()
 {
     
     int pickUP[MAX];
-    int dropO[MAX];
+    int DropO[MAX];
     int Traveller[MAX];
     float Dis[MAX];
     float FareA[MAX];
     float TollA[MAX];
+    int record_counter(0);
 
     ifstream inFile;
     //"C:\Users\speed\TEMP"
     // Notice how this automatically opens the file
-    ofstream outFile("C:\\Users\\speed\\TEMP\\Apollo17Output.txt");
+    ofstream outFile("C:\\Users\\speed\\TEMP\\Lab3_OutputTest.txt");
     //C:\\TEMP\\Chap_11_data.txt
-    inFile.open("C:\\Users\\speed\\TEMP\\Apollo_17.txt");
+    inFile.open("C:\\Users\\speed\\TEMP\\Lab3_TestData.txt");
 
     if (inFile.is_open())
     {
-        record_counter = ReadData(inFile, outFile, name, age);
+        record_counter = ReadData(inFile,pickUP,DropO,Traveller,Dis,FareA,TollA);
         inFile.close();
 
         if (outFile.is_open())
         {
-            WriteOutputFile(outFile, name, age, record_counter);
+            WriteOutputFile(outFile, pickUP,DropO,Traveller,Dis,FareA,TollA, record_counter);
             PrintTotalsAndSummary(outFile, record_counter);
             outFile.close();
         }
@@ -62,30 +63,40 @@ int main()
     }
     return 0;
 }
-int ReadData(ifstream& inFile, ofstream& outFile, char name[][MAX], int age[])
+int ReadData(ifstream& inFile, ofstream& outFile, int pickUP[], int DropO[], int Traveller[], float Dis[], float FareA[], float TollA[])
 {
     int counter = 0;
-    inFile >> name[counter] >> age[counter]; // Priming Read
+    inFile >> pickUP[counter] >> DropO[counter] >> Traveller[counter] >> Dis[counter] >> FareA[counter] >> TollA[counter]; // Priming Read
 
     while (!inFile.eof())
     {
-        cout << setiosflags(ios::left) << setw(25)
-            << name[counter] << resetiosflags(ios::left)
-            << setw(4) << age[counter] << endl;
+        cout << setiosflags(ios::left) << setw(5)
+            << pickUP[counter] << resetiosflags(ios::left)
+            << setw(10) << DropO[counter] << resetiosflags(ios::left)
+            << setw(12) << Traveller[counter] << resetiosflags(ios::left)
+            << setw(14) << Dis[counter] << resetiosflags(ios::left)
+            << setw (14) << FareA[counter] << resetiosflags(ios::left)
+            << setw(14) << TollA[counter]
+            <<endl;
         counter++;
-        inFile >> name[counter] >> age[counter];
+        inFile >> pickUP[counter] >> DropO[counter] >> Traveller[counter] >> Dis[counter] >> FareA[counter] >> TollA[counter];
     }
 
     return counter;
 }
-void WriteOutputFile(ofstream& outFile, char name[][MAX], int age[], int counter)
+void WriteOutputFile(ofstream& outFile, int pickUP[], int DropO[], int Traveller[], float Dis[], float FareA[], float TollA[],
+    int counter)
 {
     outFile << "   Here is the Output File" << endl;
     for (int r = 0; r <= counter; r++)
     {
-        outFile << setiosflags(ios::left) << setw(25)
-            << name[r] << setw(4)
-            << resetiosflags(ios::left) << age[r]
+        cout << setiosflags(ios::left) << setw(5)
+            << pickUP[counter] << resetiosflags(ios::left)
+            << setw(10) << DropO[counter] << resetiosflags(ios::left)
+            << setw(12) << Traveller[counter] << resetiosflags(ios::left)
+            << setw(14) << Dis[counter] << resetiosflags(ios::left)
+            << setw(14) << FareA[counter] << resetiosflags(ios::left)
+            << setw(14) << TollA[counter]
             << endl;
     }
 }