diff --git a/20231130/aufgabe-3.c b/20231130/aufgabe-3.c deleted file mode 100644 index 15c90561b94d5a0c1a136f0e6479d3633dc242b1..0000000000000000000000000000000000000000 --- a/20231130/aufgabe-3.c +++ /dev/null @@ -1,18 +0,0 @@ -#include <stdio.h> -#include <string.h> - -void insert_into_string (char src, char *target, int pos) -{ - int len = strlen (target); - for (int i = pos; i < len; i++) - target[i + 1] = target[i]; - target[pos] = src; -} - -int main (void) -{ - char test[100] = "Hochshule Bochum"; - insert_into_string ('c', test, 5); - printf ("%s\n", test); - return 0; -} diff --git a/20231130/hp-musterloesung-20231130.pdf b/20231130/hp-musterloesung-20231130.pdf index 1782abc389d59c3de4999c95356c99baf45cd738..cc79c87d08abf3e4653341a4570480ddf0e12d54 100644 Binary files a/20231130/hp-musterloesung-20231130.pdf and b/20231130/hp-musterloesung-20231130.pdf differ diff --git a/20231130/hp-musterloesung-20231130.tex b/20231130/hp-musterloesung-20231130.tex index 670f107dfce1e3f1111745f6a32fcb58659b3092..31e53028060ef187235e1aa8614c55d4ee1c8150 100644 --- a/20231130/hp-musterloesung-20231130.tex +++ b/20231130/hp-musterloesung-20231130.tex @@ -20,7 +20,7 @@ % Attribution-ShareAlike 3.0 Unported License along with this % document. If not, see <http://creativecommons.org/licenses/>. -% README: PBM-Grafik, Einfügen in Strings (Ergänzung), Fakultät +% README: PBM-Grafik, Fakultät \documentclass[a4paper]{article} @@ -204,6 +204,8 @@ hängt linear von $n$ ab; der Speicherplatzverbrauch ist also $\mathcal{O}(n)$. \end{itemize} + \iffalse + \exercise{Einfügen in Strings (Ergänzung)} Diese Aufgabe ist eine Ergänzung von Aufgabe 3 der Übung vom 31.\ Oktober @@ -372,4 +374,6 @@ \end{enumerate} + \fi + \end{document} diff --git a/20231130/hp-uebung-20231130.pdf b/20231130/hp-uebung-20231130.pdf index 7a90b036343cf43f9bc7573848921b7c1daccee4..c1643c443ea060fccce46ee8e193ca678d1acef3 100644 Binary files a/20231130/hp-uebung-20231130.pdf and b/20231130/hp-uebung-20231130.pdf differ diff --git a/20231130/hp-uebung-20231130.tex b/20231130/hp-uebung-20231130.tex index 40e876f5c678e32eae661f3b04084212153790bc..59ac55136dc88e9cab5e36a0c028c7badb272a79 100644 --- a/20231130/hp-uebung-20231130.tex +++ b/20231130/hp-uebung-20231130.tex @@ -20,7 +20,7 @@ % Attribution-ShareAlike 3.0 Unported License along with this % document. If not, see <http://creativecommons.org/licenses/>. -% README: PBM-Grafik, Einfügen in Strings (Ergänzung), Fakultät +% README: PBM-Grafik, Fakultät \documentclass[a4paper]{article} @@ -38,9 +38,9 @@ Übungsaufgaben -- 30.\ November 2023} Diese Übung enthält Punkteangaben wie in einer Klausur. - Um zu "`bestehen"', müssen Sie innerhalb von 75 Minuten + Um zu "`bestehen"', müssen Sie innerhalb von 50 Minuten unter Verwendung ausschließlich zugelassener Hilfsmittel - 13 Punkte (von insgesamt \totalpoints) erreichen. + 9 Punkte (von insgesamt \totalpoints) erreichen. \exercise{PBM-Grafik} @@ -156,6 +156,8 @@ \points{3} \end{enumerate} + \iffalse + \exercise{Einfügen in Strings (Ergänzung)} Diese Aufgabe ist eine Ergänzung von Aufgabe 3 der Übung vom 2.\ November 2023 @@ -251,6 +253,8 @@ % \workspace{35} \end{enumerate} + \fi + \begin{flushright} \textit{Viel Erfolg!} \end{flushright} diff --git a/20231130/loesung-3e.c b/20231130/loesung-3e.c deleted file mode 100644 index bc41fb0e1f5f826a427038a18798e280fd1a096d..0000000000000000000000000000000000000000 --- a/20231130/loesung-3e.c +++ /dev/null @@ -1,33 +0,0 @@ -#include <stdio.h> -#include <string.h> - -void insert_into_string (char src, char *target, int pos) -{ - int len = strlen (target); - for (int i = len; i >= pos; i--) - target[i + 1] = target[i]; - target[pos] = src; -} - -void insert_into_string_sorted (char src, char *target) -{ - int i = 0; - while (target[i] && target[i] < src) - i++; - insert_into_string (src, target, i); -} - -int main (void) -{ - char test[100] = ""; - insert_into_string_sorted ('c', test); - insert_into_string_sorted ('a', test); - insert_into_string_sorted ('d', test); - insert_into_string_sorted ('b', test); - printf ("test = \"%s\"\n", test); - for (char ch = 'e'; ch < 'z'; ch += 2) - insert_into_string_sorted (ch, test); - insert_into_string_sorted ('n', test); - printf ("test = \"%s\"\n", test); - return 0; -} diff --git a/20231130/loesung-3g.c b/20231130/loesung-3g.c deleted file mode 100644 index 4b0c29dfc223fa961cdbf930683e6d79610b002b..0000000000000000000000000000000000000000 --- a/20231130/loesung-3g.c +++ /dev/null @@ -1,46 +0,0 @@ -#include <stdio.h> -#include <string.h> - -void insert_into_string (char src, char *target, int pos) -{ - int len = strlen (target); - for (int i = len; i >= pos; i--) - target[i + 1] = target[i]; - target[pos] = src; -} - -void insert_into_string_sorted (char src, char *target) -{ - int l = 0; - int r = 0; - while (target[r]) - r++; - int m = (l + r) / 2; - while (m > l) - { - if (src < target[m]) - r = m; - else - l = m; - m = (l + r) / 2; - } - if (target[m] == 0 || src < target[m]) - insert_into_string (src, target, m); - else - insert_into_string (src, target, m + 1); -} - -int main (void) -{ - char test[100] = ""; - insert_into_string_sorted ('c', test); - insert_into_string_sorted ('a', test); - insert_into_string_sorted ('d', test); - insert_into_string_sorted ('b', test); - printf ("test = \"%s\"\n", test); - for (char ch = 'e'; ch < 'z'; ch += 2) - insert_into_string_sorted (ch, test); - insert_into_string_sorted ('n', test); - printf ("test = \"%s\"\n", test); - return 0; -}