alex/CrossGen
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Some code improvement

Browse Source
This commit is contained in:
Aleksey Lobanov
2015-06-11 22:36:29 +03:00
parent 0481d8272a
commit 4ece16c53f
3 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CrossGen.workspace
View File

@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<CodeLite_Workspace Name="CrossGen" Database=""> <CodeLite_Workspace Name="CrossGen" Database="">
<Project Name="wxCrossGen" Path="wxCrossGen/wxCrossGen.project" Active="No"/> <Project Name="wxCrossGen" Path="wxCrossGen/wxCrossGen.project" Active="Yes"/>
<Project Name="CrossBench" Path="CrossBench/CrossBench.project" Active="Yes"/> <Project Name="CrossBench" Path="CrossBench/CrossBench.project" Active="No"/>
<BuildMatrix> <BuildMatrix>
<WorkspaceConfiguration Name="Debug" Selected="yes"> <WorkspaceConfiguration Name="Debug" Selected="no">
<Project Name="wxCrossGen" ConfigName="Debug"/> <Project Name="wxCrossGen" ConfigName="Debug"/>
<Project Name="CrossBench" ConfigName="Debug"/> <Project Name="CrossBench" ConfigName="Debug"/>
</WorkspaceConfiguration> </WorkspaceConfiguration>
<WorkspaceConfiguration Name="Release" Selected="no"> <WorkspaceConfiguration Name="Release" Selected="yes">
<Project Name="wxCrossGen" ConfigName="Release"/> <Project Name="wxCrossGen" ConfigName="Release"/>
<Project Name="CrossBench" ConfigName="Release"/> <Project Name="CrossBench" ConfigName="Release"/>
</WorkspaceConfiguration> </WorkspaceConfiguration>

8
Makefile
View File

@@ -1,8 +1,8 @@
.PHONY: clean All .PHONY: clean All
All: All:
@echo "----------Building project:[ CrossBench - Debug ]----------" @echo "----------Building project:[ wxCrossGen - Release ]----------"
@cd "CrossBench" && $(MAKE) -f "CrossBench.mk" @cd "wxCrossGen" && $(MAKE) -f "wxCrossGen.mk"
clean: clean:
@echo "----------Cleaning project:[ CrossBench - Debug ]----------" @echo "----------Cleaning project:[ wxCrossGen - Release ]----------"
@cd "CrossBench" && $(MAKE) -f "CrossBench.mk" clean @cd "wxCrossGen" && $(MAKE) -f "wxCrossGen.mk" clean

14
src/crossgen.hpp
View File

@@ -58,15 +58,17 @@ void generateWordInfo(GridType &grid, std::vector<WordInfo> &winfos){
} }
size_t cur_ind = 1; size_t cur_ind = 1;
bool exist = false; bool exist = false;
for (size_t j = 0; j < grid.at(0).size(); ++j){ auto y_len = grid.at(0).size();
for (size_t i = 0; i < grid.size(); ++i){ 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 ( grid.at(i).at(j) == CELL_CLEAR ) {
if ( ((j == 0) || (grid.at(i).at(j - 1) != CELL_CLEAR)) && if ( ((j == 0) || (grid.at(i).at(j - 1) != CELL_CLEAR)) &&
(j != grid.at(0).size() - 1) ) (j !=y_len - 1) )
if ( grid.at(i).at(j+1) == CELL_CLEAR ) { if ( grid.at(i).at(j+1) == CELL_CLEAR ) {
size_t cur_len = 1; size_t cur_len = 1;
bool cont = true; bool cont = true;
while ( (j + cur_len < grid.at(0).size()) && cont ){ while ( (j + cur_len < y_len) && cont ) {
++cur_len; ++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; cont = false;
@@ -85,11 +87,11 @@ void generateWordInfo(GridType &grid, std::vector<WordInfo> &winfos){
} }
if ( ((i ==0) || (grid.at(i - 1).at(j) != CELL_CLEAR)) && 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 ){ if ( grid.at(i + 1).at(j) == CELL_CLEAR ){
size_t cur_len = 1; size_t cur_len = 1;
bool cont = true; bool cont = true;
while ((i + cur_len < grid.size()) && cont){ while ((i + cur_len < x_len) && cont){
++cur_len; ++cur_len;
if (grid.at(i+cur_len-1).at(j) != CELL_CLEAR){ if (grid.at(i+cur_len-1).at(j) != CELL_CLEAR){
cont = false; cont = false;