Module fehlerhaft übersetzt.

Start_Linux/main.c

@@ -40,7 +40,7 @@ int main(int argc, char *argv[])
             // Check if all words were successfully placed
             // Start the game if successful
             // error message if some words couldn't be placed
-            printf("HAllo");
+
         }
         else
         {

Start_Windows/game.c

@@ -2,8 +2,6 @@
 #include <time.h>
 #include <stdlib.h>
 #include <string.h>
-#include <math.h>
-
 
 #define MAX_RAND_TRIES_PER_WORD 10
 #define EMPTY_CHAR 0
@@ -12,102 +10,14 @@
 /* * Wörter aus der Wortliste zufällig horizontal oder vertikal platzieren
    * restliche Felder mit zufälligen Buchstaben füllen */
 
-
-int checkforOverlap(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], short x, short y, short richtung, const char wort[])
-{
-   for(size_t i = 0 ; i < strlen(wort); i++ )
-   {
-      short xoffset = (richtung) ? i : 0;
-      short yoffset = (richtung) ? 0 : i;
-      if (!(salad[x+xoffset][y+yoffset]=='#' || salad[x+xoffset][y+yoffset]==wort[i]))
-      {
-         return(-1);
-      }
-   }
-   return(1);
-}
 // 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, const char words[][MAX_WORD_LEN], unsigned int wordCount)
 {
-   unsigned int placedCount = 0;
-
-   for(short i = 0; i < searchFieldLen; i++) 
-   {
-    for(short j = 0; j < searchFieldLen; j++) 
-    {
-        salad[i][j] = '#';
-    }
-   }
-   srand(time(NULL));
-   for(short i = wordCount;i>0;i--)
-   {
-      size_t platzbedarf = strlen(words[i-1]);
-      if (platzbedarf > searchFieldLen)
-      {
-         printf("%s konnte nicht eingefuegt werden da es groesser als das Feld ist\n",words[i-1]);
-         continue;
-      }
-      short x,y,waagrecht;
-      int zuoft = enoughTries(searchFieldLen,0.99);
-      int versuche = 0;
-      do 
-      {
-         versuche++;
-         short max = searchFieldLen - platzbedarf;
-         short position1 = rand() % (max +1);
-         short position2 = rand() % (searchFieldLen);
-         waagrecht = rand()%2;
-         x = (waagrecht) ? position1:position2;
-         y = (waagrecht) ? position2:position1;
-
-
-      }while(checkforOverlap(salad,x,y,waagrecht,words[i-1])!=1 && versuche<=zuoft);
-      if(versuche > zuoft)
-      {
-         printf("%s passt nicht mehr ins Gitter\n",words[i-1]);
-         continue;
-      }
-      for(size_t k = 0 ; k < strlen(words[i-1]); k++ )
-      {
-         short xoffset = (waagrecht) ? k : 0;
-         short yoffset = (waagrecht) ? 0 : k;
-         salad[x+xoffset][y+yoffset]=words[i-1][k];
-      }
-
-      placedCount++;
-      
-      
-   }
-   for(short i = 0; i < searchFieldLen; i++) 
-   {
-    for(short j = 0; j < searchFieldLen; j++) 
-    {
-        if(salad[i][j] == '#')
-        {
-            salad[i][j]='A' + (rand()%26);
-        }
-    }
-   }
-   
-   return placedCount;
 
 }
 
 // Prints the word salad to console
 void showWordSalad(const char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsigned int searchFieldLen)
 {
-    for (unsigned int y = 0; y < searchFieldLen; y++) {
-        for (unsigned int x = 0; x < searchFieldLen; x++) {
-            printf("%c ", salad[x][y]); // oder printf("%c", salad[x][y]); ohne Leerzeichen
-        }
-        printf("\n"); // neue Zeile nach jeder Zeile
-    }
-}
 
-int enoughTries(double feldgroesse, double sicherheit) {
-    double moeglichkeiten = feldgroesse * feldgroesse;                 // Anzahl der Möglichkeiten
-    double c = -log(-log(sicherheit));         // Zusatzterm aus Zielwahrscheinlichkeit
-    double versuche = moeglichkeiten * (log(moeglichkeiten) + c);      // Coupon-Collector-Formel
-    return (int)ceil(versuche);
 }
-

Start_Windows/game.h

@@ -4,8 +4,8 @@
 #include "input.h"
 
 #define MAX_SEARCH_FIELD_LEN 100
-int checkforOverlap(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], short x, short y, short richtung, const char wort[]);
+
 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);
-int enoughTries(double feldgroesse, double sicherheit);
+
 #endif

Start_Windows/input.c

@@ -6,59 +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 isValidWord(const char *word)
-            {
-                for (int i = 0;word[i]; i++)
-                {
-                    if (!('A' <= word[i] && word[i] <= 'Z'))
-                    {
-                        return 0;
-                    }
-                }
-                return 1;
-            }
 int readWords(FILE *file, char words[][MAX_WORD_LEN], unsigned int maxWordCount)
 {
-    char line[1024];  // Puffer für eine Zeile
-    unsigned int count = 0;
 
-    // Alle gewünschten Trennzeichen
-    const char *delimiters = " \t\n,.;:!?\"'()[]{}";
-
-    // Zeile für Zeile lesen
-    while (fgets(line, sizeof(line), file) != NULL && count < maxWordCount) {
-        // Tokenize Zeile nach Trennzeichen
-        char *token = strtok(line, delimiters);
-
-        while (token != NULL && count < maxWordCount) 
-        {
-            // Überspringe leere Tokens
-            if (token && strlen(token) > 0)
-            {
-                // Alles in Großbuchstaben umwandeln
-                for (int i = 0; token[i]; i++) 
-                 {
-                    token[i] = toupper(token[i]);
-                }
-                 // Prüfen, ob das Wort nur A-Z enthält
-
-            
-
-                if (!isValidWord(token)) 
-                    {
-                        fprintf(stderr, "Ungültiges Wort gefunden: '%s'. Nur Buchstaben A-Z erlaubt.\n", token);
-                        token = strtok(NULL, delimiters);
-                        continue; // Wort ignorieren
-                    }
-
-                // Wort ins Array kopieren
-                strncpy(words[count], token, MAX_WORD_LEN - 1);
-                words[count][MAX_WORD_LEN - 1] = '\0';
-                count++;
-            }
-            token = strtok(NULL, delimiters);
-        }
-    }
-
-    return count; // Datei nicht schließen – gehört dem Aufrufer
 }

Start_Windows/input.h

@@ -7,6 +7,5 @@
 #define MAX_LINE_LEN 1024
 
 int readWords(FILE *file, char words[][MAX_WORD_LEN], unsigned int maxWordCount);
-int isValidWord(const char *word);
 
 #endif

Start_Windows/main.c

@@ -9,25 +9,6 @@
 
 int main(int argc, char *argv[])
 {
-    /*
-    char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN];
-    char words[MAX_NUMBER_OF_WORDS][100] = 
-    {
-    "TESTN",
-    "KATZE",
-    "ENTE",
-    "BEERE",
-    "FEE",
-    "KLEE",
-    "Feheler",
-    "SEE",
-    };
-    int wordCount = 8;
-    createWordSalad(salad,7, words,wordCount);
-    showWordSalad(salad,7);
-   
-    */
-    
     int exitCode = EXIT_SUCCESS;
 
     // Check if the correct number of arguments is provided
@@ -59,18 +40,6 @@ int main(int argc, char *argv[])
             // Check if all words were successfully placed
             // Start the game if successful
             // error message if some words couldn't be placed
-            if(placedWords == wordCount)
-            {
-                // Start the game with the created word salad
-                printf("Squares: %u, Words: %u\n", SALAD_SIZE, placedWords);
-                unsigned int windowWidth = 800;
-                startGame(wordSalad, SALAD_SIZE, words, wordCount, windowWidth);
-            }
-            else
-            {
-                fprintf(stderr, "Could not place all words into the word salad. Placed %u out of %u words.\n", placedWords, wordCount);
-                exitCode = EXIT_FAILURE;
-            }
 
         }
         else
@@ -82,6 +51,4 @@ int main(int argc, char *argv[])
     }
 
     return exitCode;
-    
 }
-    

Start_Windows/makefile

@@ -35,15 +35,11 @@ graphicalGame.o: graphicalGame.c
 # --------------------------
 TEST_BIN = runTests
 
-#test: input.o game.o unit_tests.c
+test: input.o game.o unit_tests.c
-#	$(CC) $(CFLAGS) -I$(unityfolder) -o $(TEST_BIN) input.o game.o unit_tests.c $(BINARIES)/libunity.a
+	$(CC) $(CFLAGS) -I$(unityfolder) -o $(TEST_BIN) input.o game.o unit_tests.c $(BINARIES)/libunity.a
-test: input.o game.o unit_tests.c $(unityfolder)/unity.c
-	$(CC) $(CFLAGS) -I$(unityfolder) -o $(TEST_BIN) input.o game.o unit_tests.c $(unityfolder)/unity.c
 
 # --------------------------
 # Clean
 # --------------------------
-#clean:
-#	del /f *.o *.exe
 clean:
-	rm -f *.o *.exe
+	del /f *.o *.exe