From 4cc6c6596b614fce392040b85a182dbf50d0b044 Mon Sep 17 00:00:00 2001
From: manzerbredes <loic.guegan_secondary@yahoo.fr>
Date: Sun, 3 May 2015 09:57:31 +0200
Subject: Organize all the code

---
 src/Model/Grid.hpp | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'src/Model/Grid.hpp')

diff --git a/src/Model/Grid.hpp b/src/Model/Grid.hpp
index 4ed5c10..51168a9 100644
--- a/src/Model/Grid.hpp
+++ b/src/Model/Grid.hpp
@@ -15,45 +15,45 @@
 class Grid
 {
 	private:
+		//Members
 		int m_size;
 		std::vector<std::vector<int> > m_grid;
-
 		int m_lastMoveScore;
 
+		//Private methods
 		int maxStrLenInGrid();
 
 	public:
+		//Constructor and Destructor
 		Grid();
 		~Grid();
 
-		std::string description();
-		bool isEmpty(int i, int j);
-		std::tuple<int, int> getRandomEmptyCellCoord();
-
-		bool setCell(std::tuple<int, int> coord, int value);
-		bool setCell(int i, int j, int value);
-
-		std::vector<int> swipeLine(std::vector<int> line);
+		//Defragment and merge methods
 		std::vector<int> rightDefragment(std::vector<int> line);
 		std::vector<int> leftDefragment(std::vector<int> line);
 		std::vector<int> rightMerge(std::vector<int> line);
 		std::vector<int> leftMerge(std::vector<int> line);
 
-		std::vector<int> getCol(int col);
-
-		bool isFull();
-		bool isOver();
-
-		void setCol(int col, std::vector<int> colVect);
-		std::vector<int> reverseLine(std::vector<int> line);
-		bool compareLines(std::vector<int> line1, std::vector<int> line2);
-
-		//Moves
+		//Swipe methods
 		bool swipeRight();
 		bool swipeLeft();
 		bool swipeUp();
 		bool swipeDown();
 
+		//Helpers
+		bool isFull();
+		bool isOver();
+		bool isEmpty(int i, int j);
+		std::tuple<int, int> getRandomEmptyCellCoord();
+		bool compareLines(std::vector<int> line1, std::vector<int> line2);
+		std::vector<int> reverseLine(std::vector<int> line);
+		std::string description();
+
+		//Getters and Setters
+		bool setCell(std::tuple<int, int> coord, int value);
+		bool setCell(int i, int j, int value);
+		std::vector<int> getCol(int col);
+		void setCol(int col, std::vector<int> colVect);
 		int getLastMoveScore();
 };
 
-- 
cgit v1.2.3