generated from freudenreichan/info2Praktikum-DobleSpiel
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9afecd8502 |
@@ -31,7 +31,9 @@ void createchecknumber(unsigned int len, unsigned int numbers[])
|
||||
|
||||
do
|
||||
{
|
||||
unsigned int value = (rand() % (len * 2) + 1);
|
||||
unsigned int value = 0;
|
||||
value = (rand() % (len * 2) + 1);
|
||||
|
||||
same = 0;
|
||||
|
||||
for (unsigned int j = 0; j < i; j++)
|
||||
@@ -54,11 +56,6 @@ void createchecknumber(unsigned int len, unsigned int numbers[])
|
||||
|
||||
unsigned int *createNumbers(unsigned int len)
|
||||
{
|
||||
if (len <= 2) //sonst Index-Auswahl-Dauerschleife
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (RANDOM_SEED == 0)
|
||||
{
|
||||
srand(time(NULL));
|
||||
@@ -71,7 +68,7 @@ unsigned int *createNumbers(unsigned int len)
|
||||
unsigned int *numbers = malloc(sizeof(unsigned int) * len);
|
||||
if (numbers == NULL)
|
||||
{
|
||||
return NULL;
|
||||
return 0;
|
||||
}
|
||||
|
||||
createchecknumber(len, numbers);
|
||||
@@ -81,6 +78,9 @@ unsigned int *createNumbers(unsigned int len)
|
||||
|
||||
do
|
||||
{
|
||||
i = 0;
|
||||
j = 0;
|
||||
|
||||
i = rand() % len;
|
||||
j = rand() % len;
|
||||
|
||||
@@ -89,6 +89,7 @@ unsigned int *createNumbers(unsigned int len)
|
||||
numbers[i] = numbers[j];
|
||||
|
||||
return numbers;
|
||||
|
||||
}
|
||||
|
||||
void sortnumbers(unsigned int numbers[], unsigned int len)
|
||||
@@ -108,20 +109,15 @@ void sortnumbers(unsigned int numbers[], 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)
|
||||
{
|
||||
if (numbers == NULL || len < 2) // sonst Index-Auswahl-Dauerschleife
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
unsigned int *copynumbers = malloc(sizeof(unsigned int) * len);
|
||||
if (copynumbers == NULL)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
for (unsigned int i = 0; i < len; i++)
|
||||
{
|
||||
copynumbers[i] = numbers[i];
|
||||
@@ -131,15 +127,15 @@ unsigned int getDuplicate(const unsigned int numbers[], unsigned int len)
|
||||
|
||||
for (unsigned i = 0; i < len - 1; i++)
|
||||
{
|
||||
if (copynumbers[i] == copynumbers[i + 1])
|
||||
if (copynumbers[i] == copynumbers[i+1])
|
||||
{
|
||||
unsigned int a = copynumbers[i];
|
||||
free(copynumbers);
|
||||
free (copynumbers);
|
||||
return a;
|
||||
}
|
||||
}
|
||||
|
||||
free(copynumbers);
|
||||
free (copynumbers);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -8,9 +8,29 @@
|
||||
* `clearStack`: gibt den gesamten Speicher frei. */
|
||||
|
||||
// Pushes data as pointer onto the stack.
|
||||
static StackNode *createEmptyElement()
|
||||
{
|
||||
return malloc(sizeof(StackNode));
|
||||
}
|
||||
StackNode *push(StackNode *stack, void *data)
|
||||
{
|
||||
|
||||
StackNode *newElement = createEmptyElement();
|
||||
newElement->data = data;
|
||||
newElement->next = NULL;
|
||||
if (stack == NULL)
|
||||
{
|
||||
stack = newElement;
|
||||
}
|
||||
else
|
||||
{
|
||||
StackNode *currentElement = stack;
|
||||
while(currentElement->next != NULL)
|
||||
{
|
||||
currentElement = currentElement->next;
|
||||
}
|
||||
currentElement->next = newElement;
|
||||
return stack;
|
||||
}
|
||||
}
|
||||
|
||||
// Deletes the top element of the stack (latest added element) and releases its memory. (Pointer to data has to be
|
||||
|
||||
@@ -8,6 +8,11 @@ The latest element is taken from the stack. */
|
||||
#include <stdlib.h>
|
||||
|
||||
//TODO: passenden Datentyp als struct anlegen
|
||||
typedef struct node
|
||||
{
|
||||
void *data;
|
||||
struct node* next;
|
||||
}StackNode;
|
||||
|
||||
// Pushes data as pointer onto the stack.
|
||||
StackNode *push(StackNode *stack, void *data);
|
||||
@@ -22,4 +27,4 @@ void *top(StackNode *stack);
|
||||
// Clears stack and releases all memory.
|
||||
void clearStack(StackNode *stack);
|
||||
|
||||
#endif
|
||||
#endif
|
||||
@@ -0,0 +1,20 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include "stack.h"
|
||||
|
||||
void testPushAddsElementCorrectly(void)
|
||||
{
|
||||
int a = 10;
|
||||
StackNode *node = push(NULL, &a);
|
||||
|
||||
TEST_ASSERT_NOT_NULL(node);
|
||||
TEST_ASSERT_EQUAL_INT(a, *((int*)node->data)); //void Zeiger in integer-Zeiger umwandeln
|
||||
}
|
||||
|
||||
int main(void)
|
||||
{
|
||||
UNITY_BEGIN();
|
||||
RUN_TEST(testPushAddsElementCorrectly);
|
||||
return UNITY_END();
|
||||
}
|
||||
Reference in New Issue
Block a user