forked from freudenreichan/info2Praktikum-DobleSpiel
Compare commits
6
Commits
1bbefdb72a
..
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e7a872252a | ||
|
|
de9e0a3357 | ||
|
|
746b9b7219 | ||
|
|
1f3fba80ec | ||
|
|
1d363980f6 | ||
|
|
4ce3a6aac0
|
No files matched your search
+60
-3
@@ -1,5 +1,62 @@
|
||||
*doble*
|
||||
# ---> C
|
||||
# Prerequisites
|
||||
*.d
|
||||
|
||||
# Object files
|
||||
*.o
|
||||
*.ko
|
||||
*.obj
|
||||
*.elf
|
||||
|
||||
# Linker output
|
||||
*.ilk
|
||||
*.map
|
||||
*.exp
|
||||
|
||||
# Precompiled Headers
|
||||
*.gch
|
||||
*.pch
|
||||
|
||||
# Libraries
|
||||
*.lib
|
||||
*.la
|
||||
*.lo
|
||||
|
||||
# Shared objects (inc. Windows DLLs)
|
||||
*.dll
|
||||
*.so
|
||||
*.so.*
|
||||
*.dylib
|
||||
|
||||
# Executables
|
||||
*.exe
|
||||
.vscode
|
||||
run*Tests
|
||||
*.out
|
||||
*.app
|
||||
*.i*86
|
||||
*.x86_64
|
||||
*.hex
|
||||
Startcode/doble_initial
|
||||
Startcode/doble
|
||||
Startcode/unitTests
|
||||
|
||||
# Debug files
|
||||
*.dSYM/
|
||||
*.su
|
||||
*.idb
|
||||
*.pdb
|
||||
|
||||
# Kernel Module Compile Results
|
||||
*.mod*
|
||||
*.cmd
|
||||
.tmp_versions/
|
||||
modules.order
|
||||
Module.symvers
|
||||
Mkfile.old
|
||||
dkms.conf
|
||||
|
||||
# IDE folders
|
||||
.vscode/
|
||||
.idea/
|
||||
|
||||
# macOS
|
||||
.DS_Store
|
||||
Binary file not shown.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -1,6 +1,5 @@
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <time.h>
|
||||
#include "numbers.h"
|
||||
#include "timer.h"
|
||||
#include "highscore.h"
|
||||
@@ -40,9 +39,6 @@ int main(int argc, char *argv[])
|
||||
{
|
||||
int exitCode = EXIT_FAILURE;
|
||||
|
||||
// set seed
|
||||
srand(time(NULL));
|
||||
|
||||
if(argc != 2)
|
||||
{
|
||||
fprintf(stderr, "Usage: %s <player name>\n", argv[0]);
|
||||
@@ -71,7 +67,7 @@ int main(int argc, char *argv[])
|
||||
userInput = inputNumber("Welche Zahl kommt doppelt vor: ");
|
||||
measuredSeconds = stopTimer();
|
||||
|
||||
duplicate = getDuplicate(numbers, numberOfElements+1);
|
||||
duplicate = getDuplicate(numbers, numberOfElements);
|
||||
|
||||
// check result and update highscores
|
||||
if(userInput == duplicate)
|
||||
@@ -87,7 +83,6 @@ int main(int argc, char *argv[])
|
||||
saveHighscores(highscorePath);
|
||||
clearHighscores();
|
||||
|
||||
free(numbers);
|
||||
exitCode = EXIT_SUCCESS;
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
CC = gcc
|
||||
CFLAGS = -g -Wall -lm
|
||||
FLAGS = -g -Wall -lm
|
||||
|
||||
ifeq ($(OS),Windows_NT)
|
||||
include makefile_windows.variables
|
||||
@@ -27,29 +27,16 @@ doble_initial:
|
||||
program_obj_files = stack.o bintree.o numbers.o timer.o highscore.o
|
||||
|
||||
doble : main.o $(program_obj_files)
|
||||
$(CC) $(CFLAGS) $^ -o doble
|
||||
$(CC) $(FLAGS) $^ -o doble
|
||||
|
||||
$(program_obj_files): %.o: %.c
|
||||
$(CC) -c $(CFLAGS) $^ -o $@
|
||||
$(CC) -c $(FLAGS) $^ -o $@
|
||||
|
||||
# --------------------------
|
||||
# Unit Tests
|
||||
# --------------------------
|
||||
TEST_STACK_SOURCES = stack.c test_stack.c $(unityfolder)/unity.c
|
||||
TEST_BINTREE_SOURCES = bintree.c test_bintree.c stack.c $(unityfolder)/unity.c
|
||||
TEST_NUMBERS_SOURCES = stack.c numbers.c bintree.c $(unityfolder)/unity.c test_numbers.c
|
||||
|
||||
stackTests: $(TEST_STACK_SOURCES) stack.h
|
||||
$(CC) $(CFLAGS) -I$(unityfolder) $(TEST_STACK_SOURCES) -o runStackTests
|
||||
./runStackTests
|
||||
|
||||
bintreeTests: $(TEST_BINTREE_SOURCES) stack.h bintree.h
|
||||
$(CC) $(CFLAGS) -I$(unityfolder) $(TEST_BINTREE_SOURCES) -o runBintreeTests
|
||||
./runBintreeTests
|
||||
|
||||
numbersTests: $(TEST_NUMBERS_SOURCES) stack.h bintree.h numbers.h
|
||||
$(CC) $(CFLAGS) -I$(unityfolder) $(TEST_NUMBERS_SOURCES) -o runNumbersTests
|
||||
./runNumbersTests
|
||||
unitTests:
|
||||
echo "needs to be implemented"
|
||||
|
||||
# --------------------------
|
||||
# Clean
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -0,0 +1,26 @@
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <time.h>
|
||||
#include <string.h>
|
||||
#include "numbers.h"
|
||||
#include "bintree.h"
|
||||
|
||||
//TODO: getDuplicate und createNumbers implementieren
|
||||
/* * * Erzeugen eines Arrays mit der vom Nutzer eingegebenen Anzahl an Zufallszahlen.
|
||||
* Sicherstellen, dass beim Befüllen keine Duplikate entstehen.
|
||||
* Duplizieren eines zufälligen Eintrags im Array.
|
||||
* in `getDuplicate()`: Sortieren des Arrays und Erkennen der doppelten Zahl durch Vergleich benachbarter Elemente. */
|
||||
|
||||
// Returns len random numbers between 1 and 2x len in random order which are all different, except for two entries.
|
||||
// Returns NULL on errors. Use your implementation of the binary search tree to check for possible duplicates while
|
||||
// creating random numbers.
|
||||
unsigned int *createNumbers(unsigned int len)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
// Returns only the only number in numbers which is present twice. Returns zero on errors.
|
||||
unsigned int getDuplicate(const unsigned int numbers[], unsigned int len)
|
||||
{
|
||||
|
||||
}
|
||||
File renamed without changes.
@@ -0,0 +1,33 @@
|
||||
#include <stdlib.h>
|
||||
#include "stack.h"
|
||||
|
||||
//TODO: grundlegende Stackfunktionen implementieren:
|
||||
/* * `push`: legt ein Element oben auf den Stack,
|
||||
* `pop`: entfernt das oberste Element,
|
||||
* `top`: liefert das oberste Element zurück,
|
||||
* `clearStack`: gibt den gesamten Speicher frei. */
|
||||
|
||||
// Pushes data as pointer onto the stack.
|
||||
StackNode *push(StackNode *stack, void *data)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
// Deletes the top element of the stack (latest added element) and releases its memory. (Pointer to data has to be
|
||||
// freed by caller.)
|
||||
StackNode *pop(StackNode *stack)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
// Returns the data of the top element.
|
||||
void *top(StackNode *stack)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
// Clears stack and releases all memory.
|
||||
void clearStack(StackNode *stack)
|
||||
{
|
||||
|
||||
}
|
||||
@@ -7,11 +7,7 @@ The latest element is taken from the stack. */
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
typedef struct StackNode
|
||||
{
|
||||
struct StackNode *next;
|
||||
void *data;
|
||||
} StackNode;
|
||||
//TODO: passenden Datentyp als struct anlegen
|
||||
|
||||
// Pushes data as pointer onto the stack.
|
||||
StackNode *push(StackNode *stack, void *data);
|
||||
@@ -1,12 +1,6 @@
|
||||
#include "timer.h"
|
||||
|
||||
#ifdef __linux__
|
||||
// Defines strict posix compliance for CLOCK_MONOTONIC
|
||||
#define _POSIX_C_SOURCE 199309L
|
||||
#include <time.h>
|
||||
#endif
|
||||
|
||||
#if __APPLE__ || __linux__
|
||||
#if __APPLE__
|
||||
#include <sys/time.h>
|
||||
static struct timespec start = {0, 0};
|
||||
|
||||
@@ -27,8 +21,7 @@ double stopTimer()
|
||||
|
||||
double measuredSeconds = (double)delta_us / 1000000.;
|
||||
|
||||
if (start.tv_nsec > 0)
|
||||
{
|
||||
if(start.tv_nsec > 0) {
|
||||
start.tv_nsec = 0;
|
||||
start.tv_sec = 0;
|
||||
}
|
||||
@@ -52,7 +45,7 @@ double stopTimer()
|
||||
{
|
||||
double measuredSeconds = (clock() - (double)startClocks) / CLOCKS_PER_SEC;
|
||||
|
||||
if (startClocks > 0)
|
||||
if(startClocks > 0)
|
||||
startClocks = 0;
|
||||
else
|
||||
measuredSeconds = -1;
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -1,63 +0,0 @@
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <time.h>
|
||||
#include <string.h>
|
||||
#include "numbers.h"
|
||||
#include "bintree.h"
|
||||
|
||||
//Speicher für Array erstellen, zufällige Zahlen von 1-2xlen erzeugen, mittels Binärbaum checken, ob Zahlen einzigartig sind
|
||||
//Eine Zahl duplizieren, an zufälliger Stelle einfügen und die Zahl an der Stelle ans Ende schieben
|
||||
unsigned int *createNumbers(unsigned int len)
|
||||
{
|
||||
unsigned int *numbers = malloc (sizeof(unsigned int) * len);
|
||||
unsigned int upperLimit = len * 2;
|
||||
int isDuplicate = 0;
|
||||
TreeNode *binTree = NULL;
|
||||
|
||||
for (unsigned int i = 0; i < len; i++) {
|
||||
do
|
||||
{
|
||||
numbers[i] = rand () % upperLimit + 1;
|
||||
binTree = addToTree(binTree, &numbers[i], sizeof(unsigned int), compare, &isDuplicate);
|
||||
} while (isDuplicate);
|
||||
}
|
||||
|
||||
unsigned int duplicate = numbers[rand () % len];
|
||||
int indexDuplicate = rand () % len;
|
||||
numbers[len] = numbers[indexDuplicate];
|
||||
numbers[indexDuplicate] = duplicate;
|
||||
|
||||
return numbers;
|
||||
}
|
||||
|
||||
//Vergleichsfunktion von qsort
|
||||
const int compare (const void *a, const void *b) {
|
||||
unsigned int *x = a;
|
||||
unsigned int *y = b;
|
||||
if (*x < *y) {
|
||||
return -1;
|
||||
}
|
||||
else if (*x > *y) {
|
||||
return 1;
|
||||
}
|
||||
else {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
//Sortiert Zahlen mit qsort, vergleicht dann benachbarte Elemente und gibt bei Erfolg die doppelte Zahl zurück
|
||||
unsigned int getDuplicate(unsigned int numbers[], unsigned int len)
|
||||
{
|
||||
if (len < 2) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
qsort(numbers, len, sizeof(unsigned int), compare);
|
||||
|
||||
for (int i = 0; i < len-1; i++) {
|
||||
if (numbers[i] == numbers [i+1]) {
|
||||
return numbers[i];
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
@@ -1,55 +0,0 @@
|
||||
#include <stdlib.h>
|
||||
#include "stack.h"
|
||||
|
||||
// TODO: grundlegende Stackfunktionen implementieren:
|
||||
/* * `push`: legt ein Element oben auf den Stack,
|
||||
* `pop`: entfernt das oberste Element,
|
||||
* `top`: liefert das oberste Element zurück,
|
||||
* `clearStack`: gibt den gesamten Speicher frei. */
|
||||
|
||||
// Pushes data as pointer onto the stack.
|
||||
StackNode *push(StackNode *stack, void *data)
|
||||
{
|
||||
// this is the new top node
|
||||
StackNode *newTopNode = malloc(sizeof(StackNode));
|
||||
|
||||
if (newTopNode == NULL)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
newTopNode->data = data;
|
||||
newTopNode->next = stack;
|
||||
|
||||
return newTopNode;
|
||||
}
|
||||
|
||||
// Deletes the top element of the stack (latest added element) and releases its memory. (Pointer to data has to be
|
||||
// freed by caller.)
|
||||
StackNode *pop(StackNode *stack)
|
||||
{
|
||||
if (!stack)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
StackNode *nextNode = stack->next;
|
||||
free(stack);
|
||||
return nextNode;
|
||||
}
|
||||
|
||||
// Returns the data of the top element.
|
||||
void *top(StackNode *stack)
|
||||
{
|
||||
if (!stack)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
return stack->data;
|
||||
}
|
||||
|
||||
// Clears stack and releases all memory.
|
||||
void clearStack(StackNode *stack)
|
||||
{
|
||||
while (pop(stack))
|
||||
;
|
||||
}
|
||||
@@ -1,39 +0,0 @@
|
||||
#include "unity.h"
|
||||
#include "bintree.h"
|
||||
#include "string.h"
|
||||
|
||||
void setUp(void)
|
||||
{
|
||||
// set stuff up here
|
||||
}
|
||||
|
||||
void tearDown(void)
|
||||
{
|
||||
// set stuff up here
|
||||
}
|
||||
|
||||
// this adds some strings and checks if they are returned in the right order
|
||||
void test_insert_and_retrieve(void)
|
||||
{
|
||||
char *data1 = "a_this";
|
||||
char *data2 = "b_is";
|
||||
char *data3 = "c_testdata";
|
||||
|
||||
TreeNode *root = addToTree(NULL, data1, strlen(data1) + 1, (CompareFctType)&strcmp, NULL);
|
||||
addToTree(root, data2, strlen(data2) + 1, (CompareFctType)&strcmp, NULL);
|
||||
addToTree(root, data3, strlen(data3) + 1, (CompareFctType)&strcmp, NULL);
|
||||
|
||||
TEST_ASSERT_EQUAL_STRING(data1, (char *)nextTreeData(root));
|
||||
TEST_ASSERT_EQUAL_STRING(data2, (char *)nextTreeData(NULL));
|
||||
TEST_ASSERT_EQUAL_STRING(data3, (char *)nextTreeData(NULL));
|
||||
|
||||
clearTree(root);
|
||||
}
|
||||
|
||||
int main(void)
|
||||
{
|
||||
printf("============================\nBintree tests\n============================\n");
|
||||
UNITY_BEGIN();
|
||||
RUN_TEST(test_insert_and_retrieve);
|
||||
return UNITY_END();
|
||||
}
|
||||
@@ -1,50 +0,0 @@
|
||||
#include "unity.h"
|
||||
// #include "bintree.h"
|
||||
// #include "string.h"
|
||||
#include "numbers.h"
|
||||
#include "stdlib.h"
|
||||
|
||||
void setUp(void)
|
||||
{
|
||||
// set stuff up here
|
||||
}
|
||||
|
||||
void tearDown(void)
|
||||
{
|
||||
// set stuff up here
|
||||
}
|
||||
|
||||
// getDuplicate on array without duplicats
|
||||
// expects 0/error
|
||||
void test_get_duplicate_error(void)
|
||||
{
|
||||
unsigned int input[] = {1, 5, 9, 2, 4};
|
||||
unsigned int len = sizeof(input) / sizeof(input[0]);
|
||||
|
||||
TEST_ASSERT_EQUAL_UINT(0, getDuplicate(input, len));
|
||||
}
|
||||
|
||||
// this tries to brute force a triple
|
||||
void test_for_triple(void)
|
||||
{
|
||||
// this test is less effective if srand is called inside createNumbers()
|
||||
for (int i = 0; i < 100000; i++)
|
||||
{
|
||||
unsigned int *numbers = createNumbers(3);
|
||||
if (numbers[0] == numbers[1] && numbers[1] == numbers[2])
|
||||
{
|
||||
// fail the test
|
||||
TEST_ASSERT(0);
|
||||
}
|
||||
free(numbers);
|
||||
}
|
||||
}
|
||||
|
||||
int main(void)
|
||||
{
|
||||
printf("============================\nNumbers tests\n============================\n");
|
||||
UNITY_BEGIN();
|
||||
RUN_TEST(test_get_duplicate_error);
|
||||
RUN_TEST(test_for_triple);
|
||||
return UNITY_END();
|
||||
}
|
||||
@@ -1,47 +0,0 @@
|
||||
#include "unity.h"
|
||||
#include "stack.h"
|
||||
|
||||
int data1 = 10;
|
||||
int data2 = 20;
|
||||
int data3 = 30;
|
||||
|
||||
StackNode *stack = NULL;
|
||||
|
||||
void setUp(void)
|
||||
{
|
||||
// set stuff up here
|
||||
}
|
||||
|
||||
void tearDown(void)
|
||||
{
|
||||
clearStack(stack);
|
||||
}
|
||||
|
||||
void test_push_and_pop(void)
|
||||
{
|
||||
stack = push(stack, &data1);
|
||||
stack = push(stack, &data2);
|
||||
stack = push(stack, &data3);
|
||||
|
||||
TEST_ASSERT_EQUAL_PTR(top(stack), &data3);
|
||||
stack = pop(stack);
|
||||
TEST_ASSERT_EQUAL_PTR(top(stack), &data2);
|
||||
stack = pop(stack);
|
||||
TEST_ASSERT_EQUAL_PTR(top(stack), &data1);
|
||||
stack = pop(stack);
|
||||
}
|
||||
|
||||
void test_handle_NULL(void)
|
||||
{
|
||||
TEST_ASSERT_NULL(pop(stack));
|
||||
TEST_ASSERT_NULL(top(stack));
|
||||
}
|
||||
|
||||
int main(void)
|
||||
{
|
||||
printf("============================\nStack tests\n============================\n");
|
||||
UNITY_BEGIN();
|
||||
RUN_TEST(test_push_and_pop);
|
||||
RUN_TEST(test_handle_NULL);
|
||||
return UNITY_END();
|
||||
}
|
||||
Reference in new issue
Block a user