Compare commits
5
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
45b6fab21a | ||
|
|
d1320cf6b7 | ||
|
|
369c019c30 | ||
|
|
cccc013b99 | ||
|
|
9a79ff0ad4 |
Vendored
-18
@@ -1,18 +0,0 @@
|
|||||||
{
|
|
||||||
"configurations": [
|
|
||||||
{
|
|
||||||
"name": "macos-clang-arm64",
|
|
||||||
"includePath": [
|
|
||||||
"${workspaceFolder}/**"
|
|
||||||
],
|
|
||||||
"compilerPath": "/usr/bin/clang",
|
|
||||||
"cStandard": "${default}",
|
|
||||||
"cppStandard": "${default}",
|
|
||||||
"intelliSenseMode": "macos-clang-arm64",
|
|
||||||
"compilerArgs": [
|
|
||||||
""
|
|
||||||
]
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"version": 4
|
|
||||||
}
|
|
||||||
Vendored
-13
@@ -1,13 +0,0 @@
|
|||||||
{
|
|
||||||
"version": "0.2.0",
|
|
||||||
"configurations": [
|
|
||||||
{
|
|
||||||
"name": "C/C++ Runner: Debug Session",
|
|
||||||
"type": "lldb",
|
|
||||||
"request": "launch",
|
|
||||||
"args": [],
|
|
||||||
"cwd": "/Users/florianwetzel/I2_Praktikum/DobleSpiel",
|
|
||||||
"program": "/Users/florianwetzel/I2_Praktikum/DobleSpiel/build/Debug/outDebug"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
Vendored
-59
@@ -1,59 +0,0 @@
|
|||||||
{
|
|
||||||
"C_Cpp_Runner.cCompilerPath": "clang",
|
|
||||||
"C_Cpp_Runner.cppCompilerPath": "clang++",
|
|
||||||
"C_Cpp_Runner.debuggerPath": "lldb",
|
|
||||||
"C_Cpp_Runner.cStandard": "",
|
|
||||||
"C_Cpp_Runner.cppStandard": "",
|
|
||||||
"C_Cpp_Runner.msvcBatchPath": "",
|
|
||||||
"C_Cpp_Runner.useMsvc": false,
|
|
||||||
"C_Cpp_Runner.warnings": [
|
|
||||||
"-Wall",
|
|
||||||
"-Wextra",
|
|
||||||
"-Wpedantic",
|
|
||||||
"-Wshadow",
|
|
||||||
"-Wformat=2",
|
|
||||||
"-Wcast-align",
|
|
||||||
"-Wconversion",
|
|
||||||
"-Wsign-conversion",
|
|
||||||
"-Wnull-dereference"
|
|
||||||
],
|
|
||||||
"C_Cpp_Runner.msvcWarnings": [
|
|
||||||
"/W4",
|
|
||||||
"/permissive-",
|
|
||||||
"/w14242",
|
|
||||||
"/w14287",
|
|
||||||
"/w14296",
|
|
||||||
"/w14311",
|
|
||||||
"/w14826",
|
|
||||||
"/w44062",
|
|
||||||
"/w44242",
|
|
||||||
"/w14905",
|
|
||||||
"/w14906",
|
|
||||||
"/w14263",
|
|
||||||
"/w44265",
|
|
||||||
"/w14928"
|
|
||||||
],
|
|
||||||
"C_Cpp_Runner.enableWarnings": true,
|
|
||||||
"C_Cpp_Runner.warningsAsError": false,
|
|
||||||
"C_Cpp_Runner.compilerArgs": [],
|
|
||||||
"C_Cpp_Runner.linkerArgs": [],
|
|
||||||
"C_Cpp_Runner.includePaths": [],
|
|
||||||
"C_Cpp_Runner.includeSearch": [
|
|
||||||
"*",
|
|
||||||
"**/*"
|
|
||||||
],
|
|
||||||
"C_Cpp_Runner.excludeSearch": [
|
|
||||||
"**/build",
|
|
||||||
"**/build/**",
|
|
||||||
"**/.*",
|
|
||||||
"**/.*/**",
|
|
||||||
"**/.vscode",
|
|
||||||
"**/.vscode/**"
|
|
||||||
],
|
|
||||||
"C_Cpp_Runner.useAddressSanitizer": false,
|
|
||||||
"C_Cpp_Runner.useUndefinedSanitizer": false,
|
|
||||||
"C_Cpp_Runner.useLeakSanitizer": false,
|
|
||||||
"C_Cpp_Runner.showCompilationTime": false,
|
|
||||||
"C_Cpp_Runner.useLinkTimeOptimization": false,
|
|
||||||
"C_Cpp_Runner.msvcSecureNoWarnings": false
|
|
||||||
}
|
|
||||||
@@ -12,7 +12,6 @@
|
|||||||
* `nextTreeData`: Traversierung mit Hilfe des zuvor implementierten Stacks. Done */
|
* `nextTreeData`: Traversierung mit Hilfe des zuvor implementierten Stacks. Done */
|
||||||
|
|
||||||
|
|
||||||
static TreeNode *root = NULL;
|
|
||||||
static StackNode *stackRoot = NULL;
|
static StackNode *stackRoot = NULL;
|
||||||
|
|
||||||
|
|
||||||
@@ -56,10 +55,16 @@ TreeNode *addToTreeRec(TreeNode *currentNode, TreeNode *newNode, CompareFctType
|
|||||||
{
|
{
|
||||||
if ((isDuplicate == NULL) || root)
|
if ((isDuplicate == NULL) || root)
|
||||||
{
|
{
|
||||||
|
if (isDuplicate != NULL)
|
||||||
|
{
|
||||||
|
*isDuplicate = 0;
|
||||||
|
}
|
||||||
|
|
||||||
return newNode;
|
return newNode;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
*isDuplicate = 0;
|
||||||
return currentNode;
|
return currentNode;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -83,7 +88,10 @@ TreeNode *addToTreeRec(TreeNode *currentNode, TreeNode *newNode, CompareFctType
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (isDuplicate != NULL)
|
||||||
|
{
|
||||||
|
*isDuplicate = 0;
|
||||||
|
}
|
||||||
return currentNode;
|
return currentNode;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -185,5 +193,7 @@ int treeSizeRec(const TreeNode *currentNode)
|
|||||||
nodeCount += treeSizeRec(currentNode->right);
|
nodeCount += treeSizeRec(currentNode->right);
|
||||||
return nodeCount + 1;
|
return nodeCount + 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return nodeCount;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -14,106 +14,13 @@
|
|||||||
// Returns len random numbers between 1 and 2x len in random order which are all different, except for two entries.
|
// 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
|
// Returns NULL on errors. Use your implementation of the binary search tree to check for possible duplicates while
|
||||||
// creating random numbers.
|
// creating random numbers.
|
||||||
|
|
||||||
static int compareUInt(const void *a, const void *b)
|
|
||||||
{
|
|
||||||
unsigned int A = *(unsigned int*)a;
|
|
||||||
unsigned int B = *(unsigned int*)b;
|
|
||||||
if (A < B) return -1;
|
|
||||||
if (A > B) return 1;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
// Sortiervergleich für qsort
|
|
||||||
int compareQsort(const void *a, const void *b)
|
|
||||||
{
|
|
||||||
unsigned int A = *(const unsigned int*)a;
|
|
||||||
unsigned int B = *(const unsigned int*)b;
|
|
||||||
if (A < B) return -1;
|
|
||||||
if (A > B) return +1;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
unsigned int *createNumbers(unsigned int len)
|
unsigned int *createNumbers(unsigned int len)
|
||||||
{
|
{
|
||||||
if (len < 2) return NULL;
|
|
||||||
|
|
||||||
srand((unsigned int)time(NULL));
|
|
||||||
|
|
||||||
// Speicher für das Array
|
|
||||||
unsigned int *numbers = malloc(sizeof(unsigned int) * len);
|
|
||||||
if (!numbers) return NULL;
|
|
||||||
|
|
||||||
TreeNode *root = NULL; // Baumwurzel
|
|
||||||
unsigned int value;
|
|
||||||
int isDuplicate;
|
|
||||||
|
|
||||||
//Array mit eindeutigen Zufallszahlen füllen
|
|
||||||
for (unsigned int i = 0; i < len; i++)
|
|
||||||
{
|
|
||||||
while (1)
|
|
||||||
{
|
|
||||||
value = (rand() % (2 * len)) + 1; // Zufallszahl 1..2*len
|
|
||||||
isDuplicate = 0;
|
|
||||||
|
|
||||||
TreeNode *newRoot = addToTree(
|
|
||||||
root,
|
|
||||||
&value,
|
|
||||||
sizeof(unsigned int),
|
|
||||||
compareUInt,
|
|
||||||
&isDuplicate
|
|
||||||
);
|
|
||||||
|
|
||||||
if (!isDuplicate)
|
|
||||||
{
|
|
||||||
// Neue Zahl - akzeptieren
|
|
||||||
root = newRoot;
|
|
||||||
numbers[i] = value;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
// Sonst neue Zahl generieren
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//genau eine Zufallszahl duplizieren
|
|
||||||
unsigned int idx1 = rand() % len;
|
|
||||||
unsigned int idx2 = rand() % len;
|
|
||||||
|
|
||||||
while (idx2 == idx1)
|
|
||||||
idx2 = rand() % len;
|
|
||||||
|
|
||||||
numbers[idx2] = numbers[idx1];
|
|
||||||
|
|
||||||
// Baum wieder freigeben
|
|
||||||
clearTree(root);
|
|
||||||
|
|
||||||
return numbers;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Returns only the only number in numbers which is present twice. Returns zero on errors.
|
// 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)
|
unsigned int getDuplicate(const unsigned int numbers[], unsigned int len)
|
||||||
{
|
{
|
||||||
if (!numbers || len < 2) return 0;
|
|
||||||
|
|
||||||
unsigned int *copy = malloc(len * sizeof(unsigned int));
|
|
||||||
if (!copy) return 0;
|
|
||||||
|
|
||||||
// Array kopieren
|
|
||||||
memcpy(copy, numbers, len * sizeof(unsigned int));
|
|
||||||
|
|
||||||
// Sortieren
|
|
||||||
qsort(copy, len, sizeof(unsigned int), compareQsort);
|
|
||||||
|
|
||||||
// Doppelte Zahl finden
|
|
||||||
unsigned int duplicate = 0;
|
|
||||||
for (unsigned int i = 0; i < len - 1; i++)
|
|
||||||
{
|
|
||||||
if (copy[i] == copy[i + 1])
|
|
||||||
{
|
|
||||||
duplicate = copy[i];
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
free(copy);
|
|
||||||
return duplicate;
|
|
||||||
}
|
}
|
||||||
Binary file not shown.
Binary file not shown.
@@ -1,16 +0,0 @@
|
|||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <math.h>
|
|
||||||
#include "numbers.h"
|
|
||||||
#include "unity.h"
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void setUp(void) {
|
|
||||||
// Falls notwendig, kann hier Vorbereitungsarbeit gemacht werden
|
|
||||||
}
|
|
||||||
|
|
||||||
void tearDown(void) {
|
|
||||||
// Hier kann Bereinigungsarbeit nach jedem Test durchgeführt werden
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user