wiesendsi102436/info2Praktikum-Wortsalat
1
0
Fork 0
forked from freudenreichan/info2Praktikum-Wortsalat
Code Issues Pull Requests Releases Activity

Compare commits

base: wiesendsi102436:main
Branches Tags
wiesendsi102436:main
wiesendsi102436:simon
freudenreichan:main
..
compare: freudenreichan:main
Branches Tags
freudenreichan:main
wiesendsi102436:main
wiesendsi102436:simon

No commits in common. "main" and "main" have entirely different histories.
main ... main

9 changed files with 18 additions and 321 deletions
Show Stats Expand all files Collapse all files

9
.gitignore vendored
View File

@ -1,9 +0,0 @@
wordsalad_initial
runTests
wordsalad
*.o
*.exe
testwords_delims.txt
testwords_empty.txt
testwords_simple.txt
.vscode

104
Start_Linux/game.c
View File

@ -6,118 +6,18 @@
#define MAX_RAND_TRIES_PER_WORD 10
#define EMPTY_CHAR 0
// TODO: Spiellogik implementieren:
//TODO: Spiellogik implementieren:
/* * Wörter aus der Wortliste zufällig horizontal oder vertikal platzieren
* restliche Felder mit zufälligen Buchstaben füllen */
// Creates the word salad by placing words randomly and filling empty spaces
int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsigned int searchFieldLen, char words[][MAX_WORD_LEN], unsigned int wordCount)
int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsigned int searchFieldLen, const char words[][MAX_WORD_LEN], unsigned int wordCount)
{
srand(time(NULL));
int row, col, placedWords = 0;
// Gesamtes Feld auf 0 setzen
for (row = 0; row < searchFieldLen; row++)
{
for (col = 0; col < searchFieldLen; col++)
{
salad[row][col] = EMPTY_CHAR;
}
}
// Wortlänge wird für jedes Wort erfasst
for (int w = 0; w < wordCount; w++)
{
const char *word = words[w];
int wordLen = strlen(word);
if (wordLen == 0 || wordLen > searchFieldLen)
{
continue;
}
int placed = 0;
for (int tries = 0; tries < MAX_RAND_TRIES_PER_WORD && !placed; tries++)
{
int dir = (rand() % 2); // 0 oder 1 zur Festlegung von vertikal oder horizontal
row = 0;
col = 0;
if (dir == 0)
{ // horizontal //Startpunkt so festlegen, dass Wort nicht aus Feld raus ragt
row = rand() % searchFieldLen;
col = rand() % (searchFieldLen - wordLen + 1);
}
else
{ // vertikal
row = rand() % (searchFieldLen - wordLen + 1);
col = rand() % searchFieldLen;
}
int placeable = 1;
for (int i = 0; i < wordLen; i++)
{ // Felder ab Startpunkt werden durchgegangen und gecheckt, ob Felder auf Null sind:
// JA =>Wort wird im nächsten Schritt platziert, NEIN => Abbruch, Neuer Startpunkt wird festgelegt
if ((dir == 0 && salad[row][col + i] != EMPTY_CHAR) || (dir == 1 && salad[row + i][col] != EMPTY_CHAR))
{
placeable = 0;
break;
}
}
if (placeable)
{ // wenn es keine Überschneidungen gibt, wird Wort platziert
for (int i = 0; i < wordLen; i++)
{
if (dir == 0)
{
salad[row][col + i] = word[i];
}
else
{
salad[row + i][col] = word[i];
}
}
// copy actually placed words to the front of the array
// it's safe to use strcpy here
strcpy(words[placedWords], word);
placed = 1;
placedWords++;
}
}
}
// Felder, in denen keine Buchstaben stehen, werden mit zufälligen Buchstaben befüllt
for (row = 0; row < searchFieldLen; row++)
{
for (col = 0; col < searchFieldLen; col++)
{
if (salad[row][col] == EMPTY_CHAR)
{
salad[row][col] = 'A' + (rand() % 26);
}
}
}
// return "Anzahl platzierter Wörter", wird in Main dann mit "soll" verglichen
return placedWords;
}
// Prints the word salad to console
void showWordSalad(const char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsigned int searchFieldLen)
{
int row, col;
// Ausgabe des gesamten Feldes
for (row = 0; row < searchFieldLen; row++)
{
for (col = 0; col < searchFieldLen; col++)
{
printf("%c ", salad[row][col]);
}
printf("\n");
}
}

2
Start_Linux/game.h
View File

@ -5,7 +5,7 @@
#define MAX_SEARCH_FIELD_LEN 100
int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsigned int searchFieldLen, char words[][MAX_WORD_LEN], unsigned int wordCount);
int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsigned int searchFieldLen, const char words[][MAX_WORD_LEN], unsigned int wordCount);
void showWordSalad(const char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsigned int searchFieldLen);
#endif

33
Start_Linux/input.c
View File

