From 4ece16c53f0c1da49d86676de3c3285b934223df Mon Sep 17 00:00:00 2001
From: Aleksey Lobanov <alekseylobanov1@gmail.com>
Date: Thu, 11 Jun 2015 22:36:29 +0300
Subject: [PATCH] Some code improvement

---
 CrossGen.workspace |  8 ++++----
 Makefile           |  8 ++++----
 src/crossgen.hpp   | 20 +++++++++++---------
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/CrossGen.workspace b/CrossGen.workspace
index 18ecac8..1bcbf0a 100644
--- a/CrossGen.workspace
+++ b/CrossGen.workspace
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CodeLite_Workspace Name="CrossGen" Database="">
-  <Project Name="wxCrossGen" Path="wxCrossGen/wxCrossGen.project" Active="No"/>
-  <Project Name="CrossBench" Path="CrossBench/CrossBench.project" Active="Yes"/>
+  <Project Name="wxCrossGen" Path="wxCrossGen/wxCrossGen.project" Active="Yes"/>
+  <Project Name="CrossBench" Path="CrossBench/CrossBench.project" Active="No"/>
   <BuildMatrix>
-    <WorkspaceConfiguration Name="Debug" Selected="yes">
+    <WorkspaceConfiguration Name="Debug" Selected="no">
       <Project Name="wxCrossGen" ConfigName="Debug"/>
       <Project Name="CrossBench" ConfigName="Debug"/>
     </WorkspaceConfiguration>
-    <WorkspaceConfiguration Name="Release" Selected="no">
+    <WorkspaceConfiguration Name="Release" Selected="yes">
       <Project Name="wxCrossGen" ConfigName="Release"/>
       <Project Name="CrossBench" ConfigName="Release"/>
     </WorkspaceConfiguration>
diff --git a/Makefile b/Makefile
index 73e2032..c1fa320 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 .PHONY: clean All
 
 All:
-	@echo "----------Building project:[ CrossBench - Debug ]----------"
-	@cd "CrossBench" && $(MAKE) -f  "CrossBench.mk"
+	@echo "----------Building project:[ wxCrossGen - Release ]----------"
+	@cd "wxCrossGen" && $(MAKE) -f  "wxCrossGen.mk"
 clean:
-	@echo "----------Cleaning project:[ CrossBench - Debug ]----------"
-	@cd "CrossBench" && $(MAKE) -f  "CrossBench.mk" clean
+	@echo "----------Cleaning project:[ wxCrossGen - Release ]----------"
+	@cd "wxCrossGen" && $(MAKE) -f  "wxCrossGen.mk" clean
diff --git a/src/crossgen.hpp b/src/crossgen.hpp
index b0e67b2..0d3b25a 100644
--- a/src/crossgen.hpp
+++ b/src/crossgen.hpp
@@ -58,17 +58,19 @@ void generateWordInfo(GridType &grid, std::vector<WordInfo> &winfos){
     }
     size_t cur_ind = 1;
     bool exist = false;
-    for (size_t j = 0; j < grid.at(0).size(); ++j){
-        for (size_t i = 0; i < grid.size(); ++i){
-            if ( grid.at(i).at(j) == CELL_CLEAR ){
+    auto y_len = grid.at(0).size();
+    auto x_len = grid.size();
+    for (size_t j = 0; j < y_len; ++j){
+        for (size_t i = 0; i < x_len; ++i){
+            if ( grid.at(i).at(j) == CELL_CLEAR ) {
                 if ( ((j == 0) ||  (grid.at(i).at(j - 1) != CELL_CLEAR)) &&
-                        (j != grid.at(0).size() - 1) )
-                    if ( grid.at(i).at(j+1) == CELL_CLEAR ){
+                        (j !=y_len - 1) )
+                    if ( grid.at(i).at(j+1) == CELL_CLEAR ) {
                         size_t cur_len = 1;
                         bool cont = true;
-                        while ( (j + cur_len < grid.at(0).size()) && cont ){
+                        while ( (j + cur_len < y_len) && cont ) {
                             ++cur_len;
-                            if ( grid.at(i).at(j+cur_len-1) != CELL_CLEAR ){
+                            if ( grid.at(i).at(j+cur_len-1) != CELL_CLEAR ) {
                                 cont = false;
                                 --cur_len;
                             }
@@ -85,11 +87,11 @@ void generateWordInfo(GridType &grid, std::vector<WordInfo> &winfos){
                     }
                 
                 if ( ((i ==0) ||  (grid.at(i - 1).at(j) != CELL_CLEAR)) &&
-                        (i != grid.size() - 1) )
+                        (i != x_len - 1) )
                     if ( grid.at(i + 1).at(j) == CELL_CLEAR ){
                         size_t cur_len = 1;
                         bool cont = true;
-                        while ((i + cur_len < grid.size()) && cont){
+                        while ((i + cur_len < x_len) && cont){
                             ++cur_len;
                             if (grid.at(i+cur_len-1).at(j) != CELL_CLEAR){
                                 cont = false;