From 04a3b59bb2898b0343321645dc6abf5567844ba5 Mon Sep 17 00:00:00 2001 From: fsimonsen <fredersi@stud.ntnu.no> Date: Wed, 6 Apr 2022 17:31:52 +0200 Subject: [PATCH] endring av filer og cleanup --- Presiseringer.docx | Bin 0 -> 12457 bytes Stoppesteder.dta | 20 ++++++-------------- bane.cpp | 23 +++++++++++++++-------- bane.h | 1 + buss.cpp | 29 ++++++++++++++++++----------- buss.h | 1 + rute.cpp | 2 +- rute.h | 2 +- ruter.cpp | 14 +++++++++----- ruter.dta | 14 +------------- 10 files changed, 53 insertions(+), 53 deletions(-) create mode 100644 Presiseringer.docx diff --git a/Presiseringer.docx b/Presiseringer.docx new file mode 100644 index 0000000000000000000000000000000000000000..aa0ed4237da4f672e592a60d623b0c05a3f9cff8 GIT binary patch literal 12457 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 literal 0 HcmV?d00001 diff --git a/Stoppesteder.dta b/Stoppesteder.dta index d9f7a07..3ad17dd 100644 --- a/Stoppesteder.dta +++ b/Stoppesteder.dta @@ -1,24 +1,16 @@ 10 Aa -1 -2 3 +0 Bb -2 -1 3 -3 5 +0 Cc -1 -2 5 +0 Dd -1 -5 3 +0 Ee -2 -4 3 -6 5 +0 Ff -1 -5 5 +0 Gg 0 Hh diff --git a/bane.cpp b/bane.cpp index 15dae3b..829b87f 100644 --- a/bane.cpp +++ b/bane.cpp @@ -1,6 +1,6 @@ /** * Kode-fil for bane-klassen - * + * * @file bane.cpp * @author Sondre Sand & Frederik Simonsen */ @@ -14,7 +14,7 @@ using namespace std; /** * Oppretter en ny Bane. Nullstiller alle dens datamedlemmer. * Faktisk innlesning av reelle verdier skjer i lesData() - * + * * @see Rute::Rute() */ Bane::Bane() { @@ -23,7 +23,7 @@ Bane::Bane() { /** * Oppretter en ny Bane fra fil. Leser inn dens datamedlemmer - * + * * @param inn Filen det leses fra * @see Rute::Rute(...) */ @@ -32,9 +32,16 @@ Bane::Bane(ifstream & inn) : Rute (inn) { inn >> antVogner >> lengde; inn.ignore(); // Forkaster '\n' } +/** + * Sletter minne allokert med en rute (virtuell) + */ +Bane::~Bane() { + +} + /** * Leser inn alle datamedlemmer for en bane (virtuell) - * + * * @see Rute::lesData() */ void Bane::lesData() { @@ -45,7 +52,7 @@ void Bane::lesData() { /** * Skriver ut all informasjon om en bane til bruker i run-time (virtuell) - * + * * @see Rute::skrivBeskrivelse() */ void Bane::skrivBeskrivelse() { @@ -56,7 +63,7 @@ void Bane::skrivBeskrivelse() { /** * Skriver ut rutetype (bane) til bruker (virtuell) - * + * * @see Rute::skrivData() */ void Bane::skrivData() const { @@ -75,7 +82,7 @@ void Bane::skrivKort() const { /** * Skriver ut alle datamedlemmer for en bane til fil (virtuell) - * + * * @param ut - Filen det skrives til * @see Rute::skrivTilFil(...) */ @@ -83,4 +90,4 @@ void Bane::skrivTilFil(ofstream & ut) { ut << "A\n"; // Skriver ut A for rutetype Bane Rute::skrivTilFil(ut); // Rute skriver egne data ut << antVogner << ' ' << lengde << '\n'; // Skriver egne data -} \ No newline at end of file +} diff --git a/bane.h b/bane.h index 03af3a5..c9310cf 100644 --- a/bane.h +++ b/bane.h @@ -20,6 +20,7 @@ class Bane : public Rute { public: Bane(); Bane(std::ifstream & inn); + virtual ~Bane(); virtual void lesData(); virtual void skrivBeskrivelse(); virtual void skrivData() const; diff --git a/buss.cpp b/buss.cpp index 6fac640..c6a4289 100644 --- a/buss.cpp +++ b/buss.cpp @@ -1,6 +1,6 @@ /** * Kode-fil for buss-klassen - * + * * @file buss.cpp * @author Sondre Sand & Frederik Simonsen */ @@ -14,7 +14,7 @@ using namespace std; /** * Oppretter en ny Buss, nullstiller alle dens datamedlemmer. * Faktiske reelle verdier knyttet til bussen, leses inn i lesData - * + * * @see Rute::Rute() */ Buss::Buss() { @@ -24,7 +24,7 @@ Buss::Buss() { /** * Leser inn en buss sine datamedlemmer fra fil - * + * * @param inn Filen det leses fra * @see Rute::Rute(...) */ @@ -33,9 +33,16 @@ Buss::Buss(ifstream & inn) : Rute(inn) { inn >> antSitt >> antStaa >> leddbuss; inn.ignore(); } +/** + * Sletter minne allokert for en rute (virtuell) + */ +Buss::~Buss() { + +} + /** * Leser inn alle datamedlemmer for en aktuell buss (virtuell) - * + * * @see Rute::lesData() */ void Buss::lesData() { @@ -44,12 +51,12 @@ void Buss::lesData() { antSitt = lesInt("Antall sitteplasser på bussen", MINSITT, MAXSITT); antStaa = lesInt("Antall ståplasser på bussen", MINSTAA, MAXSTAA); bussType = lesChar("Leddbuss? (J/N)"); - + while (bussType != 'J' && bussType != 'N') { // Looper ved ulovlig svar: cout << "\nUlovlig valg, prøv igjen.\n"; bussType = lesChar("Leddbuss? J eller N"); } - + if (bussType == 'J') { // Oppdaterer om faktisk leddbuss eller ei: leddbuss = true; } else if (bussType == 'N') @@ -59,7 +66,7 @@ void Buss::lesData() { /** * Skriver ut all informasjon om en buss til bruker (virtuell) - * + * * @see Rute::skrivBeskrivelse() */ void Buss::skrivBeskrivelse() { @@ -71,7 +78,7 @@ void Buss::skrivBeskrivelse() { /** * Skriver ut egen rutetype (buss) til bruker (virtuell) - * + * * @see Rute::skrivData() */ void Buss::skrivData() const { @@ -90,8 +97,8 @@ cout << "\nBussen har " << antSitt << " sitteplasser, " << antStaa /** * Skriver ut bussens datamedlemmer til fil (virtuell) - * - * @param ut Filen det skrives til + * + * @param ut Filen det skrives til * @see Rute::skrivTilFil(...) */ void Buss::skrivTilFil(ofstream & ut) { @@ -99,4 +106,4 @@ void Buss::skrivTilFil(ofstream & ut) { Rute::skrivTilFil(ut); // Rute skriver egne datamedlemmer ut << antSitt << ' ' << antStaa // Skriver egne datamedlemmer << ' ' << leddbuss << '\n'; // Leddbuss (1), ikke leddbuss (0) -} \ No newline at end of file +} diff --git a/buss.h b/buss.h index 082dbe3..cfeb8bd 100644 --- a/buss.h +++ b/buss.h @@ -22,6 +22,7 @@ class Buss : public Rute { public: Buss(); Buss(std::ifstream & inn); + virtual ~Buss(); virtual void lesData(); virtual void skrivBeskrivelse(); virtual void skrivData() const; diff --git a/rute.cpp b/rute.cpp index b8ac986..b9607b6 100644 --- a/rute.cpp +++ b/rute.cpp @@ -298,7 +298,7 @@ string Rute::hentNavn(const Retning retning) { startSted = gStoppestederBase.hentNavnVhaIndeks(stoppene.back()->hentNr()); return startSted; // Returnerer navnet på startstopp på ruten -} //må endres til å ta imot peker! return peker. +} /** * Sjekker om en stopp er på en aktuell rute diff --git a/rute.h b/rute.h index b609e47..77b589e 100644 --- a/rute.h +++ b/rute.h @@ -35,7 +35,7 @@ class Rute { public: Rute(); Rute(std::ifstream & inn); - ~Rute(); + virtual ~Rute(); bool erForst(Stopp* s1, Stopp* s2); bool erListeGyldig(); bool erNabo(Stopp* s1, Stopp* s2); diff --git a/ruter.cpp b/ruter.cpp index fbdefdf..cf90a16 100644 --- a/ruter.cpp +++ b/ruter.cpp @@ -303,13 +303,17 @@ void Ruter::ruteTabell() { * @see Rute::skrivData() */ void Ruter::skrivAlle() { - cout << "\nFølgende ruter finnes:\n"; - for (const auto & [ruteNr, rute] : rutene) { // For hver rute: - cout << ruteNr << ' '; // Skriver rutenr - rute->skrivData(); // Ruten skriver egne data + if (!rutene.empty()) { // Så lenge det er ruter registrert: + cout << "\nFølgende ruter finnes:\n"; + for (const auto & [ruteNr, rute] : rutene) { // For hver rute: + cout << ruteNr << ' '; // Skriver rutenr + rute->skrivData(); // Ruten skriver egne data + cout << '\n'; + } cout << '\n'; + } else { + cout << "\nIngen ruter registrert i datastrukturen.\n\n"; } - cout << '\n'; } /** diff --git a/ruter.dta b/ruter.dta index 21ea244..c227083 100644 --- a/ruter.dta +++ b/ruter.dta @@ -1,13 +1 @@ -2 -1 U -3 -1 0 -2 3 -3 5 -50 10 0 -2 A -3 -4 0 -5 3 -6 5 -5 50 \ No newline at end of file +0 \ No newline at end of file -- GitLab