more than one game per simulation tested, deleted obsolet StateList,

overall output of data on the console

game/header/Counter.h

@@ -20,8 +20,11 @@ class Counter {
 	int add(AI* player, int counter);
 	int get(AI* player) const;
 
+	Counter operator+(const Counter& rhs) const;
 	Counter operator-(const Counter& rhs) const;
 	Counter operator=(const Counter& copy);
+	Counter operator+=(const Counter& rhs);
+	Counter operator-=(const Counter& rhs);
 };
 
 #endif /* COUNTER_H_ */

game/source/Counter.cpp

@@ -13,7 +13,7 @@ Counter::Counter() {
 		counter[i] = 0;
 }
 
-Counter::Counter(const Counter& copy){
+Counter::Counter(const Counter& copy) {
 	counter = new int[MAX_PLAYER];
 	for (int i = 0; i < MAX_PLAYER; i++)
 		counter[i] = copy.counter[i];
@@ -32,16 +32,32 @@ int Counter::get(AI* player) const {
 	return counter[player->spielerfarbe];
 }
 
+Counter Counter::operator+(const Counter& rhs) const {
+	Counter retValue;
+	for (int i = 0; i < MAX_PLAYER; i++)
+		retValue.counter[i] = counter[i] + rhs.counter[i];
+	return retValue;
+}
 
-Counter Counter::operator-(const Counter& rhs) const{
+Counter Counter::operator-(const Counter& rhs) const {
 	Counter retValue;
-	for(int i=0;i<MAX_PLAYER;i++)
-		retValue.counter[i]=counter[i]-rhs.counter[i];
+	for (int i = 0; i < MAX_PLAYER; i++)
+		retValue.counter[i] = counter[i] - rhs.counter[i];
 	return retValue;
 }
 
-Counter Counter::operator=(const Counter& copy){
-	for(int i=0;i<MAX_PLAYER;i++)
-		counter[i]=copy.counter[i];
+Counter Counter::operator=(const Counter& copy) {
+	for (int i = 0; i < MAX_PLAYER; i++)
+		counter[i] = copy.counter[i];
+	return *this;
+}
+
+Counter Counter::operator+=(const Counter& rhs) {
+	*this = *this + rhs;
+	return *this;
+}
+
+Counter Counter::operator-=(const Counter& rhs) {
+	*this = *this - rhs;
 	return *this;
 }

game/source/Game.cpp

@@ -53,9 +53,23 @@ void Game::play() {
 					<< " has "
 					<< gameLogger->points.get(gameLogger->playerList[i])
 					<< " points!" << std::endl;
+		std::cout << std::endl;
 		++playerIterator;
 	}
-
+	//TODO punktevergabe
+	int maxpoints = 0;
+	int numberWinners = 0;
+	for (int i = 0; i < (int) gameLogger->playerList.size(); i++)
+		if (maxpoints < gameLogger->points.get(gameLogger->playerList[i]))
+			maxpoints = gameLogger->points.get(gameLogger->playerList[i]);
+	for (int i = 0; i < (int) gameLogger->playerList.size(); i++)
+		if (maxpoints == gameLogger->points.get(gameLogger->playerList[i]))
+			numberWinners++;
+	for (int i = 0; i < (int) gameLogger->playerList.size(); i++)
+		if (maxpoints == gameLogger->points.get(gameLogger->playerList[i]))
+			gameLogger->winnerPoints.add(gameLogger->playerList[i],
+					6 / numberWinners);
+	//TODO end
 	played = true;
 }
 

game/source/Round.cpp

@@ -31,7 +31,6 @@ void Round::play() {
 			currentMove->execute(currentState);
 			roundLogger->moveList.push_back(currentMove);
 		}
-		currentState.aktAusgabe();
 		++currentPlayer;
 	}
 	PlayingOrder::iterator playerIterator = roundLogger->playingOrder.begin(

game/source/Simulation.cpp

@@ -8,20 +8,32 @@
 #include "../header/Simulation.h"
 
 Simulation::Simulation(SimulationLogger* simulationLogger) :
-		simulationLogger(simulationLogger), ran(false) {}
+		simulationLogger(simulationLogger), ran(false) {
+}
 
-Simulation::~Simulation() {}
+Simulation::~Simulation() {
+}
 
 void Simulation::run() {
 	assert(!ran);
 	for (int i = 0; i < (int) simulationLogger->gameList.size(); i++) {
-		std::vector<AI*> order=simulationLogger->getPlayingOrder(i);
+		std::vector<AI*> order = simulationLogger->getPlayingOrder(i);
 		PlayingOrder playingOrder(order);
-		GameLogger* currentGameLogger=new GameLogger(simulationLogger->playerList,
-				simulationLogger->board, playingOrder, order[0]);
+		GameLogger* currentGameLogger = new GameLogger(
+				simulationLogger->playerList, simulationLogger->board,
+				playingOrder, order[0]);
 		Game currentGame(currentGameLogger);
 		currentGame.play();
-		simulationLogger->gameList[i]=currentGameLogger;
+		simulationLogger->gamesWon += currentGameLogger->winnerPoints;
+		simulationLogger->gameList[i] = currentGameLogger;
 	}
-	ran=true;
+	//TODO ausgabe punkte
+	for (int i = 0; i < (int) simulationLogger->playerList.size(); i++)
+		std::cout << "Player " << simulationLogger->playerList[i]->spielerfarbe
+				<< " has won "
+				<< simulationLogger->gamesWon.get(
+						simulationLogger->playerList[i]) / (double) 6.
+				<< " game(s)." << std::endl;
+	//TODO end
+	ran = true;
 }

logger/header/GameLogger.h

@@ -28,6 +28,7 @@ class GameLogger {
 	int deadLine; /** < if points equal or lower deadLine, you lose*/
 
 	Counter points;
+	Counter winnerPoints;
 
 	std::vector<RoundLogger*> roundList;
 };

userinterface/source/spielbrett.cpp

@@ -176,19 +176,8 @@ void Spielbrett::paintEvent(QPaintEvent*) {
 void Spielbrett::zustandChanged(int counter) {
 	update();
 }
+
 void Spielbrett::drawCityChanged(bool enable) {
 	drawCity = enable;
 	update();
 }
-/*
- QSize gameBoard::minimumSizeHint() const
- {
- return QSize(100,100);
- }
-
-
- QSize gameBoard::sizeHint() const
- {
- return QSize(1000,750);
- }
- */

userinterface/source/uiexec.cpp

@@ -14,34 +14,16 @@ void UIEXEC::doTheMagic() {
 	 window implementation
 	 */
 	board = new Board;
-	board->Ausgabe();
 	std::vector<AI*> players;
 	players.push_back(new testKI(P_YELLOW));
 	players.push_back(new testKI(P_BLUE));
 	players.push_back(new testKI(P_ORANGE));
 
-	SimulationLogger* simulationLogger = new SimulationLogger(players, *board, 1);
+	SimulationLogger* simulationLogger = new SimulationLogger(players, *board, 100);
 	Simulation simulation(simulationLogger);
 	simulation.run();
 
 	wp = new Window(simulationLogger);
 	wp->setWindowTitle(QObject::tr("Transamerica - Testversion - GITHUB"));
 	wp->show();
-
-	//wp->playAutomatically();
-//    sound = new QSound("sounds/train-whistle-01.wav");
-//    assert(sound->isAvailable());
-//    sound->play();
-
-	/**
-	 call of the game algorithmus
-	 */
-
-	/**
-	 connect this shit
-	 */
-	// TODO some connects
-	//connect(wp, SIGNAL(requestZp(int)), &(game1->stateList), SLOT(callGet(int)) );
-	//connect(&(game1->stateList), SIGNAL(emitGet(Zustand*)), wp, SLOT(setZp(Zustand*)));
-
 }

userinterface/source/window.cpp

@@ -89,7 +89,6 @@ Window::Window(SimulationLogger *game) :
  Slot-Implementationen
  */
 void Window::setZp(State *aktuellerZustand) {
-	cout << "Aufruf von setZp" << endl;
 	aZp = aktuellerZustand;
 	spielbrett->update();
 }
@@ -144,7 +143,3 @@ void Window::setsimulationp(SimulationLogger *game) {
 	moveSpinBox->setRange(0,
 			simulationp->gameList[gameCounter]->roundList[roundCounter]->moveList.size());
 }
-
-//void Window::playAutomatically(){
-//    for (int i=0; i<=100; i++) QTimer::singleShot(10, this , SLOT(setZustandcounter(int i)));
-//}