Skip to content
Snippets Groups Projects
Commit b637cb5a authored by aurora's avatar aurora
Browse files

fix: debugging and for-loops

parent 9bce2a0a
No related branches found
No related tags found
No related merge requests found
......@@ -38,11 +38,12 @@ public:
else
return false;
};
string returnName();
void writePlayer() const;
void updatePlayer();
void playerWin() {wins = 0;};
void playerDraws() {draws = 0;};
void playerScore() {score = 0;};
//void player(){};
void player(){name = " "; playerID = 0; club = " "; wins = 0; draws = 0;
score = 0;};
void calculateScore();
void writeToFilePlayer(ofstream &out);
void readFromFilePlayer(ifstream &in);
......@@ -56,10 +57,11 @@ private:
vector <string *> player1;
vector <string *> player2;
public:
//void Tournament(){};
void writeTournament();
void fillTableArray();
void writeToFileTournament(ofstream &out);
void readFromFileTournament(ifstream &in);
void readFromFileTournaments(ifstream &in);
};
// vectorer:
......@@ -83,7 +85,6 @@ Player* findPlayerID(const int ID);
void enterResults();
void newTournament();
void viewPlayers();
bool checkPlayers();
void skrivMeny();
void writeToFile();
void readFromFile();
......@@ -176,6 +177,10 @@ Player *findPlayer(const string name)
}
}
string Player::returnName(){
return name;
}
/**
* Finds player based on PlayerID and returns pointer
*
......@@ -266,7 +271,7 @@ void Tournament::writeTournament()
*/
void Tournament::fillTableArray()
{
tableNr[0] = 1;
// tableNr[0] = 1;
for (int i = 1; i < gTables; i++)
{
tableNr[i] = tableNr[i - 1] + 1;
......@@ -287,12 +292,12 @@ for(int i=0; i<gTables; i++){
<< "\n";
}
}
/*
/**
* Read one tournament round from file
*
* @param in - file being read from
*/
*
void Tournament::readFromFileTournament(ifstream & in)
{
......@@ -305,7 +310,7 @@ void Tournament::readFromFileTournament(ifstream & in)
in >> tableNr[i];
in.ignore(); // Can't use getline() because player1 and player2 are arrays
}
}
}*/
/**
* Calculates and prints out scores for all players in descending order
......@@ -380,9 +385,25 @@ void enterResults()
*/
void newTournament()
{
if(gRounds == 0){
cout<<"Table: \tPlayer 1: \tPlayer 2:\n";
for(int i=0; i<gPlayers.size(); i+2){
cout<< i+1 <<"\t" <<gPlayers[i]->returnName() <<"\t" <<gPlayers[i+1]->returnName() <<"\n";
}
gRounds++;
}
else{
cout<<"Table: \tPlayer 1: \tPlayer 2:\n";
for(int i=0; i<gPlayers.size(); i++){
for(int j=1; j<gPlayers.size(); j++){
// gPlayers[i]->playedBefore[j];
}
}
gRounds++;
}
}
/**
* Add a player
......@@ -470,15 +491,6 @@ void viewPlayers()
}
}
/**
* Checks if
*
* @return true
* @return false
*/
bool checkPlayers()
{
}
/**
* writes the programs menu options
......@@ -572,7 +584,7 @@ void readFromFileTournament()
while (!infile.eof())
{
tournamentNew = new Tournament();
tournamentNew->readFromFileTournament(infile);
//tournamentNew->readFromFileTournaments(infile);
gTournaments.push_back(tournamentNew);
}
......@@ -600,5 +612,5 @@ void viewResults(){
//Calculates score for every player
for(int i=0; i<gPlayers.size(); i++){
gPlayers->viewResults(i);}
}
\ No newline at end of file
gPlayers[i]->viewResults(i);}
}}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment