Module fehlerhaft übersetzt.

Reviewed-on: freudenreichan/info2Praktikum-Wortsalat#3

.gitignore

@@ -1,6 +0,0 @@
-Start_Windows/main.o
-Start_Windows/graphicalGame.o
-Start_Windows/wordsalad_myversion.exe
-Start_Windows/game.o
-Start_Windows/input.o
-Start_Windows/wordsalad.exe

Start_Linux/makefile

@@ -1,9 +1,9 @@
 CC = gcc
-CFLAGS = -g -Wall -I$(raylibfolder)
+CFLAGS = -g -Wall
 LDFLAGS = -lGL -lX11 -lm
 BINARIES = ./linux
 
-raylib_folder = ./raylib
+raylibfolder = ./raylib
 unityfolder = ./unity
 
 # --------------------------
@@ -28,7 +28,7 @@ game.o: game.c
 	$(CC) $(CFLAGS) -c game.c
 
 graphicalGame.o: graphicalGame.c
-	$(CC) $(CFLAGS) -c graphicalGame.c
+	$(CC) $(CFLAGS) -I$(raylibfolder) -c graphicalGame.c
 
 # --------------------------
 # Unit Tests

Start_Linux/unit_tests.c

@@ -101,7 +101,37 @@ void test_createWordSalad_too_small(void) {
     }
 }
 
+void test_createWordSalad_allWordsPlaced() {
+    char words[3][MAX_WORD_LEN] = {"CAT", "DOG", "MOUSE"};
+    char saladHoriz[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN];
+    char saladVert[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN];
+
+    int placed = createWordSalad(saladHoriz, 20, words, 3);
+    for(int i = 0; i < MAX_SEARCH_FIELD_LEN; i++)
+    {
+        for(int j = 0; j < MAX_SEARCH_FIELD_LEN; j++)
+        {
+            saladVert[j][i] = saladHoriz[i][j];
+        }
+    }
+
+    for(int i = 0; i < 3; i++) {
+        const char* word = words[i];
+        int wordFound = 0;
+        for(int j = 0; j < MAX_SEARCH_FIELD_LEN; j++)
+        {
+            const char* row = saladHoriz[j];
+            const char* col = saladVert[j];
+            wordFound |= strstr(row, word) || strstr(col, word);
+        }
+        TEST_ASSERT_TRUE_MESSAGE(wordFound, "Not all words were placed.");
+    }
+
+    TEST_ASSERT_EQUAL_INT(3, placed);
+}
+
 // ---------- Test Setup und TearDown Funktionen ----------
+
 // Hier Setup- und TearDown-Funktionen definieren,
 // falls Vor- und Nachbereitungen für die Tests benötigt.
 
@@ -134,6 +164,7 @@ int main(void) {
     RUN_TEST(test_readWords_empty_file);
     RUN_TEST(test_createWordSalad_all_fit);
     RUN_TEST(test_createWordSalad_too_small);
+    RUN_TEST(test_createWordSalad_allWordsPlaced);
 
     int result = UNITY_END();  // Test-Ergebnisse
     print_test_result(result);

Start_Mac/makefile

@@ -4,7 +4,7 @@ LDFLAGS = -framework OpenGL -framework CoreFoundation -framework CoreGraphics -f
 ARCH := $(shell uname -m)
 BINARIES = ./macos-$(ARCH)
 
-raylib_folder = ./raylib
+raylibfolder = ./raylib
 unityfolder = ./unity
 
 # --------------------------
@@ -43,4 +43,4 @@ test: input.o game.o unit_tests.c $(BINARIES)/libunity.a
 # Clean
 # --------------------------
 clean:
-	rm -f *.o wordsalad
+	rm -f *.o wordsalad $(TEST_BIN)

Start_Mac/unit_tests.c

@@ -101,6 +101,35 @@ void test_createWordSalad_too_small(void) {
     }
 }
 
+void test_createWordSalad_allWordsPlaced() {
+    char words[3][MAX_WORD_LEN] = {"CAT", "DOG", "MOUSE"};
+    char saladHoriz[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN];
+    char saladVert[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN];
+
+    int placed = createWordSalad(saladHoriz, 20, words, 3);
+    for(int i = 0; i < MAX_SEARCH_FIELD_LEN; i++)
+    {
+        for(int j = 0; j < MAX_SEARCH_FIELD_LEN; j++)
+        {
+            saladVert[j][i] = saladHoriz[i][j];
+        }
+    }
+
+    for(int i = 0; i < 3; i++) {
+        const char* word = words[i];
+        int wordFound = 0;
+        for(int j = 0; j < MAX_SEARCH_FIELD_LEN; j++)
+        {
+            const char* row = saladHoriz[j];
+            const char* col = saladVert[j];
+            wordFound |= strstr(row, word) || strstr(col, word);
+        }
+        TEST_ASSERT_TRUE_MESSAGE(wordFound, "Not all words were placed.");
+    }
+
+    TEST_ASSERT_EQUAL_INT(3, placed);
+}
+
 // ---------- Test Setup und TearDown Funktionen ----------
 
 // Hier Setup- und TearDown-Funktionen definieren,
@@ -135,6 +164,7 @@ int main(void) {
     RUN_TEST(test_readWords_empty_file);
     RUN_TEST(test_createWordSalad_all_fit);
     RUN_TEST(test_createWordSalad_too_small);
+    RUN_TEST(test_createWordSalad_allWordsPlaced);
 
     int result = UNITY_END();  // Test-Ergebnisse
     print_test_result(result);

Start_Windows/game.c

@@ -6,153 +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 */
+   * 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, const char words[][MAX_WORD_LEN], unsigned int wordCount)
 {
-   // set seed
-   // showWordSalad(salad, 20);
 
-   for (int i = 0; i < MAX_SEARCH_FIELD_LEN; i++)
-   {
-      for (int j = 0; j < MAX_SEARCH_FIELD_LEN; j++)
-      {
-         salad[i][j] = '\0';
-      }
-   }
-
-   // showWordSalad(salad, 20);
-   srand(time(NULL));
-
-   int wordsPlaced = 0;
-
-   // loop through all words
-   for (int n = 0; n < wordCount; n++)
-   {
-      int checkSquare, retries = 0;
-      int wordLength = strlen(words[n]);
-      
-      if(wordLength > searchFieldLen) {
-         printf("Fehler");
-         break;
-      }
-
-      // get random coordinates
-      int rndX = rand() % (searchFieldLen - wordLength + 1);
-      int rndY = rand() % (searchFieldLen - wordLength + 1);
-
-      if (rand() % 2)
-      {
-         // checks if word fits into gamefield
-         while (checkSquare != wordLength && retries < 10)
-         {
-            checkSquare = 0;
-            // checks if squares to paste into is already taken
-            for (int x = rndX; x < (rndX + wordLength); x++)
-            {
-               if (salad[rndY][x] == '\0')
-                  checkSquare++;
-            }
-
-            // new coords when doesnt fit
-            if (checkSquare != wordLength)
-            {
-               rndX = rand() % (searchFieldLen - wordLength + 1);
-               rndY = rand() % (searchFieldLen - wordLength + 1);
-
-               retries++;
-            }
-         }
-
-         if (retries >= 10)
-         {
-            printf("Word %d couldn't be placed", n);
-            break;
-         }
-
-         // pastes word into the line
-         if (checkSquare == wordLength)
-         {
-            for (int x = 0; x < wordLength; x++)
-            {
-               salad[rndY][rndX + x] = words[n][x];
-            }
-         }
-
-         wordsPlaced++;
-      }
-      else
-      {
-
-         // checks if word fits into gamefield
-         while (checkSquare != wordLength && retries < 10)
-         {
-            checkSquare = 0;
-            // checks if squares to paste into is already taken
-            for (int y = rndY; y < (rndY + wordLength); y++)
-            {
-               if (salad[y][rndX] == '\0')
-                  checkSquare++;
-            }
-
-            // new coords when doesnt fit
-            if (checkSquare != wordLength)
-            {
-               rndX = rand() % (searchFieldLen - wordLength + 1);
-               rndY = rand() % (searchFieldLen - wordLength + 1);
-
-               retries++;
-            }
-         }
-
-         if (retries >= 10)
-         {
-            printf("Word %d couldn't be placed", n);
-            break;
-         }
-
-         // pastes word into the line
-         if (checkSquare == wordLength)
-         {
-            for (int y = 0; y < wordLength; y++)
-            {
-               salad[y + rndY][rndX] = words[n][y];
-            }
-         }
-
-         wordsPlaced++;
-      }
-   }
-
-   // fill voids
-   for (int x = 0; x < searchFieldLen; x++)
-   {
-      for (int y = 0; y < searchFieldLen; y++)
-      {
-         if (salad[y][x] == '\0')
-         {
-            // random number from 65 (A) to 90 (Z) with ASCII
-            salad[y][x] = rand() % (25 + 1) + 65;
-         }
-      }
-   }
-   return wordsPlaced;
 }
 
 // Prints the word salad to console
 void showWordSalad(const char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsigned int searchFieldLen)
 {
-   int i, j = 0;
-   for (i = 0; i < searchFieldLen; i++)
-   {
-      for (j = 0; j < searchFieldLen - 1; j++)
-      {
-         printf(" %c,", salad[i][j]);
-      }
 
-      printf(" %c\n", salad[i][searchFieldLen]);
-   }
 }

Start_Windows/input.c

@@ -8,38 +8,5 @@
 // Read words from file and store in 'words' array
 int readWords(FILE *file, char words[][MAX_WORD_LEN], unsigned int maxWordCount)
 {
-    char puffer[MAX_LINE_LEN];
-    char *teiler = " ,;.\n";
-    char *token;
 
-    if (file == NULL)
-    {
-        printf("\nNot able to open file.\n");
-        return -1;
-    }
-
-    int n = 0;
-
-    while (fgets(puffer, MAX_LINE_LEN, file) != NULL)
-    {
-        token = strtok(puffer, teiler);
-
-        while (token != NULL)
-        {
-            strncpy(words[n], token, MAX_WORD_LEN);
-
-            char *s = words[n];
-            while (*s)
-            {
-                *s = toupper((unsigned char)*s);
-                s++;
-            }
-
-            // printf("Einzelwort: %s\n", words[n]);
-
-            token = strtok(NULL, teiler);
-            n++;
-        }
-    }
-    return n;
 }

Start_Windows/main.c

@@ -40,15 +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)
-            {
-                printf("All words placed successfully (%u / %u).\n", placedWords, wordCount);
-                startGame(wordSalad, SALAD_SIZE, words, wordCount, 800);
-            }
-            else 
-            {
-                printf("Could only place %u of %u words.\n", placedWords, wordCount);
-            }
 
         }
         else

Start_Windows/makefile

@@ -1,25 +1,17 @@
 CC = gcc
-CFLAGS = -g -Wall -I$(raylib_folder)
+CFLAGS = -g -Wall
 LDFLAGS = -lopengl32 -lgdi32 -lwinmm
 BINARIES = ./windows
 
-raylib_folder = ./raylib
+raylibfolder = ./raylib
 unityfolder = ./unity
 
-# --------------------------
-# eigenes Spiel bauen
-# --------------------------
-wordsalad_myversion: main.o graphicalGame.o $(BINARIES)/libwordsalad.a $(BINARIES)/libraylib.a
-	$(CC) -o wordsalad_myversion main.o graphicalGame.o $(BINARIES)/libwordsalad.a $(BINARIES)/libraylib.a $(LDFLAGS)
-
-
 # --------------------------
 # initiales Spiel bauen
 # --------------------------
 wordsalad_initial:
 	$(CC) -o wordsalad_initial $(BINARIES)/libwordsalad_complete.a $(BINARIES)/libraylib.a $(LDFLAGS)
 
-
 # --------------------------
 # Normales Spiel bauen
 # --------------------------
@@ -27,7 +19,7 @@ all: main.o input.o game.o graphicalGame.o $(BINARIES)/libraylib.a
 	$(CC) $(CFLAGS) -o wordsalad main.o input.o game.o graphicalGame.o $(BINARIES)/libraylib.a $(LDFLAGS)
 
 main.o: main.c
-	$(CC) -I$(raylib_folder) -c $(CFLAGS) main.c 
+	$(CC) -c $(CFLAGS) main.c
 
 input.o: input.c
 	$(CC) -c $(CFLAGS) input.c
@@ -36,7 +28,7 @@ game.o: game.c
 	$(CC) -c $(CFLAGS) game.c
 
 graphicalGame.o: graphicalGame.c
-	$(CC) -I$(raylib_folder) -c $(CFLAGS) graphicalGame.c
+	$(CC) -I$(raylibfolder) -c $(CFLAGS) graphicalGame.c
 
 # --------------------------
 # Unit Tests
@@ -51,9 +43,3 @@ test: input.o game.o unit_tests.c
 # --------------------------
 clean:
 	del /f *.o *.exe
-
-
-
-
-#[befehlname]: [dependency] -wenn in dependency eine änderung dann erstell neu
-#	gcc [code] -  "-o [name]" Outputdatei Namen angeben 	"-c [name].c" kompiliere das programm			"[name].a [name].o" benutze diese um das programm zu bauen

Start_Windows/unit_tests.c

@@ -101,6 +101,35 @@ void test_createWordSalad_too_small(void) {
     }
 }
 
+void test_createWordSalad_allWordsPlaced() {
+    char words[3][MAX_WORD_LEN] = {"CAT", "DOG", "MOUSE"};
+    char saladHoriz[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN];
+    char saladVert[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN];
+
+    int placed = createWordSalad(saladHoriz, 20, words, 3);
+    for(int i = 0; i < MAX_SEARCH_FIELD_LEN; i++)
+    {
+        for(int j = 0; j < MAX_SEARCH_FIELD_LEN; j++)
+        {
+            saladVert[j][i] = saladHoriz[i][j];
+        }
+    }
+
+    for(int i = 0; i < 3; i++) {
+        const char* word = words[i];
+        int wordFound = 0;
+        for(int j = 0; j < MAX_SEARCH_FIELD_LEN; j++)
+        {
+            const char* row = saladHoriz[j];
+            const char* col = saladVert[j];
+            wordFound |= strstr(row, word) || strstr(col, word);
+        }
+        TEST_ASSERT_TRUE_MESSAGE(wordFound, "Not all words were placed.");
+    }
+
+    TEST_ASSERT_EQUAL_INT(3, placed);
+}
+
 // ---------- Test Setup und TearDown Funktionen ----------
 
 // Hier Setup- und TearDown-Funktionen definieren,
@@ -135,6 +164,7 @@ int main(void) {
     RUN_TEST(test_readWords_empty_file);
     RUN_TEST(test_createWordSalad_all_fit);
     RUN_TEST(test_createWordSalad_too_small);
+    RUN_TEST(test_createWordSalad_allWordsPlaced);
 
     int result = UNITY_END();  // Test-Ergebnisse
     print_test_result(result);