generated from freudenreichan/info2Praktikum-Wortsalat
discovery of logic mistake in overlap
This commit is contained in:
parent
a5d5cf82b6
commit
c596dc20c3
@ -15,14 +15,13 @@ int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsi
|
||||
{
|
||||
srand(time(NULL));
|
||||
|
||||
//1. Schritt: Alle Felder mit 0 befüllen
|
||||
int size_word;
|
||||
int placedWords = 0;
|
||||
unsigned int succesfully_placed = 0;
|
||||
unsigned int tries = 0;
|
||||
unsigned int check_direction = 0, check_overlap = 0;
|
||||
int zeile = 0, spalte = 0, len = 0;
|
||||
|
||||
//1. Schritt: Alle Felder mit 0 befüllen
|
||||
for(int m = 0; m < searchFieldLen; m++) //m Zeilen
|
||||
{
|
||||
for(int n = 0; n < searchFieldLen; n++) //n Spalte
|
||||
@ -39,7 +38,7 @@ int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsi
|
||||
if (len < searchFieldLen)
|
||||
return -1; //ERROR, falls Wort größer als Größe des Feldes (unnötig, da bei worteingabe bereits überprüft)
|
||||
|
||||
while(succesfully_placed == 0 && tries < MAX_RAND_TRIES_PER_WORD)
|
||||
while(tries < MAX_RAND_TRIES_PER_WORD)
|
||||
{
|
||||
// zufällige Richtung auswählen
|
||||
int direction = rand() % 2; // 0 = VERTIKAL, 1 = HORIZONTAL
|
||||
@ -54,12 +53,12 @@ int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsi
|
||||
|
||||
if (direction == 1) // 1 = HORIZONTAL -> Zeile egal
|
||||
{
|
||||
int zeile = rand() % (searchFieldLen);
|
||||
int spalte = rand() % (searchFieldLen - len);
|
||||
zeile = rand() % (searchFieldLen);
|
||||
spalte = rand() % (searchFieldLen - len);
|
||||
check_direction = 1;
|
||||
}
|
||||
|
||||
//Prüfen auf Überlappung
|
||||
//Prüfen auf Überlappung ----------> Logikfehler
|
||||
for(int i_overlap = 0; i_overlap < len; i_overlap++)
|
||||
{
|
||||
if (direction == 0) // 0 = VERTIKAL
|
||||
@ -73,11 +72,12 @@ int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsi
|
||||
check_overlap = 1;
|
||||
}
|
||||
if(check_overlap == 0)
|
||||
tries++;
|
||||
break;
|
||||
}
|
||||
|
||||
//3. Schritt: Wort in Wortsalat schreiben
|
||||
if(check_direction == 1 && check_overlap == 1)
|
||||
if(check_direction == 1 && check_overlap == 1 && tries < MAX_RAND_TRIES_PER_WORD)
|
||||
{
|
||||
for(int i_set = 0; i_set < len; i_set++)
|
||||
{
|
||||
|
||||
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user