@ -1,5 +1,4 @@
#include "input.h"
#include <stdio.h>
#include <string.h>
#include <ctype.h>
@ -7,39 +6,7 @@
// eine Funktion implementieren, die ein einzelnes Wort aus einer Textdatei (words.txt) einliest und als C-String zurückgibt.
// Read words from file and store in 'words' array
int readWords(FILE *file, char words[][MAX_WORD_LEN], unsigned int maxWordCount)
{
char buffer[MAX_WORD_LEN];
unsigned int count = 0;
if (file == NULL)
{
return 1;
}
while (fgets(buffer, sizeof(buffer), file) != NULL)
{
// Zerlege Zeile in einzelne Wörter anhand der Trennzeichen
char *token = strtok(buffer, " ,;\n");
while (token != NULL && count < maxWordCount)
{
// In Großbuchstaben umwandeln
for (int i = 0; token[i] != '\0'; i++)
{
token[i] = toupper((unsigned char)token[i]);
}
// Token in das words-Array kopieren
strncpy(words[count], token, MAX_WORD_LEN - 1);
words[count][MAX_WORD_LEN - 1] = '\0'; // sicher terminieren
count++;
// Nächsten Token holen
token = strtok(NULL, " ,;\n");
}
}
return count;
}

22
Start_Linux/main.c
View File

@ -6,14 +6,13 @@
#define MAX_NUMBER_OF_WORDS 100
#define SALAD_SIZE 20
#define WINDOW_WIDTH 800
int main(int argc, char *argv[])
{
int exitCode = EXIT_SUCCESS;
// Check if the correct number of arguments is provided
if (argc != 2)
if(argc != 2)
{
fprintf(stderr, "Usage: %s <path to file with search words>\n", argv[0]);
exitCode = EXIT_FAILURE;
@ -25,7 +24,7 @@ int main(int argc, char *argv[])
FILE *file = fopen(argv[1], "r");
if (file != NULL)
if(file != NULL)
{
unsigned int placedWords = 0;
char wordSalad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN]; // 2D array to store the word salad
@ -37,24 +36,11 @@ int main(int argc, char *argv[])
// Create the word salad by placing words into grid
placedWords = createWordSalad(wordSalad, SALAD_SIZE, words, wordCount);
// TODO:
// Check if all words were successfully placed
// Start the game if successful
// error message if some words couldn't be placed
if (placedWords < wordCount)
{
int notPlacedNum = wordCount - placedWords;
fprintf(stderr, "%d word(s) couldn't be placed\n", notPlacedNum);
}
// Start game if at least 1 word was successfully placed
if (placedWords > 0)
{
startGame(wordSalad, SALAD_SIZE, words, placedWords, WINDOW_WIDTH);
}
else
{
fprintf(stderr, "no word could be placed");
exitCode = EXIT_FAILURE;
}
}
else
{

104
Start_Windows/game.c
View File

@ -6,118 +6,18 @@
#define MAX_RAND_TRIES_PER_WORD 10
#define EMPTY_CHAR 0
// TODO: Spiellogik implementieren:
//TODO: Spiellogik implementieren:
/* * Wörter aus der Wortliste zufällig horizontal oder vertikal platzieren
* restliche Felder mit zufälligen Buchstaben füllen */
// Creates the word salad by placing words randomly and filling empty spaces
int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsigned int searchFieldLen, char words[][MAX_WORD_LEN], unsigned int wordCount)
int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsigned int searchFieldLen, const char words[][MAX_WORD_LEN], unsigned int wordCount)
{
srand(time(NULL));
int row, col, placedWords = 0;
// Gesamtes Feld auf 0 setzen
for (row = 0; row < searchFieldLen; row++)
{
for (col = 0; col < searchFieldLen; col++)
{
salad[row][col] = EMPTY_CHAR;
}
}
// Wortlänge wird für jedes Wort erfasst
for (int w = 0; w < wordCount; w++)
{
const char *word = words[w];
int wordLen = strlen(word);
if (wordLen == 0 || wordLen > searchFieldLen)
{
continue;
}
int placed = 0;
for (int tries = 0; tries < MAX_RAND_TRIES_PER_WORD && !placed; tries++)
{
int dir = (rand() % 2); // 0 oder 1 zur Festlegung von vertikal oder horizontal
row = 0;
col = 0;
if (dir == 0)
{ // horizontal //Startpunkt so festlegen, dass Wort nicht aus Feld raus ragt
row = rand() % searchFieldLen;
col = rand() % (searchFieldLen - wordLen + 1);
}
else
{ // vertikal
row = rand() % (searchFieldLen - wordLen + 1);
col = rand() % searchFieldLen;
}
int placeable = 1;
for (int i = 0; i < wordLen; i++)
{ // Felder ab Startpunkt werden durchgegangen und gecheckt, ob Felder auf Null sind:
// JA =>Wort wird im nächsten Schritt platziert, NEIN => Abbruch, Neuer Startpunkt wird festgelegt
if ((dir == 0 && salad[row][col + i] != EMPTY_CHAR) || (dir == 1 && salad[row + i][col] != EMPTY_CHAR))
{
placeable = 0;
break;
}
}
if (placeable)
{ // wenn es keine Überschneidungen gibt, wird Wort platziert
for (int i = 0; i < wordLen; i++)
{
if (dir == 0)
{
salad[row][col + i] = word[i];
}
else
{
salad[row + i][col] = word[i];
}
}
// copy actually placed words to the front of the array
// it's safe to use strcpy here
strcpy(words[placedWords], word);
placed = 1;
placedWords++;
}
}
}
// Felder, in denen keine Buchstaben stehen, werden mit zufälligen Buchstaben befüllt
for (row = 0; row < searchFieldLen; row++)
{
for (col = 0; col < searchFieldLen; col++)
{
if (salad[row][col] == EMPTY_CHAR)
{
salad[row][col] = 'A' + (rand() % 26);
}
}
}
// return "Anzahl platzierter Wörter", wird in Main dann mit "soll" verglichen
return placedWords;
}
// Prints the word salad to console
void showWordSalad(const char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsigned int searchFieldLen)
{
int row, col;
// Ausgabe des gesamten Feldes
for (row = 0; row < searchFieldLen; row++)
{
for (col = 0; col < searchFieldLen; col++)
{
printf("%c ", salad[row][col]);
}
printf("\n");
}
}

