9 Commits
Author SHA1 Message Date
Fabrice 91f5c52077 clearTree hinzugefügt 2025-12-10 10:03:36 +01:00
Fabrice fc9031adbd In Main Z.74 geändert 2025-12-10 09:50:33 +01:00
Fabrice a7fd62eda4 numbers.c passiert alle Tests 2025-12-09 20:22:27 +01:00
wiesendsi102436 c6fd4b300e Merge remote-tracking branch 'origin/bintree' 2025-12-08 18:50:19 +01:00
wiesendsi102436 93a818088c Merge branch 'main' into Fabrice 2025-12-08 18:45:17 +01:00
Fabrice 2e805ba8e6 3. Test (vorerst) gelöscht 2025-12-08 17:55:44 +01:00
Fabrice 2d3ffcf3f8 reset bintree 2025-12-08 17:50:40 +01:00
Fabrice aa3538c14b 3. Test hinzugefügt 2025-12-08 17:20:01 +01:00
Fabrice a4a60a3d95 Kleiner Fix 2025-12-08 16:27:24 +01:00
2 changed files with 27 additions and 9 deletions
+1 -1
View File
@@ -71,7 +71,7 @@ int main(int argc, char *argv[])
userInput = inputNumber("Welche Zahl kommt doppelt vor: "); userInput = inputNumber("Welche Zahl kommt doppelt vor: ");
measuredSeconds = stopTimer(); measuredSeconds = stopTimer();
duplicate = getDuplicate(numbers, numberOfElements+1); duplicate = getDuplicate(numbers, numberOfElements);
// check result and update highscores // check result and update highscores
if(userInput == duplicate) if(userInput == duplicate)
+24 -6
View File
@@ -19,16 +19,27 @@ unsigned int *createNumbers(unsigned int len)
for (unsigned int i = 0; i < len; i++) { for (unsigned int i = 0; i < len; i++) {
do do
{ {
isDuplicate = 0;
numbers[i] = rand () % upperLimit + 1; numbers[i] = rand () % upperLimit + 1;
binTree = addToTree(binTree, &numbers[i], sizeof(unsigned int), compare, &isDuplicate); binTree = addToTree(binTree, &numbers[i], sizeof(unsigned int), compare, &isDuplicate);
} while (isDuplicate); } while (isDuplicate);
} }
unsigned int duplicate = numbers[rand () % len]; unsigned int duplicate = numbers[rand () % len];
int indexDuplicate = rand () % len; int indexDuplicate;
numbers[len] = numbers[indexDuplicate];
do {
indexDuplicate = rand() % len;
} while (numbers[indexDuplicate] == duplicate);
if (numbers[len-1] != duplicate) {
numbers[len-1] = numbers[indexDuplicate];
}
numbers[indexDuplicate] = duplicate; numbers[indexDuplicate] = duplicate;
clearTree(binTree);
return numbers; return numbers;
} }
@@ -54,12 +65,19 @@ unsigned int getDuplicate(const unsigned int numbers[], unsigned int len)
return 0; return 0;
} }
qsort((void*)numbers, len, sizeof(unsigned int), compare); unsigned int *copy = malloc (sizeof(unsigned int) * len);
memcpy (copy, numbers, sizeof(unsigned int) * len);
qsort(copy, len, sizeof(unsigned int), compare);
for (int i = 0; i < len-1; i++) { for (int i = 0; i < len-1; i++) {
if (numbers[i] == numbers [i+1]) { if (copy[i] == copy [i+1]) {
return numbers[i]; unsigned int result = copy [i];
free (copy);
return result;
} }
} }
return 0;
free (copy);
return 0;
} }