autoformatted

Author: bbenligiray

.gitattributes

@@ -0,0 +1,3 @@
+* text=auto
+
+*.zip binary

source/Button.h

@@ -6,34 +6,34 @@
 #include "PosChart.h"
 #include "enums.h"
 
-int getPosOfChar (const char *array, char c);
-void getLocOfChar (char c, int &loop, int &row);
+int getPosOfChar(const char *array, char c);
+void getLocOfChar(char c, int &loop, int &row);
 
 //Holds every aspect of a button
-class Button 
+class Button
 {
 	DiskPart buttonShape;
 	ValidChar writing;
 
 public:
-	Button ();
-	Button (ValidChar inpWriting);
+	Button();
+	Button(ValidChar inpWriting);
 	DiskPart& getButtonShape();
 	ValidChar& getWriting();
 };
 
-Button::Button ()
+Button::Button()
 {
 }
 
-Button::Button (ValidChar inpWriting)
+Button::Button(ValidChar inpWriting)
 {
-	writing=inpWriting;
+	writing = inpWriting;
 
 	int loop, row;
-	getLocOfChar (writing.getChar(), loop, row);
+	getLocOfChar(writing.getChar(), loop, row);
 
-	buttonShape = DiskPart(loop,row);
+	buttonShape = DiskPart(loop, row);
 }
 
 DiskPart& Button::getButtonShape()
@@ -46,20 +46,20 @@ ValidChar& Button::getWriting()
 	return writing;
 }
 
-int getPosOfChar (const char *array, char c)
+int getPosOfChar(const char *array, char c)
 {
 	size_t size = 26;	//not cool
 	const char* end = array + size;
-	const char* match = std::find (array, end, c);
-	return (end == match) ? -1 : (match-array);
+	const char* match = std::find(array, end, c);
+	return (end == match) ? -1 : (match - array);
 }
 
-void getLocOfChar (char c, int &loop, int &row)
+void getLocOfChar(char c, int &loop, int &row)
 {
-	int noOfChar = getPosOfChar (firstScreenChars, c);
+	int noOfChar = getPosOfChar(firstScreenChars, c);
 
 	if (noOfChar == -1)
-		noOfChar = getPosOfChar (secondScreenChars, c);
+		noOfChar = getPosOfChar(secondScreenChars, c);
 
 	//middle loop
 	if (noOfChar < 2)

source/ButtonSet.h

@@ -16,51 +16,51 @@ class ButtonSet
 	vector<Button> buttons;
 	PosChart positions;
 	void initPositions();
-	void mergeButtons ();
+	void mergeButtons();
 
 public:
-	ButtonSet ();
-	ButtonSet (vector<ValidChar> writings);
+	ButtonSet();
+	ButtonSet(vector<ValidChar> writings);
 	vector<Button>& getButtons();
-	bool getButtonWithField (int inpLoop, int inpRow, Button& but);
+	bool getButtonWithField(int inpLoop, int inpRow, Button& but);
 };
-ButtonSet::ButtonSet ()
+ButtonSet::ButtonSet()
 {}
-ButtonSet::ButtonSet (vector<ValidChar> writings)
+ButtonSet::ButtonSet(vector<ValidChar> writings)
 {
-	for (vector<ValidChar>::size_type i = 0; i != writings.size () ; i++)
-		buttons.push_back (Button (writings[i]));
-	initPositions ();
-	mergeButtons ();
+	for (vector<ValidChar>::size_type i = 0; i != writings.size(); i++)
+		buttons.push_back(Button(writings[i]));
+	initPositions();
+	mergeButtons();
 }
 
 //fills positions with the oriinal (non-merged) values
 void ButtonSet::initPositions()
 {
-	for (vector<Button>::size_type i = 0; i != buttons.size () ; i++)
-		positions.fillPos (buttons[i].getButtonShape ().getOrigLoop (), buttons[i].getButtonShape ().getOrigRow ());
+	for (vector<Button>::size_type i = 0; i != buttons.size(); i++)
+		positions.fillPos(buttons[i].getButtonShape().getOrigLoop(), buttons[i].getButtonShape().getOrigRow());
 }
 
 //ValidChars and Buttons will already be sorted wrt frequency
 //Simply merge them in order
