generated from freudenreichan/info2Praktikum-DobleSpiel
Compare commits
2 Commits
85b05133ea
...
027a8eaeb7
| Author | SHA1 | Date | |
|---|---|---|---|
| 027a8eaeb7 | |||
| fdfa3c5769 |
24
bintree.c
24
bintree.c
@ -22,7 +22,7 @@ TreeNode *addToTree(TreeNode *root, const void *data, size_t dataSize, CompareFc
|
|||||||
newNode->data = malloc(dataSize);
|
newNode->data = malloc(dataSize);
|
||||||
newNode->left = NULL;
|
newNode->left = NULL;
|
||||||
newNode->right = NULL;
|
newNode->right = NULL;
|
||||||
strcpy(newNode->data, data);
|
memcpy(newNode->data, data, dataSize);
|
||||||
if(isDuplicate)
|
if(isDuplicate)
|
||||||
*isDuplicate = 0;
|
*isDuplicate = 0;
|
||||||
return newNode;
|
return newNode;
|
||||||
@ -52,28 +52,30 @@ TreeNode *addToTree(TreeNode *root, const void *data, size_t dataSize, CompareFc
|
|||||||
// push the top node and push all its left nodes.
|
// push the top node and push all its left nodes.
|
||||||
void *nextTreeData(TreeNode *root)
|
void *nextTreeData(TreeNode *root)
|
||||||
{
|
{
|
||||||
printf("nextTreeData wurde gecallt!\n");
|
|
||||||
if(root)
|
if(root)
|
||||||
{
|
{
|
||||||
addTreeToStack(stackRoot, root);
|
stackRoot = addTreeToStack(stackRoot, root);
|
||||||
printf("Baum wurde geladen!\n");
|
|
||||||
}
|
}
|
||||||
void *buffer = pop(stackRoot);
|
void *stackBuffer = top(stackRoot);
|
||||||
printf("neuer Eintrag wurde geholt: %x\n", buffer);
|
stackRoot = pop(stackRoot);
|
||||||
return buffer;
|
//void *buffer = (stackBuffer->stackData);
|
||||||
|
//printf("neuer Eintrag wurde geholt: %x\n", buffer);
|
||||||
|
//return buffer;
|
||||||
|
return stackBuffer;
|
||||||
}
|
}
|
||||||
// Adds all Treenode-Datas of a root into a stack ordered from left to right
|
// Adds all Treenode-Datas of a root into a stack ordered from left to right
|
||||||
void addTreeToStack(StackNode *start, TreeNode *root)
|
StackNode *addTreeToStack(StackNode *start, TreeNode *root)
|
||||||
{
|
{
|
||||||
if(root->left)
|
if(root->left)
|
||||||
{
|
{
|
||||||
addTreeToStack(start, root->left);
|
start = addTreeToStack(start, root->left);
|
||||||
}
|
}
|
||||||
push(start, root->data);
|
start = push(start, root->data);
|
||||||
if(root->right)
|
if(root->right)
|
||||||
{
|
{
|
||||||
addTreeToStack(start, root->right);
|
start = addTreeToStack(start, root->right);
|
||||||
}
|
}
|
||||||
|
return start;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Releases all memory resources (including data copies).
|
// Releases all memory resources (including data copies).
|
||||||
|
|||||||
@ -26,5 +26,5 @@ void clearTree(TreeNode *root);
|
|||||||
// Returns the number of entries in the tree given by root.
|
// Returns the number of entries in the tree given by root.
|
||||||
unsigned int treeSize(const TreeNode *root);
|
unsigned int treeSize(const TreeNode *root);
|
||||||
// Adds all Treenode-Datas of a root into a stack ordered from left to right
|
// Adds all Treenode-Datas of a root into a stack ordered from left to right
|
||||||
void addTreeToStack(StackNode *start, TreeNode *root);
|
StackNode *addTreeToStack(StackNode *start, TreeNode *root);
|
||||||
#endif
|
#endif
|
||||||
@ -0,0 +1,9 @@
|
|||||||
|
HeldDerSteine;69
|
||||||
|
Gunter11;121
|
||||||
|
MaxiMustermann;316
|
||||||
|
MillaMusterfrau;420
|
||||||
|
testspieler68;2996
|
||||||
|
testspieler69;2997
|
||||||
|
testspieler67;2997
|
||||||
|
testspieler1;2997
|
||||||
|
testspieler68;4991
|
||||||
1
main.c
1
main.c
@ -84,6 +84,5 @@ int main(int argc, char *argv[])
|
|||||||
|
|
||||||
exitCode = EXIT_SUCCESS;
|
exitCode = EXIT_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
return exitCode;
|
return exitCode;
|
||||||
}
|
}
|
||||||
5
stack.c
5
stack.c
@ -1,4 +1,5 @@
|
|||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
#include <stdio.h>
|
||||||
#include "stack.h"
|
#include "stack.h"
|
||||||
|
|
||||||
//TODO: grundlegende Stackfunktionen implementieren:
|
//TODO: grundlegende Stackfunktionen implementieren:
|
||||||
@ -40,7 +41,9 @@ StackNode *pop(StackNode *stack)
|
|||||||
free(temp);
|
free(temp);
|
||||||
temp = NULL;
|
temp = NULL;
|
||||||
return stack;
|
return stack;
|
||||||
} else {
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user