2
Start_Windows/game.h
View File

@ -5,7 +5,7 @@
#define MAX_SEARCH_FIELD_LEN 100
int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsigned int searchFieldLen, char words[][MAX_WORD_LEN], unsigned int wordCount);
int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsigned int searchFieldLen, const char words[][MAX_WORD_LEN], unsigned int wordCount);
void showWordSalad(const char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsigned int searchFieldLen);
#endif

33
Start_Windows/input.c
View File

@ -1,5 +1,4 @@
#include "input.h"
#include <stdio.h>
#include <string.h>
#include <ctype.h>
@ -7,39 +6,7 @@
// eine Funktion implementieren, die ein einzelnes Wort aus einer Textdatei (words.txt) einliest und als C-String zurückgibt.
// Read words from file and store in 'words' array
int readWords(FILE *file, char words[][MAX_WORD_LEN], unsigned int maxWordCount)
{
char buffer[MAX_WORD_LEN];
unsigned int count = 0;
if (file == NULL)
{
return 1;
}
while (fgets(buffer, sizeof(buffer), file) != NULL)
{
// Zerlege Zeile in einzelne Wörter anhand der Trennzeichen
char *token = strtok(buffer, " ,;\n");
while (token != NULL && count < maxWordCount)
{
// In Großbuchstaben umwandeln
for (int i = 0; token[i] != '\0'; i++)
{
token[i] = toupper((unsigned char)token[i]);
}
// Token in das words-Array kopieren
strncpy(words[count], token, MAX_WORD_LEN - 1);
words[count][MAX_WORD_LEN - 1] = '\0'; // sicher terminieren
count++;
// Nächsten Token holen
token = strtok(NULL, " ,;\n");
}
}
return count;
}

22
Start_Windows/main.c
View File

@ -6,14 +6,13 @@
#define MAX_NUMBER_OF_WORDS 100
#define SALAD_SIZE 20
#define WINDOW_WIDTH 800
int main(int argc, char *argv[])
{
int exitCode = EXIT_SUCCESS;
// Check if the correct number of arguments is provided
if (argc != 2)
if(argc != 2)
{
fprintf(stderr, "Usage: %s <path to file with search words>\n", argv[0]);
exitCode = EXIT_FAILURE;
@ -25,7 +24,7 @@ int main(int argc, char *argv[])
FILE *file = fopen(argv[1], "r");
if (file != NULL)
if(file != NULL)
{
unsigned int placedWords = 0;
char wordSalad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN]; // 2D array to store the word salad
@ -37,24 +36,11 @@ int main(int argc, char *argv[])
// Create the word salad by placing words into grid
placedWords = createWordSalad(wordSalad, SALAD_SIZE, words, wordCount);
// TODO:
// Check if all words were successfully placed
// Start the game if successful
// error message if some words couldn't be placed
if (placedWords < wordCount)
{
int notPlacedNum = wordCount - placedWords;
fprintf(stderr, "%d word(s) couldn't be placed\n", notPlacedNum);
}
// Start game if at least 1 word was successfully placed
if (placedWords > 0)
{
startGame(wordSalad, SALAD_SIZE, words, placedWords, WINDOW_WIDTH);
}
else
{
fprintf(stderr, "no word could be placed");
exitCode = EXIT_FAILURE;
}
}
else
{