-void ButtonSet::mergeButtons ()
+void ButtonSet::mergeButtons()
 {
-	 for (vector<Button>::size_type i = 0; i != buttons.size () ; i++)
-		 buttons[i].getButtonShape ().mergeRadially (positions);
-	 for (vector<Button>::size_type i = 0; i != buttons.size () ; i++)
-		 buttons[i].getButtonShape ().mergeLaterally (positions,firstPhase);
-	 for (vector<Button>::size_type i = 0; i != buttons.size () ; i++)
-		 buttons[i].getButtonShape ().mergeLaterally (positions,secondPhase);
-	 for (vector<Button>::size_type i = 0; i != buttons.size () ; i++)
-		 buttons[i].getButtonShape ().mergeLaterally (positions,thirdPhase);
+	for (vector<Button>::size_type i = 0; i != buttons.size(); i++)
+		buttons[i].getButtonShape().mergeRadially(positions);
+	for (vector<Button>::size_type i = 0; i != buttons.size(); i++)
+		buttons[i].getButtonShape().mergeLaterally(positions, firstPhase);
+	for (vector<Button>::size_type i = 0; i != buttons.size(); i++)
+		buttons[i].getButtonShape().mergeLaterally(positions, secondPhase);
+	for (vector<Button>::size_type i = 0; i != buttons.size(); i++)
+		buttons[i].getButtonShape().mergeLaterally(positions, thirdPhase);
 
 }
 vector<Button>& ButtonSet::getButtons()
 {
 	return buttons;
 }
 
