From 25ac75ac5b77542a2d04381c4f7dab74981a00aa Mon Sep 17 00:00:00 2001 From: jakedcolbert Date: Fri, 15 Apr 2022 01:08:04 -0400 Subject: [PATCH] late night progress - jake --- Makefile | 8 ++++---- project5 | Bin 0 -> 56032 bytes project5.cc | 6 ++++-- province.cc | 18 +++++++++++------- province.h | 6 ++---- 5 files changed, 21 insertions(+), 17 deletions(-) create mode 100755 project5 diff --git a/Makefile b/Makefile index 843e64a..da853a5 100644 --- a/Makefile +++ b/Makefile @@ -1,15 +1,15 @@ # Author: Elijah Opoku-Nyarko and Jake Colbert # default target -all: project4 +all: project5 # compile the code into an executable called 'project1' using C++ 2011 -project4: project4.cc - g++ -std=c++11 -o project4 project4.cc +project5: project5.cc province.h + g++ -std=c++11 -o project5 project5.cc # test the code against an expected output file # this test should grow into a spaceship and end with blinkers test-nowhere: - ./project4 < test-files/t01-nowhere.in > tests/project4.out + ./project5 < test-files/t01-nowhere.in > tests/project4.out diff test-files/project4.out test-files/t01-nowhere.out > test.diff wc -l test.diff diff --git a/project5 b/project5 new file mode 100755 index 0000000000000000000000000000000000000000..1662a5435d7d01ad7d691b088b286f696a8646bc GIT binary patch literal 56032 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 Hu&4e%$iC?K literal 0 HcmV?d00001 diff --git a/project5.cc b/project5.cc index 42e8448..47f8777 100644 --- a/project5.cc +++ b/project5.cc @@ -18,10 +18,12 @@ using namespace std; - int main() { while(!cin.eof()) { - Province province(cin); + cout << "its not actually running" << endl; + // the following lines produce 'undefined symbols for architecture' errors + // Province theProvince = * new Province(cin); + // theProvince.printAll(cout); } } diff --git a/province.cc b/province.cc index 023aa7d..6f89d3b 100644 --- a/province.cc +++ b/province.cc @@ -23,14 +23,15 @@ using namespace std; * Danvers, not a bridge, 2.9 miles long) */ -Province::Province(std::istream &source) { +Province::Province(std::istream & source) { // Read first line of input source >> _numberOfTowns >> _numberOfRoads; + _towns = new Town[_numberOfTowns]; std::map townMap; // maps town names to their indexes in _towns // Read town names for (int i = 0; i < _numberOfTowns; i++) { - source >> _towns.push_back(Town()); // This needs to be converted to vector, im not sure how exactly + source >> _towns[i]._name; // This needs to be converted to vector, im not sure how exactly townMap[_towns[i]._name] = i; } @@ -44,14 +45,17 @@ Province::Province(std::istream &source) { } } -void Province::printAll(int start, std::ostream & output) const{ +void Province::printAll(std::ostream & output) { output << "The input data is:" << endl << endl; - - for (Town town : _towns) { + for (int i = 0; i < sizeof(_towns)/sizeof(_towns[0]); i++) { output << _towns[i]._name << endl; for (Road road : _towns[i]._roads) { - output << "\t" << endl; // needs to be finished too + output << "\t" << road._tail << " " << road._length << " mi"; + if (road._isBridge == 'B' || 'b') { + output << " via bridge" << endl; + } else { + output << endl; + } } - } } \ No newline at end of file diff --git a/province.h b/province.h index 1c114a2..be8a6d7 100644 --- a/province.h +++ b/province.h @@ -28,11 +28,9 @@ class Province /** * Print towns and roads in province in breadth-first search order - * @param start Index to start traversal at * @param output Stream to print data to */ - void printAll(int start, std::ostream & output) const; - + void printAll(std::ostream & output); void printShortestPath(std::ostream & output) const; /** @@ -100,6 +98,6 @@ class Province int _numberOfTowns; int _numberOfRoads; - std::vector _towns; + Town *_towns; std::vector _roads; };