Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| db14f57789 |
@ -93,11 +93,6 @@ TreeNode *addToTree(TreeNode *wurzel,
|
|||||||
return wurzel;
|
return wurzel;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
Die Funktion gibt bei jedem Aufruf das nächste Element des Binärbaums in **Inorder-Reihenfolge**
|
|
||||||
zurück und merkt sich intern, wo sie zuletzt war.
|
|
||||||
*/
|
|
||||||
|
|
||||||
void *nextTreeData(TreeNode *wurzel)
|
void *nextTreeData(TreeNode *wurzel)
|
||||||
{
|
{
|
||||||
static StackNode *iteratorStack = NULL; // interner Zustand über Aufrufe hinweg
|
static StackNode *iteratorStack = NULL; // interner Zustand über Aufrufe hinweg
|
||||||
@ -115,8 +110,8 @@ void *nextTreeData(TreeNode *wurzel)
|
|||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
// Nächsten Knoten holen (oberstes Stack-Element)
|
// Nächsten Knoten holen (oberstes Stack-Element)
|
||||||
TreeNode *aktuellerKnoten = (TreeNode *)top(iteratorStack); //Oberstes Element zurück
|
TreeNode *aktuellerKnoten = (TreeNode *)top(iteratorStack);
|
||||||
iteratorStack = pop(iteratorStack); // entfernt Oberstes Element
|
iteratorStack = pop(iteratorStack);
|
||||||
|
|
||||||
// Falls rechter Teilbaum existiert: dessen linke Kette ablegen
|
// Falls rechter Teilbaum existiert: dessen linke Kette ablegen
|
||||||
if (aktuellerKnoten->right != NULL)
|
if (aktuellerKnoten->right != NULL)
|
||||||
|
|||||||
@ -3,7 +3,7 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include "bintree.h"
|
#include "bintree.h"
|
||||||
|
|
||||||
// Vergleichsfunktion für unsigned int
|
// comparator for unsigned int values stored by value in heap
|
||||||
static int cmp_uint_ptr(const void *a, const void *b)
|
static int cmp_uint_ptr(const void *a, const void *b)
|
||||||
{
|
{
|
||||||
unsigned int va = *(const unsigned int *)a;
|
unsigned int va = *(const unsigned int *)a;
|
||||||
@ -19,7 +19,7 @@ int main(void)
|
|||||||
unsigned int vals[] = {5, 2, 8, 1, 3, 7, 9};
|
unsigned int vals[] = {5, 2, 8, 1, 3, 7, 9};
|
||||||
const size_t n = sizeof(vals)/sizeof(vals[0]);
|
const size_t n = sizeof(vals)/sizeof(vals[0]);
|
||||||
|
|
||||||
// Werte in den Baum einfügen
|
// insert values (copy made by addToTree)
|
||||||
for(size_t i = 0; i < n; i++)
|
for(size_t i = 0; i < n; i++)
|
||||||
{
|
{
|
||||||
int isDup = 0;
|
int isDup = 0;
|
||||||
@ -27,25 +27,22 @@ int main(void)
|
|||||||
if(root == NULL && isDup == 0) { fprintf(stderr, "addToTree allocation failed\n"); return 1; }
|
if(root == NULL && isDup == 0) { fprintf(stderr, "addToTree allocation failed\n"); return 1; }
|
||||||
}
|
}
|
||||||
|
|
||||||
// Baumgröße prüfen
|
|
||||||
unsigned int sz = treeSize(root);
|
unsigned int sz = treeSize(root);
|
||||||
if(sz != n) { fprintf(stderr, "treeSize expected %zu got %u\n", n, sz); clearTree(root); return 2; }
|
if(sz != n) { fprintf(stderr, "treeSize expected %zu got %u\n", n, sz); clearTree(root); return 2; }
|
||||||
|
|
||||||
// Inorder-Traversierung (muss sortiert sein)
|
// inorder traversal using nextTreeData
|
||||||
unsigned int last = 0;
|
unsigned int last = 0;
|
||||||
int first = 1;
|
int first = 1;
|
||||||
unsigned int *data = nextTreeData(root);
|
unsigned int *data = nextTreeData(root);
|
||||||
while(data != NULL)
|
while(data != NULL)
|
||||||
{
|
{
|
||||||
unsigned int v = *data;
|
unsigned int v = *data;
|
||||||
// Prüfen, ob Reihenfolge korrekt ist
|
|
||||||
if(!first && v < last) { fprintf(stderr, "inorder traversal not sorted: %u after %u\n", v, last); clearTree(root); return 3; }
|
if(!first && v < last) { fprintf(stderr, "inorder traversal not sorted: %u after %u\n", v, last); clearTree(root); return 3; }
|
||||||
last = v; first = 0;
|
last = v; first = 0;
|
||||||
data = nextTreeData(NULL); // nächstes Element holen
|
data = nextTreeData(NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
clearTree(root); // Speicher freigeben
|
clearTree(root);
|
||||||
printf("test_bintree: OK\n");
|
printf("test_bintree: OK\n");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user