-bool ButtonSet::getButtonWithField (int inpLoop, int inpRow, Button& but)
+bool ButtonSet::getButtonWithField(int inpLoop, int inpRow, Button& but)
 {
 	for (vector<Button>::size_type i = 0; i < buttons.size(); i++)
 	{

source/DiskPart.h

@@ -5,7 +5,7 @@
 #include "enums.h"
 
 //Holds the geometric aspects of a button
-class DiskPart 
+class DiskPart
 {
 	//Both innerRing and outerRing can take values [0,4]
 	//0 is the middle point, 1-2-3 are the next outer rings, 4 is the ring outside the screen
@@ -20,26 +20,26 @@ class DiskPart
 	int loop, row;
 
 public:
-	DiskPart ();
-	DiskPart (int inpLoop, int inpRow);
-	int getOrigLoop () const;
-	int getOrigRow () const;
-	void mergeRadially (PosChart &positions);
-	void mergeLaterally (PosChart &positions, lateralMergePhases ph);
-	void getShape (int &loopStart, int &loopEnd, int &rowStart, int &rowEnd);
-	bool isInDisk (int inpLoop, int inpRow);
+	DiskPart();
+	DiskPart(int inpLoop, int inpRow);
+	int getOrigLoop() const;
+	int getOrigRow() const;
+	void mergeRadially(PosChart &positions);
+	void mergeLaterally(PosChart &positions, lateralMergePhases ph);
+	void getShape(int &loopStart, int &loopEnd, int &rowStart, int &rowEnd);
+	bool isInDisk(int inpLoop, int inpRow);
 };
 
-DiskPart::DiskPart ()
+DiskPart::DiskPart()
 {
 }
-DiskPart::DiskPart (int inpLoop, int inpRow)
+DiskPart::DiskPart(int inpLoop, int inpRow)
 {
 	loop = inpLoop;
 	row = inpRow;
 
 	innerRing = loop;
-	outerRing = loop+1;
+	outerRing = loop + 1;
 
 	if (loop == 0)
 	{
@@ -58,35 +58,35 @@ DiskPart::DiskPart (int inpLoop, int inpRow)
 	}
 }
 
-int DiskPart::getOrigLoop () const
+int DiskPart::getOrigLoop() const
 {
 	return loop;
 }
-int DiskPart::getOrigRow () const
+int DiskPart::getOrigRow() const
 {
 	return row;
 }
 
 
 //This is the merge that will happen first.
-void DiskPart::mergeRadially (PosChart &positions)
+void DiskPart::mergeRadially(PosChart &positions)
 {
 	switch (loop)
 	{
 	case 0:
 		//middle loop cannot merge radially
 		break;
 	case 1:
-		if (positions.getLoop (2)[row]==0)
+		if (positions.getLoop(2)[row] == 0)
 		{
-			positions.fillPos (2, row);
+			positions.fillPos(2, row);
 			outerRing = 3;
 		}
 		break;
 	case 2:
-		if (positions.getLoop (1)[row]==0)
+		if (positions.getLoop(1)[row] == 0)
 		{
-			positions.fillPos (1, row);
+			positions.fillPos(1, row);
 			innerRing = 1;
 		}
 		break;
@@ -97,7 +97,7 @@ void DiskPart::mergeRadially (PosChart &positions)
 //First phase merges non-radially-merged buttons (ccw).
 //Second phase merges radially-merged buttons (ccw).
 //Third phase merges any remaining empty spaces (cw).
-void DiskPart::mergeLaterally (PosChart &positions, lateralMergePhases ph)
+void DiskPart::mergeLaterally(PosChart &positions, lateralMergePhases ph)
 {
 	switch (ph)
 	{
@@ -109,18 +109,18 @@ void DiskPart::mergeLaterally (PosChart &positions, lateralMergePhases ph)
 			if (loop == 0)
 			{
 				//the first loop has only two buttons
-				if  (positions.getLoop (loop)[(row + 1) % 2] == 0)
+				if (positions.getLoop(loop)[(row + 1) % 2] == 0)
 				{
-					positions.fillPos (loop, (row + 1) % 2);
+					positions.fillPos(loop, (row + 1) % 2);
 					startSlice = stopSlice = 0;
 				}
 			}
 			else
 			{
 				//other loops have 12 buttons
-				if  (positions.getLoop (loop)[(row + 1) % 12] == 0)
+				if (positions.getLoop(loop)[(row + 1) % 12] == 0)
 				{
-					positions.fillPos (loop, (row + 1) % 12);
+					positions.fillPos(loop, (row + 1) % 12);
 					stopSlice = (row + 2) % 12;
 				}
 			}
@@ -133,12 +133,12 @@ void DiskPart::mergeLaterally (PosChart &positions, lateralMergePhases ph)
 		if (outerRing - innerRing == 2)
 		{
 			//check if both nearby positions are available
-			if  ((positions.getLoop (1)[(row + 1) % 12] == 0) && (positions.getLoop (2)[(row + 1) % 12] == 0))
-				{
-					positions.fillPos (1, (row + 1) % 12);
-					positions.fillPos (2, (row + 1) % 12);
-					stopSlice = (row + 2) % 12;
-				}
+			if ((positions.getLoop(1)[(row + 1) % 12] == 0) && (positions.getLoop(2)[(row + 1) % 12] == 0))
+			{
+				positions.fillPos(1, (row + 1) % 12);
+				positions.fillPos(2, (row + 1) % 12);
+				stopSlice = (row + 2) % 12;
+			}
 		}
 		break;
 
@@ -149,35 +149,35 @@ void DiskPart::mergeLaterally (PosChart &positions, lateralMergePhases ph)
 			//don't need to merge middle again
 			if (loop != 0)
 			{
-				if  (positions.getLoop (loop)[(row + 11) % 12] == 0)
+				if (positions.getLoop(loop)[(row + 11) % 12] == 0)
 				{
-					positions.fillPos (loop, (row + 11) % 12);
+					positions.fillPos(loop, (row + 11) % 12);
 					startSlice = (row + 11) % 12;
 				}
 			}
 		}
 		else if (outerRing - innerRing == 2)
 		{
-			if  ((positions.getLoop (1)[(row + 11) % 12] == 0) && (positions.getLoop (2)[(row + 11) % 12] == 0))
-				{
-					positions.fillPos (1, (row + 11) % 12);
-					positions.fillPos (2, (row + 11) % 12);
-					startSlice = (row + 11) % 12;
-				}
+			if ((positions.getLoop(1)[(row + 11) % 12] == 0) && (positions.getLoop(2)[(row + 11) % 12] == 0))
+			{
+				positions.fillPos(1, (row + 11) % 12);
+				positions.fillPos(2, (row + 11) % 12);
+				startSlice = (row + 11) % 12;
+			}
 		}
 		break;
 	}
 }
 
-void DiskPart::getShape (int &loopStart, int &loopEnd, int &rowStart, int &rowEnd)
+void DiskPart::getShape(int &loopStart, int &loopEnd, int &rowStart, int &rowEnd)
 {
 	loopStart = innerRing;
 	loopEnd = outerRing;
 	rowStart = startSlice;
 	rowEnd = stopSlice;
 }
 
-bool DiskPart::isInDisk (int inpLoop, int inpRow)
+bool DiskPart::isInDisk(int inpLoop, int inpRow)
 {
 	switch (inpLoop)
 	{