+ Recursion means, that something defines itself by itself.
+ In maths series like factorial or the Fibonacci series are often defined recursively.
+ You can also have data structures, which are define recursively. Like trees.
+ What we want to do now, is to define a recursive function.
+ A function, that calls itself.
+
+
+ This is useful, because it is often shorter and more easily to understand than the iterative version.
+ In some cases you only can use recursion.
+
+
+ This is also a good time to talk about the stack. The stack is the place, were all your local data lives.
+ You can imagine it as just a big pile of documents.
+ You can only put stuff on the top or grab something from the top.
+ This is called push and pop in computer science.
+
+
+ So all your local variables and function arguments get pushed on the stack.
+ When a function ends, the whole block, which belonged to the function (the so called stack frame),
+ gets popped. The only problem is, that the stack has a limited size. So if you have a a recursive function,
+ that just keeps calling itself, you will run out of memory on the stack. This is called a stack overflow.
+ Fortunately memory is cheap these days. So it is not that big of a problem anymore.
+
+
+ Your task is to write a recursive function, which returns the nth number of the Fibonacci sequence.
+ The Fibonacci numbers are a sequence of numbers where each is the sum of both it's predecessors.
+We get the following sequence: 0, 1, 1, 2, 3, 5...
diff --git a/oer/courses/c-basics/sections/03-functions/08-recursion/meta b/oer/courses/c-basics/sections/03-functions/08-recursion/meta
new file mode 100644
index 0000000..046f2c1
--- /dev/null
+++ b/oer/courses/c-basics/sections/03-functions/08-recursion/meta
@@ -0,0 +1 @@
+{"title": "Recursion"}
diff --git a/oer/courses/c-basics/sections/03-functions/08-recursion/program.c b/oer/courses/c-basics/sections/03-functions/08-recursion/program.c
new file mode 100644
index 0000000..d7806cb
--- /dev/null
+++ b/oer/courses/c-basics/sections/03-functions/08-recursion/program.c
@@ -0,0 +1,8 @@
+#include
+// Write a function to return the n-th Fibonacci number
+// Use recursive calls to simplify the code
+
+int main(int argc, const char *argv[])
+{
+ printf("the fifth fibonacci number is: %d", fib(5));
+}
diff --git a/oer/courses/c-basics/sections/03-functions/08-recursion/regex b/oer/courses/c-basics/sections/03-functions/08-recursion/regex
new file mode 100644
index 0000000..03cee9a
--- /dev/null
+++ b/oer/courses/c-basics/sections/03-functions/08-recursion/regex
@@ -0,0 +1 @@
+^(\s|.)*(3|5)\s*$
diff --git a/oer/courses/c-basics/sections/03-functions/08-recursion/type b/oer/courses/c-basics/sections/03-functions/08-recursion/type
new file mode 100644
index 0000000..7d393ec
--- /dev/null
+++ b/oer/courses/c-basics/sections/03-functions/08-recursion/type
@@ -0,0 +1 @@
+program/match-regex
diff --git a/oer/courses/c-basics/sections/03-functions/09-scopes/Makefile b/oer/courses/c-basics/sections/03-functions/09-scopes/Makefile
new file mode 100644
index 0000000..c531e6c
--- /dev/null
+++ b/oer/courses/c-basics/sections/03-functions/09-scopes/Makefile
@@ -0,0 +1,6 @@
+
+all:
+ gcc --std=c99 program.c -o program
+
+clean:
+ rm -f program
diff --git a/oer/courses/c-basics/sections/03-functions/09-scopes/content.html b/oer/courses/c-basics/sections/03-functions/09-scopes/content.html
new file mode 100644
index 0000000..42070eb
--- /dev/null
+++ b/oer/courses/c-basics/sections/03-functions/09-scopes/content.html
@@ -0,0 +1,14 @@
+
+ A scope defines the area in your code, where certain names are visible. This is useful, because at some point you would run out
+ of meaning full names. The most simple example of the usefulness of scopes are for-loops.
+ People like to call the loop-counter i and j or x and y or n and m. If you don't have scopes, you could only use the name i ones in your entire program.
+
+
+ There are different scope levels. There is the global scope, which is for all global variables of your program, then there is the scope of the compilation unit.
+ For all intents and purposes is basically the same. When you start to write bigger programs you may break your codes in different compilation units. But for
+ now you don't have to worry. Then there is block scope. Each block has its one name-space. So if you declare a function, if-statement, some kind of loop or even
+ just a block, it will have its own scope.
+
+
+ You can declare variables with the same name as one in an higher scope. This will overwrite the name till the end of the scope. This is called shadowing
+
diff --git a/oer/courses/c-basics/sections/03-functions/09-scopes/meta b/oer/courses/c-basics/sections/03-functions/09-scopes/meta
new file mode 100644
index 0000000..161acfb
--- /dev/null
+++ b/oer/courses/c-basics/sections/03-functions/09-scopes/meta
@@ -0,0 +1 @@
+{"title": "Scope"}
diff --git a/oer/courses/c-basics/sections/03-functions/09-scopes/program.c b/oer/courses/c-basics/sections/03-functions/09-scopes/program.c
new file mode 100644
index 0000000..04b8721
--- /dev/null
+++ b/oer/courses/c-basics/sections/03-functions/09-scopes/program.c
@@ -0,0 +1,21 @@
+#include
+
+static int foo = 10; // This variable lives in global scope
+
+int main(int argc, const char *argv[])
+{
+ int bar = 55; // This is in the scope of the main function
+
+ for(int i= 0; i < 10;)
+ i += 1; // i is local to this scope
+ for(int i = 10; i >= 0;)
+ i -= 1; // so we can reuse i again
+
+ // you can open a block to introduce a scope
+ {
+ int foo = 5; // this will overshadow the global foo
+ printf("foo: %d\n", foo);
+ }
+ printf("foo: %d\n", foo);
+
+}
diff --git a/oer/courses/c-basics/sections/03-functions/09-scopes/regex b/oer/courses/c-basics/sections/03-functions/09-scopes/regex
new file mode 100644
index 0000000..467853d
--- /dev/null
+++ b/oer/courses/c-basics/sections/03-functions/09-scopes/regex
@@ -0,0 +1 @@
+^\s*foo: 5\s*foo: 10\s*$
diff --git a/oer/courses/c-basics/sections/03-functions/09-scopes/type b/oer/courses/c-basics/sections/03-functions/09-scopes/type
new file mode 100644
index 0000000..7d393ec
--- /dev/null
+++ b/oer/courses/c-basics/sections/03-functions/09-scopes/type
@@ -0,0 +1 @@
+program/match-regex
diff --git a/oer/courses/c-basics/sections/03-functions/10-static/Makefile b/oer/courses/c-basics/sections/03-functions/10-static/Makefile
new file mode 100644
index 0000000..c531e6c
--- /dev/null
+++ b/oer/courses/c-basics/sections/03-functions/10-static/Makefile
@@ -0,0 +1,6 @@
+
+all:
+ gcc --std=c99 program.c -o program
+
+clean:
+ rm -f program
diff --git a/oer/courses/c-basics/sections/03-functions/10-static/content.html b/oer/courses/c-basics/sections/03-functions/10-static/content.html
new file mode 100644
index 0000000..efc3b79
--- /dev/null
+++ b/oer/courses/c-basics/sections/03-functions/10-static/content.html
@@ -0,0 +1,3 @@
+The static keyword enusres that a variable defined at toplevel is only visilbe in it's current c-file. Whereas normal variables can be accesed from other files using the extern keyword. The same applies for functions that are marked static.
+
+When used in functions the static keyword just ensures that the value of the variable will be retained across calls of the function.
diff --git a/oer/courses/c-basics/sections/03-functions/10-static/meta b/oer/courses/c-basics/sections/03-functions/10-static/meta
new file mode 100644
index 0000000..d0bde8b
--- /dev/null
+++ b/oer/courses/c-basics/sections/03-functions/10-static/meta
@@ -0,0 +1 @@
+{"title": "Static Keyword"}
diff --git a/oer/courses/c-basics/sections/03-functions/10-static/program.c b/oer/courses/c-basics/sections/03-functions/10-static/program.c
new file mode 100644
index 0000000..41be55d
--- /dev/null
+++ b/oer/courses/c-basics/sections/03-functions/10-static/program.c
@@ -0,0 +1,15 @@
+#include
+void counter()
+{
+ static int i = 0;
+ i++;
+ printf("I was called %d times.\n", i);
+}
+
+int main(int argc, const char *argv[])
+{
+ for (int x = 0; x < 20; x++)
+ {
+ counter();
+ }
+}
diff --git a/oer/courses/c-basics/sections/03-functions/10-static/regex b/oer/courses/c-basics/sections/03-functions/10-static/regex
new file mode 100644
index 0000000..46b9367
--- /dev/null
+++ b/oer/courses/c-basics/sections/03-functions/10-static/regex
@@ -0,0 +1 @@
+^(\s|.)*$
diff --git a/oer/courses/c-basics/sections/03-functions/10-static/type b/oer/courses/c-basics/sections/03-functions/10-static/type
new file mode 100644
index 0000000..7d393ec
--- /dev/null
+++ b/oer/courses/c-basics/sections/03-functions/10-static/type
@@ -0,0 +1 @@
+program/match-regex
diff --git a/oer/courses/c-basics/sections/03-functions/section b/oer/courses/c-basics/sections/03-functions/section
new file mode 100644
index 0000000..364e51e
--- /dev/null
+++ b/oer/courses/c-basics/sections/03-functions/section
@@ -0,0 +1 @@
+{"title": "Functions", "description": "Reuse your Code"}
diff --git a/oer/courses/c-basics/sections/10-pointer/01-introduction/Makefile b/oer/courses/c-basics/sections/10-pointer/01-introduction/Makefile
new file mode 100644
index 0000000..c531e6c
--- /dev/null
+++ b/oer/courses/c-basics/sections/10-pointer/01-introduction/Makefile
@@ -0,0 +1,6 @@
+
+all:
+ gcc --std=c99 program.c -o program
+
+clean:
+ rm -f program
diff --git a/oer/courses/c-basics/sections/10-pointer/01-introduction/content.html b/oer/courses/c-basics/sections/10-pointer/01-introduction/content.html
new file mode 100644
index 0000000..1842e19
--- /dev/null
+++ b/oer/courses/c-basics/sections/10-pointer/01-introduction/content.html
@@ -0,0 +1,10 @@
+
+ Sometimes, when you are programming, you need to know, where your data is in memory. This is what pointers are used for.
+ They point to an specific point in memory, an address. You can then access the data from that pointer via the *-operator.
+ This is called dereferencing. To get the address of an value, you can use the &-operator. To declare a type as an
+ pointer to that type just put the *-operator between the type and the name.
+
+
+ As a site note: If you want to print out pointer with printf, you have to use the format specifier p. The address will be printed in hexadecimal notation.
+
+For this introduction just familiarize yourself with the basics of pointers. You will be asked to use these concepts yourself in the following exercises.
diff --git a/oer/courses/c-basics/sections/10-pointer/01-introduction/meta b/oer/courses/c-basics/sections/10-pointer/01-introduction/meta
new file mode 100644
index 0000000..b75c1c1
--- /dev/null
+++ b/oer/courses/c-basics/sections/10-pointer/01-introduction/meta
@@ -0,0 +1 @@
+{"title": "Introduction"}
diff --git a/oer/courses/c-basics/sections/10-pointer/01-introduction/program.c b/oer/courses/c-basics/sections/10-pointer/01-introduction/program.c
new file mode 100644
index 0000000..7926b08
--- /dev/null
+++ b/oer/courses/c-basics/sections/10-pointer/01-introduction/program.c
@@ -0,0 +1,29 @@
+#include
+int main(int argc, const char *argv[])
+{
+ // Define a pointer
+ int* p;
+ // We make p point to another variables value:
+ int a = 2;
+ // Initializing the pointer
+ p = &a;
+
+ // Print value our pointer points to
+ printf("Value of p: %d\n", *p);
+ // Print the pointers Memmory adress
+ printf("Adress of p: %p\n", p);
+
+
+ // Access the value of p
+ *p = 42;
+ // The value of a is changed
+ // p points to the memory a is stored in
+ printf("Value of a: %d\n", a);
+ printf("Value of p: %d\n", *p);
+
+ a = 27;
+ // You can also change the value of a
+ // and the value of p will change
+ printf("Value of a: %d\n", a);
+ printf("Value of p: %d\n", *p);
+}
diff --git a/oer/courses/c-basics/sections/10-pointer/01-introduction/regex b/oer/courses/c-basics/sections/10-pointer/01-introduction/regex
new file mode 100644
index 0000000..8d98f9d
--- /dev/null
+++ b/oer/courses/c-basics/sections/10-pointer/01-introduction/regex
@@ -0,0 +1 @@
+.*
diff --git a/oer/courses/c-basics/sections/10-pointer/01-introduction/type b/oer/courses/c-basics/sections/10-pointer/01-introduction/type
new file mode 100644
index 0000000..7d393ec
--- /dev/null
+++ b/oer/courses/c-basics/sections/10-pointer/01-introduction/type
@@ -0,0 +1 @@
+program/match-regex
diff --git a/oer/courses/c-basics/sections/10-pointer/03-dereferencing/Makefile b/oer/courses/c-basics/sections/10-pointer/03-dereferencing/Makefile
new file mode 100644
index 0000000..c531e6c
--- /dev/null
+++ b/oer/courses/c-basics/sections/10-pointer/03-dereferencing/Makefile
@@ -0,0 +1,6 @@
+
+all:
+ gcc --std=c99 program.c -o program
+
+clean:
+ rm -f program
diff --git a/oer/courses/c-basics/sections/10-pointer/03-dereferencing/content.html b/oer/courses/c-basics/sections/10-pointer/03-dereferencing/content.html
new file mode 100644
index 0000000..f9a694f
--- /dev/null
+++ b/oer/courses/c-basics/sections/10-pointer/03-dereferencing/content.html
@@ -0,0 +1,6 @@
+
+ In the Introduction we already showed you how to dereference a pointer. You just put the *-operator in front of the pointer you want to dereference, to get access to its value. You have to dereference the pointer, when you just want to see the value or when you want to change it.
+
+ Now you should try to use pointers for yourself.
+
+Change the following program to print "number: 581" without changing the main function.
diff --git a/oer/courses/c-basics/sections/10-pointer/03-dereferencing/meta b/oer/courses/c-basics/sections/10-pointer/03-dereferencing/meta
new file mode 100644
index 0000000..b7c5330
--- /dev/null
+++ b/oer/courses/c-basics/sections/10-pointer/03-dereferencing/meta
@@ -0,0 +1 @@
+{"title": "Dereferencing"}
diff --git a/oer/courses/c-basics/sections/10-pointer/03-dereferencing/program.c b/oer/courses/c-basics/sections/10-pointer/03-dereferencing/program.c
new file mode 100644
index 0000000..6c4301d
--- /dev/null
+++ b/oer/courses/c-basics/sections/10-pointer/03-dereferencing/program.c
@@ -0,0 +1,20 @@
+#include
+
+void change(int* p) {
+ // TODO: Change the value of 'number' to 581 here:
+
+
+}
+
+// Don't change the contents of the main-function for this exercise
+int main(int argc, const char *argv[])
+{
+ int number = 5;
+ int* pointer = &number;
+
+ // We call the function 'change'
+ change(pointer);
+
+ // We print the value of 'number'
+ printf("value of 'number': %d\n", number);
+}
diff --git a/oer/courses/c-basics/sections/10-pointer/03-dereferencing/regex b/oer/courses/c-basics/sections/10-pointer/03-dereferencing/regex
new file mode 100644
index 0000000..846c5c6
--- /dev/null
+++ b/oer/courses/c-basics/sections/10-pointer/03-dereferencing/regex
@@ -0,0 +1 @@
+^\s*value of 'number':\ 581\s*$
diff --git a/oer/courses/c-basics/sections/10-pointer/03-dereferencing/type b/oer/courses/c-basics/sections/10-pointer/03-dereferencing/type
new file mode 100644
index 0000000..7d393ec
--- /dev/null
+++ b/oer/courses/c-basics/sections/10-pointer/03-dereferencing/type
@@ -0,0 +1 @@
+program/match-regex
diff --git a/oer/courses/c-basics/sections/10-pointer/04-pointer-arithmetic/Makefile b/oer/courses/c-basics/sections/10-pointer/04-pointer-arithmetic/Makefile
new file mode 100644
index 0000000..a82226f
--- /dev/null
+++ b/oer/courses/c-basics/sections/10-pointer/04-pointer-arithmetic/Makefile
@@ -0,0 +1,7 @@
+
+all:
+ gcc --std=c99 program.c -o program
+
+clean:
+ rm -f program
+
diff --git a/oer/courses/c-basics/sections/10-pointer/04-pointer-arithmetic/content.html b/oer/courses/c-basics/sections/10-pointer/04-pointer-arithmetic/content.html
new file mode 100644
index 0000000..4524bf8
--- /dev/null
+++ b/oer/courses/c-basics/sections/10-pointer/04-pointer-arithmetic/content.html
@@ -0,0 +1,14 @@
+
+ When you are using pointers, you sometimes actually don't want to talk about the address the pointer points to.
+ Maybe you want to talk about the address next to it. Or you want to get the distance between to pointers in memory.
+ This is what pointer arithmetic allows you to do. You can use mathematical operations on the addresses of pointers.
+ All the operations are done relative to the size of the type the pointer refers to.
+
+
+ For example, if you have an pointer to a long long, which is 8bytes big, and add one to the pointer,
+ you will get an address 8bytes from your original pointer.
+ If you are using an int, you will get one 4bytes from the original.
+
+
+ Arrays store all the data next to another in memory. Try using pointer arithmetic to print out all the characters in the array.
+
diff --git a/oer/courses/c-basics/sections/10-pointer/04-pointer-arithmetic/meta b/oer/courses/c-basics/sections/10-pointer/04-pointer-arithmetic/meta
new file mode 100644
index 0000000..101deb3
--- /dev/null
+++ b/oer/courses/c-basics/sections/10-pointer/04-pointer-arithmetic/meta
@@ -0,0 +1 @@
+{"title": "Pointer arithmetic"}
diff --git a/oer/courses/c-basics/sections/10-pointer/04-pointer-arithmetic/program.c b/oer/courses/c-basics/sections/10-pointer/04-pointer-arithmetic/program.c
new file mode 100644
index 0000000..b07ae90
--- /dev/null
+++ b/oer/courses/c-basics/sections/10-pointer/04-pointer-arithmetic/program.c
@@ -0,0 +1,20 @@
+#include
+void print_all(char* word, int len) {
+ // TODO: print all characters in the array you were given in this function
+ // don't use the [] operator, do your own calculations on the address
+}
+
+int main(int argc, const char *argv[])
+{
+ // We can rely on pointer arithmetic to access values in the array,
+ // since an arrays values are stored in consecutive memory cells.
+ char word[] = {'H', 'e', 'l', 'l', 'o'};
+
+ // Get the arrays second character
+ // we add the offset 1 to get the second index
+ char second = *(word + 1);
+ // We print the arrays second character
+ printf("%c\n", second);
+
+ print_all(word, 5);
+}
diff --git a/oer/courses/c-basics/sections/10-pointer/04-pointer-arithmetic/regex b/oer/courses/c-basics/sections/10-pointer/04-pointer-arithmetic/regex
new file mode 100644
index 0000000..be570f9
--- /dev/null
+++ b/oer/courses/c-basics/sections/10-pointer/04-pointer-arithmetic/regex
@@ -0,0 +1 @@
+^(.|\s)*Hello$
diff --git a/oer/courses/c-basics/sections/10-pointer/04-pointer-arithmetic/type b/oer/courses/c-basics/sections/10-pointer/04-pointer-arithmetic/type
new file mode 100644
index 0000000..7d393ec
--- /dev/null
+++ b/oer/courses/c-basics/sections/10-pointer/04-pointer-arithmetic/type
@@ -0,0 +1 @@
+program/match-regex
diff --git a/oer/courses/c-basics/sections/10-pointer/05-pointer-array-equivalence/Makefile b/oer/courses/c-basics/sections/10-pointer/05-pointer-array-equivalence/Makefile
new file mode 100644
index 0000000..a82226f
--- /dev/null
+++ b/oer/courses/c-basics/sections/10-pointer/05-pointer-array-equivalence/Makefile
@@ -0,0 +1,7 @@
+
+all:
+ gcc --std=c99 program.c -o program
+
+clean:
+ rm -f program
+
diff --git a/oer/courses/c-basics/sections/10-pointer/05-pointer-array-equivalence/content.html b/oer/courses/c-basics/sections/10-pointer/05-pointer-array-equivalence/content.html
new file mode 100644
index 0000000..4798e5d
--- /dev/null
+++ b/oer/courses/c-basics/sections/10-pointer/05-pointer-array-equivalence/content.html
@@ -0,0 +1,10 @@
+
+ As you may have noticed, you can just as easily use pointer arithmetic to access an array. In fact, that is exactly what the compiler does,
+ when you use the []-operator. It is just syntactic sugar. But there are some minor differences between pointers and arrays.
+
+
+ When you call sizeof on an array it will give you the hole size in bytes of the array. When you call the sizeof on an pointer,
+ it will just return the size of the pointer, which is on 64bit systems 8bytes.
+ Also an array always points to the same thing, while a pointer can be changed at any time.
+ But for the most part they are equivalent.
+
diff --git a/oer/courses/c-basics/sections/10-pointer/05-pointer-array-equivalence/meta b/oer/courses/c-basics/sections/10-pointer/05-pointer-array-equivalence/meta
new file mode 100644
index 0000000..054a4f5
--- /dev/null
+++ b/oer/courses/c-basics/sections/10-pointer/05-pointer-array-equivalence/meta
@@ -0,0 +1 @@
+{"title": "Pointers and arrays"}
diff --git a/oer/courses/c-basics/sections/10-pointer/05-pointer-array-equivalence/program.c b/oer/courses/c-basics/sections/10-pointer/05-pointer-array-equivalence/program.c
new file mode 100644
index 0000000..4305ddb
--- /dev/null
+++ b/oer/courses/c-basics/sections/10-pointer/05-pointer-array-equivalence/program.c
@@ -0,0 +1,22 @@
+#include
+
+int main(int argc, const char *argv[])
+{
+ int array[] = {1,2,3,4,5,42};
+ int array2[] = {4,3,2,1};
+ int *pointer = array;
+
+ // The access of an array and a pointer are equivalent
+ printf("*array = %d, *pointer= %d, array[0] = %d pointer[0] = %d\n",
+ *array, *pointer, array[0], pointer[0]);
+
+ // you can't do this:
+ // array = array2;
+
+ // you can do this:
+ pointer = array2;
+
+ // There are some minor differences between pointers an arrays.
+ printf("sizeof(array) = %d, sizeof(pointer)= %d",
+ sizeof(array),sizeof(pointer));
+}
diff --git a/oer/courses/c-basics/sections/10-pointer/05-pointer-array-equivalence/regex b/oer/courses/c-basics/sections/10-pointer/05-pointer-array-equivalence/regex
new file mode 100644
index 0000000..c2e835a
--- /dev/null
+++ b/oer/courses/c-basics/sections/10-pointer/05-pointer-array-equivalence/regex
@@ -0,0 +1 @@
+^(.|\s)*$
diff --git a/oer/courses/c-basics/sections/10-pointer/05-pointer-array-equivalence/type b/oer/courses/c-basics/sections/10-pointer/05-pointer-array-equivalence/type
new file mode 100644
index 0000000..7d393ec
--- /dev/null
+++ b/oer/courses/c-basics/sections/10-pointer/05-pointer-array-equivalence/type
@@ -0,0 +1 @@
+program/match-regex
diff --git a/oer/courses/c-basics/sections/10-pointer/06-pointers-to-pointer/Makefile b/oer/courses/c-basics/sections/10-pointer/06-pointers-to-pointer/Makefile
new file mode 100644
index 0000000..c531e6c
--- /dev/null
+++ b/oer/courses/c-basics/sections/10-pointer/06-pointers-to-pointer/Makefile
@@ -0,0 +1,6 @@
+
+all:
+ gcc --std=c99 program.c -o program
+
+clean:
+ rm -f program
diff --git a/oer/courses/c-basics/sections/10-pointer/06-pointers-to-pointer/content.html b/oer/courses/c-basics/sections/10-pointer/06-pointers-to-pointer/content.html
new file mode 100644
index 0000000..d9191bf
--- /dev/null
+++ b/oer/courses/c-basics/sections/10-pointer/06-pointers-to-pointer/content.html
@@ -0,0 +1,10 @@
+
+ An interesting thing you can do with pointers, is the possibility to have pointers point to pointers.
+ This may seems weird, but it is actually useful. When you want to talk about an array of pointers,
+ or and array of arrays.
+
+
+ To declare a pointer to a pointer you just add more *-operators.
+ For example char **PointerToPointer;
+ Nesting pointers like this can easily get confusing, try to avoid using more than two or three.
+
diff --git a/oer/courses/c-basics/sections/10-pointer/06-pointers-to-pointer/meta b/oer/courses/c-basics/sections/10-pointer/06-pointers-to-pointer/meta
new file mode 100644
index 0000000..c1f7093
--- /dev/null
+++ b/oer/courses/c-basics/sections/10-pointer/06-pointers-to-pointer/meta
@@ -0,0 +1 @@
+{"title": "Pointers to pointers"}
diff --git a/oer/courses/c-basics/sections/10-pointer/06-pointers-to-pointer/program.c b/oer/courses/c-basics/sections/10-pointer/06-pointers-to-pointer/program.c
new file mode 100644
index 0000000..9b0db5c
--- /dev/null
+++ b/oer/courses/c-basics/sections/10-pointer/06-pointers-to-pointer/program.c
@@ -0,0 +1,13 @@
+#include
+
+int main(int argc, const char *argv[])
+{
+ // So why are nested pointers usefull?
+ // We have seen that arrays and pointers behave simmilarly
+ // nested arrays can be accessed via nested pointers.
+ char a = 'a';
+ char* b = &a;
+ char** c = &b;
+
+ // TODO: Print the value of a using c:
+}
diff --git a/oer/courses/c-basics/sections/10-pointer/06-pointers-to-pointer/regex b/oer/courses/c-basics/sections/10-pointer/06-pointers-to-pointer/regex
new file mode 100644
index 0000000..412996f
--- /dev/null
+++ b/oer/courses/c-basics/sections/10-pointer/06-pointers-to-pointer/regex
@@ -0,0 +1 @@
+^a\s*$
diff --git a/oer/courses/c-basics/sections/10-pointer/06-pointers-to-pointer/type b/oer/courses/c-basics/sections/10-pointer/06-pointers-to-pointer/type
new file mode 100644
index 0000000..7d393ec
--- /dev/null
+++ b/oer/courses/c-basics/sections/10-pointer/06-pointers-to-pointer/type
@@ -0,0 +1 @@
+program/match-regex
diff --git a/oer/courses/c-basics/sections/10-pointer/07-function-pointer/Makefile b/oer/courses/c-basics/sections/10-pointer/07-function-pointer/Makefile
new file mode 100644
index 0000000..a82226f
--- /dev/null
+++ b/oer/courses/c-basics/sections/10-pointer/07-function-pointer/Makefile
@@ -0,0 +1,7 @@
+
+all:
+ gcc --std=c99 program.c -o program
+
+clean:
+ rm -f program
+
diff --git a/oer/courses/c-basics/sections/10-pointer/07-function-pointer/content.html b/oer/courses/c-basics/sections/10-pointer/07-function-pointer/content.html
new file mode 100644
index 0000000..bc73200
--- /dev/null
+++ b/oer/courses/c-basics/sections/10-pointer/07-function-pointer/content.html
@@ -0,0 +1,5 @@
+
+ Pointers may also point to functions. This way we can work with functions in a generic way.
+ To declare a function pointer you still have to use the *-operator. But you also have to write the expected
+ parameters in parentheses behind the name like this:return-type (*name)(parameters);
+
diff --git a/oer/courses/c-basics/sections/10-pointer/07-function-pointer/meta b/oer/courses/c-basics/sections/10-pointer/07-function-pointer/meta
new file mode 100644
index 0000000..979b461
--- /dev/null
+++ b/oer/courses/c-basics/sections/10-pointer/07-function-pointer/meta
@@ -0,0 +1 @@
+{"title": "Function Pointer"}
diff --git a/oer/courses/c-basics/sections/10-pointer/07-function-pointer/program.c b/oer/courses/c-basics/sections/10-pointer/07-function-pointer/program.c
new file mode 100644
index 0000000..8c18530
--- /dev/null
+++ b/oer/courses/c-basics/sections/10-pointer/07-function-pointer/program.c
@@ -0,0 +1,32 @@
+#include
+void a(int x)
+{
+ printf("From function a: %d\n", x);
+}
+
+void b(int x)
+{
+ printf("From function b: %d\n", x);
+}
+
+double c(char y)
+{
+ printf("From function c: %c\n",y);
+ return 0.5;
+}
+
+int main(int argc, const char *argv[])
+{
+ void (*func)(int);
+ // The two function calls below look the same but behave diffrent
+ // we are using a function pointer to change the function being called
+ // take a good look at the syntax, you are going to need it in the next exercise
+ func = b;
+ func(2);
+ func = a;
+ func(2);
+
+ // TODO: declare a function pointer for the function c and assigne c to it
+
+ // TODO: call c via function pointer with the argument 'c'
+}
diff --git a/oer/courses/c-basics/sections/10-pointer/07-function-pointer/regex b/oer/courses/c-basics/sections/10-pointer/07-function-pointer/regex
new file mode 100644
index 0000000..bd6dcc9
--- /dev/null
+++ b/oer/courses/c-basics/sections/10-pointer/07-function-pointer/regex
@@ -0,0 +1 @@
+^\s*From function b: 2\s*From function a: 2\s*From function c: c\s*$
diff --git a/oer/courses/c-basics/sections/10-pointer/07-function-pointer/type b/oer/courses/c-basics/sections/10-pointer/07-function-pointer/type
new file mode 100644
index 0000000..7d393ec
--- /dev/null
+++ b/oer/courses/c-basics/sections/10-pointer/07-function-pointer/type
@@ -0,0 +1 @@
+program/match-regex
diff --git a/oer/courses/c-basics/sections/10-pointer/08-map/Makefile b/oer/courses/c-basics/sections/10-pointer/08-map/Makefile
new file mode 100644
index 0000000..16815b5
--- /dev/null
+++ b/oer/courses/c-basics/sections/10-pointer/08-map/Makefile
@@ -0,0 +1,8 @@
+
+all:
+ gcc --std=c99 --std=c99 program.c -o program
+ gcc --std=c99 --std=c99 solution.c -o solution
+
+clean:
+ rm -f program
+ rm -f solution
diff --git a/oer/courses/c-basics/sections/10-pointer/08-map/content.html b/oer/courses/c-basics/sections/10-pointer/08-map/content.html
new file mode 100644
index 0000000..109d3a1
--- /dev/null
+++ b/oer/courses/c-basics/sections/10-pointer/08-map/content.html
@@ -0,0 +1,5 @@
+
+ Now that you know all the basic of pointers, it's time for you to use them in a more in depth way.
+ Implement a map-function that applies one function to a whole array of integers.
+ Try to also use pointer arithmetic to index into the array instead of the []-operator.
+
diff --git a/oer/courses/c-basics/sections/10-pointer/08-map/meta b/oer/courses/c-basics/sections/10-pointer/08-map/meta
new file mode 100644
index 0000000..9c1d955
--- /dev/null
+++ b/oer/courses/c-basics/sections/10-pointer/08-map/meta
@@ -0,0 +1 @@
+{"title": "Map"}
diff --git a/oer/courses/c-basics/sections/10-pointer/08-map/program.c b/oer/courses/c-basics/sections/10-pointer/08-map/program.c
new file mode 100644
index 0000000..e1e98e2
--- /dev/null
+++ b/oer/courses/c-basics/sections/10-pointer/08-map/program.c
@@ -0,0 +1,21 @@
+#include
+int increment(int x)
+{
+ return x + 1;
+}
+
+//TODO: implement a function map
+// It applys the function to all members of the array.
+// The first argument is always a pointer to the first argument in a array
+// The second is its length and the third is a function that takes
+// an integer and returns one.
+// Each element in the array is replaced with the fucntions result
+
+int main(int argc, const char *argv[])
+{
+ int nums[7] = {1, 2, 3, 4, 5, 6, 7};
+ map(nums, 7, &increment);
+ for (int i = 0; i < 7; i++) {
+ printf("%d,", nums[i]);
+ }
+}
diff --git a/oer/courses/c-basics/sections/10-pointer/08-map/regex b/oer/courses/c-basics/sections/10-pointer/08-map/regex
new file mode 100644
index 0000000..64e3a87
--- /dev/null
+++ b/oer/courses/c-basics/sections/10-pointer/08-map/regex
@@ -0,0 +1 @@
+^2.*8,$
diff --git a/oer/courses/c-basics/sections/10-pointer/08-map/solution.c b/oer/courses/c-basics/sections/10-pointer/08-map/solution.c
new file mode 100644
index 0000000..f7de98a
--- /dev/null
+++ b/oer/courses/c-basics/sections/10-pointer/08-map/solution.c
@@ -0,0 +1,19 @@
+#include
+int increment(int x)
+{
+ return x + 1;
+}
+
+int map(int* arr, int len, int (*func)(int))
+{
+ for (int i = 0; i < len; i++)
+ arr[i] = func(arr[i]);
+}
+int main(int argc, const char *argv[])
+{
+ int nums[7] = {1, 2, 3, 4, 5, 6, 7};
+ map(nums, 7, &increment);
+ for (int i = 0; i < 7; i++) {
+ printf("%d\n", nums[i]);
+ }
+}
diff --git a/oer/courses/c-basics/sections/10-pointer/08-map/type b/oer/courses/c-basics/sections/10-pointer/08-map/type
new file mode 100644
index 0000000..7d393ec
--- /dev/null
+++ b/oer/courses/c-basics/sections/10-pointer/08-map/type
@@ -0,0 +1 @@
+program/match-regex
diff --git a/oer/courses/c-basics/sections/10-pointer/section b/oer/courses/c-basics/sections/10-pointer/section
new file mode 100644
index 0000000..047ab21
--- /dev/null
+++ b/oer/courses/c-basics/sections/10-pointer/section
@@ -0,0 +1 @@
+{"title": "Pointers", "description": "The basics of using pointers and possible pitfalls."}
diff --git a/oer/courses/c-basics/sections/11-strings/01-introduction/Makefile b/oer/courses/c-basics/sections/11-strings/01-introduction/Makefile
new file mode 100644
index 0000000..c531e6c
--- /dev/null
+++ b/oer/courses/c-basics/sections/11-strings/01-introduction/Makefile
@@ -0,0 +1,6 @@
+
+all:
+ gcc --std=c99 program.c -o program
+
+clean:
+ rm -f program
diff --git a/oer/courses/c-basics/sections/11-strings/01-introduction/content.html b/oer/courses/c-basics/sections/11-strings/01-introduction/content.html
new file mode 100644
index 0000000..c4b6788
--- /dev/null
+++ b/oer/courses/c-basics/sections/11-strings/01-introduction/content.html
@@ -0,0 +1,6 @@
+
+ In this course we already did use strings quite a bit. Thats because it is hard to produce easy output with out them.
+ But C doesn't actualy have strings. Instead C uses arrays of characters. Because strings aren't normaly all the same size, C opted to null terminate all the strings.
+ I.e the last member of the array is 0, so you don't have to know its size. When we come to the struct lecture you can, if you want, define your own strings to
+ safe the size. But all the standart library function work only with null terminated char arrays.
+
diff --git a/oer/courses/c-basics/sections/11-strings/01-introduction/execute.sh b/oer/courses/c-basics/sections/11-strings/01-introduction/execute.sh
new file mode 100755
index 0000000..0b7cd4f
--- /dev/null
+++ b/oer/courses/c-basics/sections/11-strings/01-introduction/execute.sh
@@ -0,0 +1 @@
+gcc -std=c99 -o program.c program
diff --git a/oer/courses/c-basics/sections/11-strings/01-introduction/meta b/oer/courses/c-basics/sections/11-strings/01-introduction/meta
new file mode 100644
index 0000000..b75c1c1
--- /dev/null
+++ b/oer/courses/c-basics/sections/11-strings/01-introduction/meta
@@ -0,0 +1 @@
+{"title": "Introduction"}
diff --git a/oer/courses/c-basics/sections/11-strings/01-introduction/program.c b/oer/courses/c-basics/sections/11-strings/01-introduction/program.c
new file mode 100644
index 0000000..3d2f11e
--- /dev/null
+++ b/oer/courses/c-basics/sections/11-strings/01-introduction/program.c
@@ -0,0 +1,19 @@
+#include
+int main(int argc, const char *argv[])
+{
+ // The two initializations below are equivalent
+ // String literals are converted into 0-terminated char arrays.
+ char word[] = "Hi";
+ char second_word[] = {'H', 'i', '\0'};
+
+ // Lets see if the last byte is actually a null byte:
+ printf("%x\n", word[2]);
+ printf("%x\n", second_word[2]);
+
+ // Standard library functions such as printf relay on the null-termination
+ char faulty[] = {'H', 'e', 'l', 'l', 'o'};
+ // This will segfault
+ printf("%s\n", faulty);
+ // TODO: fix the char array definiton to avoid our programm segfaulting.
+ // Why do we get a segmentation fault?
+}
diff --git a/oer/courses/c-basics/sections/11-strings/01-introduction/regex b/oer/courses/c-basics/sections/11-strings/01-introduction/regex
new file mode 100644
index 0000000..15b1e0f
--- /dev/null
+++ b/oer/courses/c-basics/sections/11-strings/01-introduction/regex
@@ -0,0 +1 @@
+^(\s|.)*Hello\s*$
diff --git a/oer/courses/c-basics/sections/11-strings/01-introduction/type b/oer/courses/c-basics/sections/11-strings/01-introduction/type
new file mode 100644
index 0000000..1bb833c
--- /dev/null
+++ b/oer/courses/c-basics/sections/11-strings/01-introduction/type
@@ -0,0 +1 @@
+program/scriptgrade
diff --git a/oer/courses/c-basics/sections/11-strings/02-lib/Makefile b/oer/courses/c-basics/sections/11-strings/02-lib/Makefile
new file mode 100644
index 0000000..c531e6c
--- /dev/null
+++ b/oer/courses/c-basics/sections/11-strings/02-lib/Makefile
@@ -0,0 +1,6 @@
+
+all:
+ gcc --std=c99 program.c -o program
+
+clean:
+ rm -f program
diff --git a/oer/courses/c-basics/sections/11-strings/02-lib/content.html b/oer/courses/c-basics/sections/11-strings/02-lib/content.html
new file mode 100644
index 0000000..3a48b8f
--- /dev/null
+++ b/oer/courses/c-basics/sections/11-strings/02-lib/content.html
@@ -0,0 +1,8 @@
+
+ In C there are some usefull functions ready to use for strings.
+ If you want to use them you have to include <string.h>.
+ Implement a function that concatenates all words beginning with "pre".
+
+
+ Try using the functions strncmp and strcat.
+
diff --git a/oer/courses/c-basics/sections/11-strings/02-lib/meta b/oer/courses/c-basics/sections/11-strings/02-lib/meta
new file mode 100644
index 0000000..94412e8
--- /dev/null
+++ b/oer/courses/c-basics/sections/11-strings/02-lib/meta
@@ -0,0 +1 @@
+{"title": "string.h"}
diff --git a/oer/courses/c-basics/sections/11-strings/02-lib/program.c b/oer/courses/c-basics/sections/11-strings/02-lib/program.c
new file mode 100644
index 0000000..3d207ba
--- /dev/null
+++ b/oer/courses/c-basics/sections/11-strings/02-lib/program.c
@@ -0,0 +1,33 @@
+#include
+#include
+
+// int strncmp(const char *str1, const char *str2, size_t n)
+// returns 0 if n fist characters are equal
+
+// char *strcat(char *dest, const char *src)
+// appeds src to dest. Make sure that dest is big enough. Returns pointer to dest.
+
+char *ConcatPre(char *Buffer, char *WordArray[], int Count)
+{
+ // TODO: Implement this function such that all words beginning with "pre"
+ // will be concatenated and returned.
+ return Buffer;
+}
+
+int main(int argc, const char *argv[])
+{
+ char Buffer[32];
+
+ char *Words[] =
+ {
+ "precompiler ",
+ "postfix ",
+ "preprocessor ",
+ "postprocessing ",
+ "prefix "
+ };
+
+ ConcatPre(Buffer, Words, 5);
+
+ printf("The buffer contains:\n%s \nand has length %d", Buffer, (int)strlen(Buffer));
+}
diff --git a/oer/courses/c-basics/sections/11-strings/02-lib/regex b/oer/courses/c-basics/sections/11-strings/02-lib/regex
new file mode 100644
index 0000000..6f0ce3a
--- /dev/null
+++ b/oer/courses/c-basics/sections/11-strings/02-lib/regex
@@ -0,0 +1 @@
+^(.|\s)*precompiler preprocessor prefix(.|\s)*32(.|\s)*$
diff --git a/oer/courses/c-basics/sections/11-strings/02-lib/type b/oer/courses/c-basics/sections/11-strings/02-lib/type
new file mode 100644
index 0000000..7d393ec
--- /dev/null
+++ b/oer/courses/c-basics/sections/11-strings/02-lib/type
@@ -0,0 +1 @@
+program/match-regex
diff --git a/oer/courses/c-basics/sections/11-strings/04-counting/Makefile b/oer/courses/c-basics/sections/11-strings/04-counting/Makefile
new file mode 100644
index 0000000..a82226f
--- /dev/null
+++ b/oer/courses/c-basics/sections/11-strings/04-counting/Makefile
@@ -0,0 +1,7 @@
+
+all:
+ gcc --std=c99 program.c -o program
+
+clean:
+ rm -f program
+
diff --git a/oer/courses/c-basics/sections/11-strings/04-counting/content.html b/oer/courses/c-basics/sections/11-strings/04-counting/content.html
new file mode 100644
index 0000000..4666d51
--- /dev/null
+++ b/oer/courses/c-basics/sections/11-strings/04-counting/content.html
@@ -0,0 +1 @@
+Write a simple function that counts the number of occurances of a char in a string.
diff --git a/oer/courses/c-basics/sections/11-strings/04-counting/meta b/oer/courses/c-basics/sections/11-strings/04-counting/meta
new file mode 100644
index 0000000..d06b029
--- /dev/null
+++ b/oer/courses/c-basics/sections/11-strings/04-counting/meta
@@ -0,0 +1 @@
+{"title": "Char Counter"}
diff --git a/oer/courses/c-basics/sections/11-strings/04-counting/program.c b/oer/courses/c-basics/sections/11-strings/04-counting/program.c
new file mode 100644
index 0000000..83eb426
--- /dev/null
+++ b/oer/courses/c-basics/sections/11-strings/04-counting/program.c
@@ -0,0 +1,10 @@
+#include
+// Returns the number of occurences of c in str
+// TODO: Implement a count function that works with the call below
+int main(int argc, const char *argv[])
+{
+ const char text[] = "Goodbye World!";
+ int os = count(text, 'o');
+ printf("Number of o's: %d", os);
+ return 0;
+}
diff --git a/oer/courses/c-basics/sections/11-strings/04-counting/regex b/oer/courses/c-basics/sections/11-strings/04-counting/regex
new file mode 100644
index 0000000..3725589
--- /dev/null
+++ b/oer/courses/c-basics/sections/11-strings/04-counting/regex
@@ -0,0 +1 @@
+(\s|.)*3\s*$
diff --git a/oer/courses/c-basics/sections/11-strings/04-counting/type b/oer/courses/c-basics/sections/11-strings/04-counting/type
new file mode 100644
index 0000000..7d393ec
--- /dev/null
+++ b/oer/courses/c-basics/sections/11-strings/04-counting/type
@@ -0,0 +1 @@
+program/match-regex
diff --git a/oer/courses/c-basics/sections/11-strings/05-commandline/Makefile b/oer/courses/c-basics/sections/11-strings/05-commandline/Makefile
new file mode 100644
index 0000000..5dbdcd8
--- /dev/null
+++ b/oer/courses/c-basics/sections/11-strings/05-commandline/Makefile
@@ -0,0 +1,8 @@
+
+all:
+ gcc --std=c99 program.c -o program
+ gcc --std=c99 solution.c -o solution
+clean:
+ rm -f program
+ rm -f solution
+
diff --git a/oer/courses/c-basics/sections/11-strings/05-commandline/content.html b/oer/courses/c-basics/sections/11-strings/05-commandline/content.html
new file mode 100644
index 0000000..f92dd67
--- /dev/null
+++ b/oer/courses/c-basics/sections/11-strings/05-commandline/content.html
@@ -0,0 +1,14 @@
+
+ When you start a program, you can pass it some arguments.
+ We actually used this in this course sometimes before, to check your solutions.
+ But we never did show you how to access this arguments.
+
+
+ The main function gets passed two parameters. The first one is the number of arguments.
+ The second one is an array of strings. They are normally named argc and argv, but you can name them differently.
+ The first argument is always the path to your program.
+
+
+ Write a simple program, which checks, if any arguments got passed and
+ prints them in reverse order.
+
diff --git a/oer/courses/c-basics/sections/11-strings/05-commandline/execute.sh b/oer/courses/c-basics/sections/11-strings/05-commandline/execute.sh
new file mode 100755
index 0000000..2396955
--- /dev/null
+++ b/oer/courses/c-basics/sections/11-strings/05-commandline/execute.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+./program This should be in reverse order
diff --git a/oer/courses/c-basics/sections/11-strings/05-commandline/meta b/oer/courses/c-basics/sections/11-strings/05-commandline/meta
new file mode 100644
index 0000000..87158f5
--- /dev/null
+++ b/oer/courses/c-basics/sections/11-strings/05-commandline/meta
@@ -0,0 +1 @@
+{"title": "Commandline Arguments"}
diff --git a/oer/courses/c-basics/sections/11-strings/05-commandline/program.c b/oer/courses/c-basics/sections/11-strings/05-commandline/program.c
new file mode 100644
index 0000000..3e0070b
--- /dev/null
+++ b/oer/courses/c-basics/sections/11-strings/05-commandline/program.c
@@ -0,0 +1,17 @@
+#include
+int main(int argc, const char **argv)
+{
+ // TODO: Check if any arguments got passed
+ {
+ printf("Please pass arguments to this program");
+ return(1);
+ }
+
+ // TODO: Print the arguments in reverse order
+ for()
+ {
+ printf("%s ",);
+ }
+
+ return 0;
+}
diff --git a/oer/courses/c-basics/sections/11-strings/05-commandline/solution.c b/oer/courses/c-basics/sections/11-strings/05-commandline/solution.c
new file mode 100644
index 0000000..b450702
--- /dev/null
+++ b/oer/courses/c-basics/sections/11-strings/05-commandline/solution.c
@@ -0,0 +1,16 @@
+#include
+int main(int argc, const char **argv)
+{
+ if(argc <= 1)
+ {
+ printf("Please pass arguments to this program");
+ return(1);
+ }
+
+ for(int index = argc-1; index > 0; index--)
+ {
+ printf("%s ", argv[index]);
+ }
+
+ return(0);
+}
diff --git a/oer/courses/c-basics/sections/11-strings/05-commandline/test.sh b/oer/courses/c-basics/sections/11-strings/05-commandline/test.sh
new file mode 100755
index 0000000..b188df1
--- /dev/null
+++ b/oer/courses/c-basics/sections/11-strings/05-commandline/test.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+correct=true
+
+program1_out=$(./program)
+solution1_out=$(./solution)
+
+if [ "$program1_out" == "$solution1_out" ]
+then
+ echo "PASS " $program1_out " equals " $solution1_out
+else
+ echo "FAIL " $program1_out " DOES NOT EQUAL " $solution1_out
+ correct = false
+fi
+
+program_out=$(./program This should be in reverse order)
+solution_out=$(./solution This should be in reverse order)
+
+if [ "$program_out" == "$solution_out" ]
+then
+ echo "PASS " $program_out " equals " $solution_out
+else
+ echo "FAIL " $program_out " DOES NOT EQUAL " $solution_out
+ correct = false
+fi
+
+if [ "$correct" = true ]
+then
+ echo "PASS";
+else
+ echo "FAIL";
+fi
+
+
diff --git a/oer/courses/c-basics/sections/11-strings/05-commandline/type b/oer/courses/c-basics/sections/11-strings/05-commandline/type
new file mode 100644
index 0000000..1bb833c
--- /dev/null
+++ b/oer/courses/c-basics/sections/11-strings/05-commandline/type
@@ -0,0 +1 @@
+program/scriptgrade
diff --git a/oer/courses/c-basics/sections/11-strings/section b/oer/courses/c-basics/sections/11-strings/section
new file mode 100644
index 0000000..ce5547c
--- /dev/null
+++ b/oer/courses/c-basics/sections/11-strings/section
@@ -0,0 +1 @@
+{"title": "Strings", "description": "Char arrays and how to use them."}
diff --git a/oer/courses/c-basics/sections/12-struct_enum/01-enums/Makefile b/oer/courses/c-basics/sections/12-struct_enum/01-enums/Makefile
new file mode 100644
index 0000000..becf11b
--- /dev/null
+++ b/oer/courses/c-basics/sections/12-struct_enum/01-enums/Makefile
@@ -0,0 +1,8 @@
+
+all:
+ gcc --std=c99 program.c -o program
+ gcc --std=c99 solution.c -o solution
+
+clean:
+ rm -f program
+ rm -f solution
diff --git a/oer/courses/c-basics/sections/12-struct_enum/01-enums/content.html b/oer/courses/c-basics/sections/12-struct_enum/01-enums/content.html
new file mode 100644
index 0000000..b1fce78
--- /dev/null
+++ b/oer/courses/c-basics/sections/12-struct_enum/01-enums/content.html
@@ -0,0 +1,13 @@
+
+ Until now you didn't have any way to define your own types or store information about state in a readable way.
+ The most simple construct to do that are enums.
+ Enums are enumeration types, meaning they are basicly ints but they allow you to use a name instead of numbers.
+ The compiler will then translate those names in numbers.
+
+
+ This is usefull, because you see at a glance, what you want to say with your code, instead of trying to find out, what a 4 means in this case.
+ Also if you want to change anything about your enum, you only have to change it in the definition, except you change the names.
+
+
+ Write a function, which returns the number of days to the specified one.
+
diff --git a/oer/courses/c-basics/sections/12-struct_enum/01-enums/execute.sh b/oer/courses/c-basics/sections/12-struct_enum/01-enums/execute.sh
new file mode 100755
index 0000000..0a69f5c
--- /dev/null
+++ b/oer/courses/c-basics/sections/12-struct_enum/01-enums/execute.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+
+
+./program 1 5
+
+
diff --git a/oer/courses/c-basics/sections/12-struct_enum/01-enums/meta b/oer/courses/c-basics/sections/12-struct_enum/01-enums/meta
new file mode 100644
index 0000000..a14e38d
--- /dev/null
+++ b/oer/courses/c-basics/sections/12-struct_enum/01-enums/meta
@@ -0,0 +1 @@
+{"title": "Enums"}
diff --git a/oer/courses/c-basics/sections/12-struct_enum/01-enums/program.c b/oer/courses/c-basics/sections/12-struct_enum/01-enums/program.c
new file mode 100644
index 0000000..35827d3
--- /dev/null
+++ b/oer/courses/c-basics/sections/12-struct_enum/01-enums/program.c
@@ -0,0 +1,95 @@
+#include
+#include
+#include
+
+enum Day {
+ MONDAY,
+ TUESDAY,
+ WEDNESDAY,
+ THURSDAY,
+ FRIDAY,
+ SATURDAY,
+ SUNDAY
+};
+
+int DayTill(enum Day Current, enum Day Other)
+{
+ return 0;
+}
+
+// Unfortunatly there is no easy way to print out enums as text,
+// because internaly they are just numbers.
+char *EnumToString(char *Dest, enum Day WeekDay)
+{
+ // When we get to memory allocation you could do this without the destination buffer
+ switch(WeekDay)
+ {
+ case MONDAY:
+ {
+ strcpy(Dest,"monday");
+ }break;
+ case TUESDAY:
+ {
+ strcpy(Dest,"tuesday");
+ }break;
+ case WEDNESDAY:
+ {
+ strcpy(Dest,"wednesday");
+ }break;
+ case THURSDAY:
+ {
+ strcpy(Dest,"thursday");
+ }break;
+ case FRIDAY:
+ {
+ strcpy(Dest,"friday");
+ }break;
+ case SATURDAY:
+ {
+ strcpy(Dest,"saturday");
+ }break;
+ case SUNDAY:
+ {
+ strcpy(Dest,"sunday");
+ }break;
+ }
+ return Dest;
+}
+
+int main(int argc, const char *argv[])
+{
+
+ // We can now assign variables one of our enums options.
+ enum Day current_day = MONDAY;
+
+ // To shorten the syntax we can also do a typedefinition:
+ typedef enum Day DayType;
+
+ // Now we just need to write:
+ DayType x = TUESDAY;
+
+ // Each of the enums options has an associated value so we can do:
+ if (x > current_day) {
+ printf("Tuesday is larger %d.\n", x);
+ }
+ char Buffer[32],Buffer2[32];
+ printf("Today is %s. %d days until next %s", EnumToString(Buffer, atoi(argv[1])), DayTill(atoi(argv[1]), atoi(argv[2])), EnumToString(Buffer2, atoi(argv[2])));
+
+}
+// If you want the values to be different, you can set them explicitly
+enum Months {
+ JANUARY = 10,
+ FEBRUARY = 0,
+ MARCH = 33,
+ APRIL = 99,
+ MAY = 6,
+ JUNE = 42,
+ JULY = 27,
+ AUGUST = 3,
+ SEPTEMBER = 1,
+ OCTOBER = 4,
+ NOVEMBER,
+ DECEMBER = 5,
+};
+
+
diff --git a/oer/courses/c-basics/sections/12-struct_enum/01-enums/solution.c b/oer/courses/c-basics/sections/12-struct_enum/01-enums/solution.c
new file mode 100644
index 0000000..f5e813e
--- /dev/null
+++ b/oer/courses/c-basics/sections/12-struct_enum/01-enums/solution.c
@@ -0,0 +1,74 @@
+#include
+#include
+#include
+
+typedef enum Day {
+ MONDAY,
+ TUESDAY,
+ WEDNESDAY,
+ THURSDAY,
+ FRIDAY,
+ SATURDAY,
+ SUNDAY
+}Day;
+
+int DayTill(Day Current, Day Other)
+{
+ if(Current < Other)
+ {
+ return Other-Current;
+ }
+ else
+ {
+ return SUNDAY-Current + Other;
+ }
+}
+
+char *EnumToString(char *Dest, enum Day WeekDay)
+{
+ switch(WeekDay)
+ {
+ case MONDAY:
+ {
+ strcpy(Dest,"monday");
+ }break;
+ case TUESDAY:
+ {
+ strcpy(Dest,"tuesday");
+ }break;
+ case WEDNESDAY:
+ {
+ strcpy(Dest,"wednesday");
+ }break;
+ case THURSDAY:
+ {
+ strcpy(Dest,"thursday");
+ }break;
+ case FRIDAY:
+ {
+ strcpy(Dest,"friday");
+ }break;
+ case SATURDAY:
+ {
+ strcpy(Dest,"saturday");
+ }break;
+ case SUNDAY:
+ {
+ strcpy(Dest,"sunday");
+ }break;
+ }
+ return Dest;
+}
+
+int main(int argc, const char *argv[])
+{
+ if (TUESDAY > MONDAY) {
+ printf("Tuesday is larger %d.\n", TUESDAY);
+ }
+ char Buffer[32],Buffer2[32];
+ printf("Today is %s. %d days until next %s", EnumToString(Buffer, atoi(argv[1])), DayTill(atoi(argv[1]), atoi(argv[2])), EnumToString(Buffer2, atoi(argv[2])));
+
+}
+
+
+
diff --git a/oer/courses/c-basics/sections/12-struct_enum/01-enums/test.sh b/oer/courses/c-basics/sections/12-struct_enum/01-enums/test.sh
new file mode 100755
index 0000000..dd95b4a
--- /dev/null
+++ b/oer/courses/c-basics/sections/12-struct_enum/01-enums/test.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+
+correct=true
+
+for (( i = 0; i < 3; i++ )); do
+ a=$((RANDOM % 6))
+ b=$((RANDOM % 6))
+
+ program_out=$(./program $a $b)
+ solution_out=$(./solution $a $b)
+
+ if [ "$program_out" == "$solution_out" ]
+ then
+ echo "PASS " $program_out " equals " $solution_out
+ else
+ echo "FAIL " $program_out " DOES NOT EQUAL " $solution_out
+ correct=false
+ fi
+done
+
+if [ "$correct" = true ]
+then
+ echo "PASS";
+else
+ echo "FAIL";
+fi
+
diff --git a/oer/courses/c-basics/sections/12-struct_enum/01-enums/type b/oer/courses/c-basics/sections/12-struct_enum/01-enums/type
new file mode 100644
index 0000000..1bb833c
--- /dev/null
+++ b/oer/courses/c-basics/sections/12-struct_enum/01-enums/type
@@ -0,0 +1 @@
+program/scriptgrade
diff --git a/oer/courses/c-basics/sections/12-struct_enum/02-structs/Makefile b/oer/courses/c-basics/sections/12-struct_enum/02-structs/Makefile
new file mode 100644
index 0000000..c531e6c
--- /dev/null
+++ b/oer/courses/c-basics/sections/12-struct_enum/02-structs/Makefile
@@ -0,0 +1,6 @@
+
+all:
+ gcc --std=c99 program.c -o program
+
+clean:
+ rm -f program
diff --git a/oer/courses/c-basics/sections/12-struct_enum/02-structs/content.html b/oer/courses/c-basics/sections/12-struct_enum/02-structs/content.html
new file mode 100644
index 0000000..f6349f5
--- /dev/null
+++ b/oer/courses/c-basics/sections/12-struct_enum/02-structs/content.html
@@ -0,0 +1,13 @@
+
+ Structs are another way to define datatypes. They allow you to arange other datatypes into a specific data layout
+ to form your new data type. Imagine you want to write a program, which does some calculations with vectors.
+ Instead of using 3 variables for each vector, or a 3 dimentional array, you could have a single datatype for a vector.
+
+
+ You then could pass this single vector-type to functions and if you want to access certain members, you can give them convinient names.
+ To access the x component of the vector, you use the .-operator like this: vector.x.
+ A struct is declared just like a enum. But, instead of names, you declare members with types.
+
+
+ Your task is to define a struct position, which holds the 2d coordinates of the circle and then finish the PrintPos function.
+
diff --git a/oer/courses/c-basics/sections/12-struct_enum/02-structs/execute.sh b/oer/courses/c-basics/sections/12-struct_enum/02-structs/execute.sh
new file mode 100755
index 0000000..185c136
--- /dev/null
+++ b/oer/courses/c-basics/sections/12-struct_enum/02-structs/execute.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+./program
diff --git a/oer/courses/c-basics/sections/12-struct_enum/02-structs/meta b/oer/courses/c-basics/sections/12-struct_enum/02-structs/meta
new file mode 100644
index 0000000..7511d47
--- /dev/null
+++ b/oer/courses/c-basics/sections/12-struct_enum/02-structs/meta
@@ -0,0 +1 @@
+{"title": "Structs"}
diff --git a/oer/courses/c-basics/sections/12-struct_enum/02-structs/program.c b/oer/courses/c-basics/sections/12-struct_enum/02-structs/program.c
new file mode 100644
index 0000000..9e7453f
--- /dev/null
+++ b/oer/courses/c-basics/sections/12-struct_enum/02-structs/program.c
@@ -0,0 +1,32 @@
+#include
+
+// TODO: Implement the position struct
+typedef struct position
+{
+}position;
+
+struct circle {
+ position pos;
+ float diameter;
+};
+
+// As with enums you can use typedef to avoid writing struct everywhere
+typedef struct circle Circle;
+
+// TODO: Finish this function
+void PrintPos(Circle cir)
+{
+ printf("The circle is at position (%4.2f,%4.2f).\n", 0,0);
+}
+
+int main(int argc, const char *argv[])
+{
+ // TODO: Set the position to x = 4.5 and y = 2.0
+ position CirclePos;
+ Circle my_circle;
+ my_circle.pos = CirclePos;
+ my_circle.diameter = 2;
+
+ PrintPos(my_circle);
+ return 0;
+}
diff --git a/oer/courses/c-basics/sections/12-struct_enum/02-structs/regex b/oer/courses/c-basics/sections/12-struct_enum/02-structs/regex
new file mode 100644
index 0000000..267a598
--- /dev/null
+++ b/oer/courses/c-basics/sections/12-struct_enum/02-structs/regex
@@ -0,0 +1 @@
+^(.|\s)*(4.50,2.00)(.|\s)*$
diff --git a/oer/courses/c-basics/sections/12-struct_enum/02-structs/type b/oer/courses/c-basics/sections/12-struct_enum/02-structs/type
new file mode 100644
index 0000000..7d393ec
--- /dev/null
+++ b/oer/courses/c-basics/sections/12-struct_enum/02-structs/type
@@ -0,0 +1 @@
+program/match-regex
diff --git a/oer/courses/c-basics/sections/12-struct_enum/03-flags/Makefile b/oer/courses/c-basics/sections/12-struct_enum/03-flags/Makefile
new file mode 100644
index 0000000..c531e6c
--- /dev/null
+++ b/oer/courses/c-basics/sections/12-struct_enum/03-flags/Makefile
@@ -0,0 +1,6 @@
+
+all:
+ gcc --std=c99 program.c -o program
+
+clean:
+ rm -f program
diff --git a/oer/courses/c-basics/sections/12-struct_enum/03-flags/content.html b/oer/courses/c-basics/sections/12-struct_enum/03-flags/content.html
new file mode 100644
index 0000000..7ec1cf2
--- /dev/null
+++ b/oer/courses/c-basics/sections/12-struct_enum/03-flags/content.html
@@ -0,0 +1,15 @@
+
+ Sometimes you need to store lots of diffrent state about a type.
+ Usualy that it has something or not. It would be wastefull to
+ use for each feature a single value. The more effitient way is
+ to store it using flags.
+
+
+ To do that, you can use enums. You just have to assigne the values, such that
+ only one bit is ever set and no member shares a bit.
+ You can then set multiple flags by or-ing them together using |-operator.
+ To check, if a flag is set, use the &-operator.
+
+
+ Implement a Set and isSet function to make these operations more readable.
+
diff --git a/oer/courses/c-basics/sections/12-struct_enum/03-flags/meta b/oer/courses/c-basics/sections/12-struct_enum/03-flags/meta
new file mode 100644
index 0000000..6ba8a60
--- /dev/null
+++ b/oer/courses/c-basics/sections/12-struct_enum/03-flags/meta
@@ -0,0 +1 @@
+{"title": "Flags"}
diff --git a/oer/courses/c-basics/sections/12-struct_enum/03-flags/program.c b/oer/courses/c-basics/sections/12-struct_enum/03-flags/program.c
new file mode 100644
index 0000000..7edd6f0
--- /dev/null
+++ b/oer/courses/c-basics/sections/12-struct_enum/03-flags/program.c
@@ -0,0 +1,56 @@
+#include
+
+typedef enum Flags
+{
+ FLAG_NONE = 0,
+ FLAG_HUNGRY = 1 << 1,
+ FLAG_THIRSTY = 1 << 2,
+ FLAG_SLEEPY = 1 << 3,
+ // TODO: add another flag
+}Flags;
+/*
+ * Instead of shifting you can also just write the value
+ * enum Flags
+ * {
+ * foo = 1,
+ * bar = 2,
+ * baz = 4,
+ * }
+ */
+
+void Set(Flags *flag, Flags value)
+{
+ // TODO: Implement this.
+}
+
+int isSet(Flags flag, Flags value)
+{
+ // TODO: Implement this
+ return 0;
+}
+
+typedef enum
+{
+ GENDER_MALE,
+ GENDER_FEMALE,
+}gender;
+
+typedef struct person
+{
+ char *Name;
+ int Age;
+ gender Gender;
+ Flags Condition;
+}person;
+
+int main(int argc, const char *argv[])
+{
+ person Charly = {"Charly", 10, GENDER_MALE, FLAG_NONE};
+
+ Set(&Charly.Condition, FLAG_HUNGRY|FLAG_SLEEPY);
+
+ if(isSet(Charly.Condition, FLAG_SLEEPY))
+ {
+ printf("Charly is sleepy.");
+ }
+}
diff --git a/oer/courses/c-basics/sections/12-struct_enum/03-flags/regex b/oer/courses/c-basics/sections/12-struct_enum/03-flags/regex
new file mode 100644
index 0000000..daa02c9
--- /dev/null
+++ b/oer/courses/c-basics/sections/12-struct_enum/03-flags/regex
@@ -0,0 +1 @@
+^Charly is sleepy.$
diff --git a/oer/courses/c-basics/sections/12-struct_enum/03-flags/type b/oer/courses/c-basics/sections/12-struct_enum/03-flags/type
new file mode 100644
index 0000000..7d393ec
--- /dev/null
+++ b/oer/courses/c-basics/sections/12-struct_enum/03-flags/type
@@ -0,0 +1 @@
+program/match-regex
diff --git a/oer/courses/c-basics/sections/12-struct_enum/04-circle/Makefile b/oer/courses/c-basics/sections/12-struct_enum/04-circle/Makefile
new file mode 100644
index 0000000..a928c2e
--- /dev/null
+++ b/oer/courses/c-basics/sections/12-struct_enum/04-circle/Makefile
@@ -0,0 +1,11 @@
+
+all:
+ gcc --std=c99 program.c -o program
+ gcc --std=c99 solution.c -o solution
+test:
+ ./test.sh
+execute:
+ ./execute.sh
+clean:
+ rm -f program
+ rm -f solution
diff --git a/oer/courses/c-basics/sections/12-struct_enum/04-circle/content.html b/oer/courses/c-basics/sections/12-struct_enum/04-circle/content.html
new file mode 100644
index 0000000..6843f46
--- /dev/null
+++ b/oer/courses/c-basics/sections/12-struct_enum/04-circle/content.html
@@ -0,0 +1,3 @@
+Use the same structs as last time. Write a function, which given a pointer to a circle and a position, can say whether or not the point is within the cirlce.
+
+Write your own enum to represent the functions result. The Point is inside the circle, when difference of the x-coordinates squared + the difference of the y coordinates squared is less than the radius squared.
diff --git a/oer/courses/c-basics/sections/12-struct_enum/04-circle/execute.sh b/oer/courses/c-basics/sections/12-struct_enum/04-circle/execute.sh
new file mode 100755
index 0000000..2daecdb
--- /dev/null
+++ b/oer/courses/c-basics/sections/12-struct_enum/04-circle/execute.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+for (( i = 0; i < 1; i++ )); do
+ a=$(( ( RANDOM % 9 ) + 1))
+ b=$(( ( RANDOM % 9 ) + 1))
+
+ ./program $a $b
+done
diff --git a/oer/courses/c-basics/sections/12-struct_enum/04-circle/meta b/oer/courses/c-basics/sections/12-struct_enum/04-circle/meta
new file mode 100644
index 0000000..a3ad691
--- /dev/null
+++ b/oer/courses/c-basics/sections/12-struct_enum/04-circle/meta
@@ -0,0 +1 @@
+{"title": "Circles"}
diff --git a/oer/courses/c-basics/sections/12-struct_enum/04-circle/program.c b/oer/courses/c-basics/sections/12-struct_enum/04-circle/program.c
new file mode 100644
index 0000000..fbaa675
--- /dev/null
+++ b/oer/courses/c-basics/sections/12-struct_enum/04-circle/program.c
@@ -0,0 +1,52 @@
+#include
+#include
+
+#define Square(x) ((x)*(x))
+
+// TODO: Define your result enum
+typedef enum result_enum
+{
+ RESULT_NONE,
+}result_enum;
+
+typedef struct position
+{
+ float x;
+ float y;
+}position;
+typedef struct circle
+{
+ position pos;
+ int radius;
+}circle;
+
+result_enum inside(circle c, position p)
+{
+ // TODO: Implement this function
+ return RESULT_NONE;
+}
+int main(int argc, const char *argv[])
+{
+ if(argc != 3)
+ {
+ printf("Wrong number of Arguments!");
+ return 1;
+ }
+ float x = atoi(argv[1]);
+ float y = atoi(argv[2]);
+
+ postion TestPoint = {x,y};
+
+ psotion CircleCenter = {5,3};
+ circle Circle = {CircleCenter, 6};
+
+ if(inside(Circle, TestPoint)==RESULT_NONE) // TODO: Check for your result enum
+ {
+ printf("Point (%f, %f) is Inside the Circle.\n", x,y);
+ }
+ else
+ {
+ printf("Point (%f, %f) is not Inside the Circle.\n",x,y);
+ }
+ return 0;
+}
diff --git a/oer/courses/c-basics/sections/12-struct_enum/04-circle/solution.c b/oer/courses/c-basics/sections/12-struct_enum/04-circle/solution.c
new file mode 100644
index 0000000..4b02fc3
--- /dev/null
+++ b/oer/courses/c-basics/sections/12-struct_enum/04-circle/solution.c
@@ -0,0 +1,62 @@
+#include
+#include
+#define Square(x) ((x)*(x))
+
+typedef struct Point
+{
+ float x;
+ float y;
+}Point;
+
+typedef struct Circle
+{
+ Point Center;
+ int Radius;
+}Circle;
+
+typedef enum result_enum
+ {
+ isInside,
+ isOutside,
+ }result_enum;
+
+result_enum inside(Circle* c, Point* p)
+{
+ result_enum result;
+ if(Square(c->Center.x - p->x) + Square(c->Center.y - p->y) <= Square(c->Radius))
+ {
+ result =isInside;
+ }
+ else{
+ result =isOutside;
+ }
+
+ return result;
+}
+int main(int argc, const char *argv[])
+{
+ if(argc != 3)
+ {
+ printf("Wrong number of Arguments!");
+ return 1;
+ }
+ float x = atoi(argv[1]);
+ float y = atoi(argv[2]);
+
+ Point CircleCenter = {5,3};
+ Circle C = {CircleCenter, 6};
+
+ Point p;
+ p.x = x;
+ p.y = y;
+
+ if(inside(&C,&p)==isInside)
+ {
+ printf("Point (%4.2f, %4.2f) is Inside the Circle.\n", x, y);
+ }
+ else
+ {
+ printf("Point (%4.2f, %4.2f) is not Inside the Circle.\n", x, y);
+ }
+ return 0;
+}
diff --git a/oer/courses/c-basics/sections/12-struct_enum/04-circle/test.sh b/oer/courses/c-basics/sections/12-struct_enum/04-circle/test.sh
new file mode 100755
index 0000000..3c2ce0a
--- /dev/null
+++ b/oer/courses/c-basics/sections/12-struct_enum/04-circle/test.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+
+correct=true
+
+for (( i = 0; i < 3; i++ )); do
+ a=$(( ( RANDOM % 9 ) + 1))
+ b=$(( ( RANDOM % 9 ) + 1))
+
+ program_out=$(./program $a $b)
+ solution_out=$(./solution $a $b)
+
+ if [ "$program_out" == "$solution_out" ]
+ then
+ echo "PASS " $program_out " equals " $solution_out
+ else
+ echo "FAIL " $program_out " DOES NOT EQUAL " $solution_out
+ correct=false
+ fi
+done
+
+
+
+if [ "$correct" = true ]
+then
+ echo "PASS";
+else
+ echo "FAIL";
+fi
diff --git a/oer/courses/c-basics/sections/12-struct_enum/04-circle/type b/oer/courses/c-basics/sections/12-struct_enum/04-circle/type
new file mode 100644
index 0000000..1bb833c
--- /dev/null
+++ b/oer/courses/c-basics/sections/12-struct_enum/04-circle/type
@@ -0,0 +1 @@
+program/scriptgrade
diff --git a/oer/courses/c-basics/sections/12-struct_enum/05-unions/Makefile b/oer/courses/c-basics/sections/12-struct_enum/05-unions/Makefile
new file mode 100644
index 0000000..c531e6c
--- /dev/null
+++ b/oer/courses/c-basics/sections/12-struct_enum/05-unions/Makefile
@@ -0,0 +1,6 @@
+
+all:
+ gcc --std=c99 program.c -o program
+
+clean:
+ rm -f program
diff --git a/oer/courses/c-basics/sections/12-struct_enum/05-unions/content.html b/oer/courses/c-basics/sections/12-struct_enum/05-unions/content.html
new file mode 100644
index 0000000..5c6947f
--- /dev/null
+++ b/oer/courses/c-basics/sections/12-struct_enum/05-unions/content.html
@@ -0,0 +1,17 @@
+
+ The last construct to lay out your data are unions. Unions are used to store different types in the same memory location.
+ This has three main practical reasons:
+
+ - Naming the same data differently.
+ Lets say you want a 3d vector, which you can use both as position and as color. You can use a union to define it as x,y,z and r,g,b.
+ - Storing different data in the same location.
+ To do that, you use the union to declare which types you want to store and and enum to store, which type actually got stored.
+ - Accessing the same data in a different way.
+ If you are doing low level programming, you sometimes have to deal with the byte order of different platforms.
+ It could then be useful to access types in form of bytes.
+
+
+
+
+ Your task is to define the struct box, which holds either an int or an float in the same position and tells you with an enum what it has stored.
+
diff --git a/oer/courses/c-basics/sections/12-struct_enum/05-unions/meta b/oer/courses/c-basics/sections/12-struct_enum/05-unions/meta
new file mode 100644
index 0000000..60b2cdd
--- /dev/null
+++ b/oer/courses/c-basics/sections/12-struct_enum/05-unions/meta
@@ -0,0 +1 @@
+{"title": "Unions"}
diff --git a/oer/courses/c-basics/sections/12-struct_enum/05-unions/program.c b/oer/courses/c-basics/sections/12-struct_enum/05-unions/program.c
new file mode 100644
index 0000000..9627b97
--- /dev/null
+++ b/oer/courses/c-basics/sections/12-struct_enum/05-unions/program.c
@@ -0,0 +1,58 @@
+#include
+
+typedef union vec3
+{
+ struct{float x,y,z;};
+ struct{float r,g,b;};
+ float E[3];
+}vec3;
+
+typedef enum type
+{
+ TYPE_INT,
+ TYPE_FLOAT,
+}type;
+
+// TODO: fill in the struct
+typedef struct box
+{
+
+}box;
+
+// TODO: implement this function, such that it prints the numbers in the right format.
+// this function should just print the number and a newline (\n)
+void PrintBox(box Box)
+{
+ // You can use a switch here.
+}
+
+int main(int argc, int argv)
+{
+ vec3 Vector = {1.0f,2.0f,3.0f};
+
+ // You can use r,g and b
+ printf("Color: %2.2f, %2.2f, %2.2f\n", Vector.r, Vector.g, Vector.b);
+
+ printf("Before the loop:\n");
+ // You can use x,y and z
+ printf("Position: %2.2f, %2.2f, %2.2f\n", Vector.x, Vector.y, Vector.z);
+
+ // You can access the elements via array
+ for (int i = 0; i < 3; i++)
+ {
+ Vector.E[i] = 10.0f;
+ }
+
+ printf("After the loop:\n");
+ printf("Position: %2.2f, %2.2f, %2.2f\n", Vector.x, Vector.y, Vector.z);
+
+ box BoxInt;
+ box BoxFloat;
+
+ // TODO: fill this variables both with the appropriate type and with 15 as a value
+
+ PrintBox(BoxInt);
+ PrintBox(BoxFloat);
+
+ return 0;
+}
diff --git a/oer/courses/c-basics/sections/12-struct_enum/05-unions/regex b/oer/courses/c-basics/sections/12-struct_enum/05-unions/regex
new file mode 100644
index 0000000..da81f3e
--- /dev/null
+++ b/oer/courses/c-basics/sections/12-struct_enum/05-unions/regex
@@ -0,0 +1 @@
+^(.|\s)*15\s*15.0*(.|\s)*$
diff --git a/oer/courses/c-basics/sections/12-struct_enum/05-unions/type b/oer/courses/c-basics/sections/12-struct_enum/05-unions/type
new file mode 100644
index 0000000..7d393ec
--- /dev/null
+++ b/oer/courses/c-basics/sections/12-struct_enum/05-unions/type
@@ -0,0 +1 @@
+program/match-regex
diff --git a/oer/courses/c-basics/sections/12-struct_enum/section b/oer/courses/c-basics/sections/12-struct_enum/section
new file mode 100644
index 0000000..5cf6616
--- /dev/null
+++ b/oer/courses/c-basics/sections/12-struct_enum/section
@@ -0,0 +1 @@
+{"title": "Structs & Enums", "description": "Datastructures to simplify programs."}
diff --git a/oer/courses/c-basics/sections/17-preprocessor/01-introduction/Makefile b/oer/courses/c-basics/sections/17-preprocessor/01-introduction/Makefile
new file mode 100644
index 0000000..917cde0
--- /dev/null
+++ b/oer/courses/c-basics/sections/17-preprocessor/01-introduction/Makefile
@@ -0,0 +1,7 @@
+
+all:
+ gcc --std=c99 program.c -o program
+ gcc --std=c99 -DSOMETHING program.c -o program2
+clean:
+ rm -f program
+
diff --git a/oer/courses/c-basics/sections/17-preprocessor/01-introduction/content.html b/oer/courses/c-basics/sections/17-preprocessor/01-introduction/content.html
new file mode 100644
index 0000000..2ffee24
--- /dev/null
+++ b/oer/courses/c-basics/sections/17-preprocessor/01-introduction/content.html
@@ -0,0 +1,16 @@
+
+ You already learned how to use the preprocessor to include libraries and to use macros.
+ But there some features you didn't learn yet. One very powerful one is conditional compilation.
+ This means you can mark up your code with the preprocessor directives #if, #ifdef and #ifndef,
+ to define, if this code gets to be compiled or will get cut out.
+ You can give the compiler flags starting with -D to define a flag for the preprocessor to check on.
+
+
+ You do this for many reasons. For example you want to make your code platform agnostic. Then you can wrap your system calls with those blocks. Another example could be, if you want to define debug-behavior, which should not end up in the release code.
+
+
+As a reminder: The preprocessor runs before the compiler. It only modifies the sourcefile before it is passed to the compiler. It does not change how the compiler behaves.
+
+
+ Check if the preprocessor flag SOMETHING is checked.
+
diff --git a/oer/courses/c-basics/sections/17-preprocessor/01-introduction/execute.sh b/oer/courses/c-basics/sections/17-preprocessor/01-introduction/execute.sh
new file mode 100755
index 0000000..faf16c8
--- /dev/null
+++ b/oer/courses/c-basics/sections/17-preprocessor/01-introduction/execute.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+echo Compiler: gcc -std=c99 program.c -o program
+./program
+echo
+echo Compiler: gcc -std=c99 -DSOMETHING program.c -o program2
+./program2
diff --git a/oer/courses/c-basics/sections/17-preprocessor/01-introduction/meta b/oer/courses/c-basics/sections/17-preprocessor/01-introduction/meta
new file mode 100644
index 0000000..6242557
--- /dev/null
+++ b/oer/courses/c-basics/sections/17-preprocessor/01-introduction/meta
@@ -0,0 +1 @@
+{"title": "Conditional Compilation"}
diff --git a/oer/courses/c-basics/sections/17-preprocessor/01-introduction/program.c b/oer/courses/c-basics/sections/17-preprocessor/01-introduction/program.c
new file mode 100644
index 0000000..480ab05
--- /dev/null
+++ b/oer/courses/c-basics/sections/17-preprocessor/01-introduction/program.c
@@ -0,0 +1,10 @@
+#include
+
+int main(int argc, const char *argv[])
+{
+ // print this, if the compiler defined -DSOMETHING
+ printf("something was defined\n");
+
+ // print this if the compiler did not define -DSOMETHING
+ printf("something was not defined\n");
+}
diff --git a/oer/courses/c-basics/sections/17-preprocessor/01-introduction/test.sh b/oer/courses/c-basics/sections/17-preprocessor/01-introduction/test.sh
new file mode 100755
index 0000000..3d3f4b9
--- /dev/null
+++ b/oer/courses/c-basics/sections/17-preprocessor/01-introduction/test.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+program1_out=$(./program)
+program2_out=$(./program2)
+
+pass=true
+
+if [ "$program1_out" == "something was not defined" ]
+then
+ test1="PASS Test1"
+else
+ test1="FAIL Test1"
+ pass=false
+fi
+
+if [ "$program2_out" == "something was defined" ]
+then
+ test2="PASS Test2"
+else
+ test2="FAIL Test2"
+ pass=false
+fi
+
+if [ "$pass" == true ]
+then
+ echo PASS
+else
+ echo FAIL
+fi
+echo " " $test1
+echo " " $test2
+
+
diff --git a/oer/courses/c-basics/sections/17-preprocessor/01-introduction/type b/oer/courses/c-basics/sections/17-preprocessor/01-introduction/type
new file mode 100644
index 0000000..0f28ac9
--- /dev/null
+++ b/oer/courses/c-basics/sections/17-preprocessor/01-introduction/type
@@ -0,0 +1,2 @@
+program/scriptgrade
+
diff --git a/oer/courses/c-basics/sections/17-preprocessor/02-debug/Makefile b/oer/courses/c-basics/sections/17-preprocessor/02-debug/Makefile
new file mode 100644
index 0000000..e3cf10a
--- /dev/null
+++ b/oer/courses/c-basics/sections/17-preprocessor/02-debug/Makefile
@@ -0,0 +1,12 @@
+
+all:
+ gcc --std=c99 -DDEBUG -Ddebug -DDebug program.c -o debug_program
+ gcc --std=c99 program.c -o program
+ gcc --std=c99 -DDEBUG -Ddebug -DDebug solution.c -o debug_solution
+ gcc --std=c99 solution.c -o solution
+
+clean:
+ rm -f program
+ rm -f solution
+ rm -f debug_program
+ rm -f debug_solution
diff --git a/oer/courses/c-basics/sections/17-preprocessor/02-debug/content.html b/oer/courses/c-basics/sections/17-preprocessor/02-debug/content.html
new file mode 100644
index 0000000..291cd1e
--- /dev/null
+++ b/oer/courses/c-basics/sections/17-preprocessor/02-debug/content.html
@@ -0,0 +1,12 @@
+
+ When programming, you will definitely run into situations, where you code something with the only purpose to help you debug.
+ You probably don't want those functions in the released program. A simple way to do this, is to wrap them in a macro, which gets defined
+ to nothing, if you didn't set the compiler flag for debug-mode (e.g -DDEBUG).
+
+
+ Another feature from the preproccessor you can use for debugging is the compile time information. With __FILE__ you get the filename and with __LINE__ the line number.
+ With that you can augment your debugging prints to include information about the file and line.
+
+
+ Define the debug() macro, that behaves like printf but only actually prints when the variable '-DDEBUG' is set.
+
diff --git a/oer/courses/c-basics/sections/17-preprocessor/02-debug/execute.sh b/oer/courses/c-basics/sections/17-preprocessor/02-debug/execute.sh
new file mode 100755
index 0000000..c32ed3b
--- /dev/null
+++ b/oer/courses/c-basics/sections/17-preprocessor/02-debug/execute.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+echo Debugmode on:
+./debug_program
+echo Debugmode off:
+./program
diff --git a/oer/courses/c-basics/sections/17-preprocessor/02-debug/meta b/oer/courses/c-basics/sections/17-preprocessor/02-debug/meta
new file mode 100644
index 0000000..1db56ab
--- /dev/null
+++ b/oer/courses/c-basics/sections/17-preprocessor/02-debug/meta
@@ -0,0 +1 @@
+{"title": "A Debug Helper"}
diff --git a/oer/courses/c-basics/sections/17-preprocessor/02-debug/program.c b/oer/courses/c-basics/sections/17-preprocessor/02-debug/program.c
new file mode 100644
index 0000000..75fbdcb
--- /dev/null
+++ b/oer/courses/c-basics/sections/17-preprocessor/02-debug/program.c
@@ -0,0 +1,30 @@
+#include
+#include
+
+// TODO: Change the debug macro to behave like printf when -DDebug is set
+// And to do nothing if not;
+#define debug(String, ...)
+// The three dots mean, you can pass as many or as little arguments as you want
+// to access these arguments use __VA_ARGS__
+
+// a macro for simple error output with some extra debug info
+#define ERROR(Text) printf("ERROR: File: %s Function: %s Line: %d. %s\n", __FILE__, __func__, __LINE__, Text)
+// TODO: wrap this macro as well
+
+int main(int argc, const char *argv[])
+{
+ // Sometimes you just want to print stuff when debugging
+ // and it is tedious to constantly remove them just to add then later again
+ int foo = 42;
+ debug("%d\n", foo);
+
+ // Maybe you want to use the preprocessor to log errors.
+ // It could be useful to print out some information like the
+ // line number, filename and function name
+
+ if(foo != 30)
+ {
+ // Logging the Error
+ ERROR("Something went wrong!");
+ }
+}
diff --git a/oer/courses/c-basics/sections/17-preprocessor/02-debug/solution.c b/oer/courses/c-basics/sections/17-preprocessor/02-debug/solution.c
new file mode 100644
index 0000000..9e6807d
--- /dev/null
+++ b/oer/courses/c-basics/sections/17-preprocessor/02-debug/solution.c
@@ -0,0 +1,28 @@
+#include
+#include
+
+#ifdef DEBUG
+
+#define debug(String, ...) printf(String, __VA_ARGS__)
+#define ERROR(Text) printf("ERROR: File: %s Function: %s Line: %d. %s\n", __FILE__, __func__, __LINE__, Text)
+
+#else
+
+#define debug(String, ...)
+#define ERROR(Text)
+
+#endif
+
+int main(int argc, const char *argv[])
+{
+ int foo = 42;
+ debug("%d\n", foo);
+
+ if(foo != 30)
+ {
+ // Logging the Error
+ ERROR("Something went wrong!");
+ }
+
+
+}
diff --git a/oer/courses/c-basics/sections/17-preprocessor/02-debug/test.sh b/oer/courses/c-basics/sections/17-preprocessor/02-debug/test.sh
new file mode 100755
index 0000000..07ccc71
--- /dev/null
+++ b/oer/courses/c-basics/sections/17-preprocessor/02-debug/test.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+correct=true
+
+program_out=$(./debug_program)
+solution_out=$(./debug_solution)
+
+regex='^\s*42\s*ERROR: File:(.|\s)*$'
+if [[ $program_out =~ $regex ]]
+then
+ echo "Pass "
+else
+ echo "FAIL " $program_out
+ correct = false
+fi
+
+program_out=$(./program)
+solution_out=$(./solution)
+
+regex2='^\s*'
+if [[ $program_out =~ $regex2 ]]
+then
+ echo "PASS "
+else
+ echo "FAIL " $program_out
+ correct=false
+fi
+
+if [ "$correct"==true]
+then
+ echo "PASS";
+else
+ echo "FAIL";
+fi
diff --git a/oer/courses/c-basics/sections/17-preprocessor/02-debug/type b/oer/courses/c-basics/sections/17-preprocessor/02-debug/type
new file mode 100644
index 0000000..1bb833c
--- /dev/null
+++ b/oer/courses/c-basics/sections/17-preprocessor/02-debug/type
@@ -0,0 +1 @@
+program/scriptgrade
diff --git a/oer/courses/c-basics/sections/17-preprocessor/03-libraries/Makefile b/oer/courses/c-basics/sections/17-preprocessor/03-libraries/Makefile
new file mode 100644
index 0000000..10304ff
--- /dev/null
+++ b/oer/courses/c-basics/sections/17-preprocessor/03-libraries/Makefile
@@ -0,0 +1,8 @@
+
+all:
+ gcc --std=c99 program.c -o program -lm
+
+
+clean:
+ rm -f program
+
diff --git a/oer/courses/c-basics/sections/17-preprocessor/03-libraries/content.html b/oer/courses/c-basics/sections/17-preprocessor/03-libraries/content.html
new file mode 100644
index 0000000..02c35dc
--- /dev/null
+++ b/oer/courses/c-basics/sections/17-preprocessor/03-libraries/content.html
@@ -0,0 +1 @@
+You may have noticed in previous courses, that in the beginning of the file we often write somthing like #include. This tells the preprocessor to include the standart io library to your program.
diff --git a/oer/courses/c-basics/sections/17-preprocessor/03-libraries/meta b/oer/courses/c-basics/sections/17-preprocessor/03-libraries/meta
new file mode 100644
index 0000000..6fb0443
--- /dev/null
+++ b/oer/courses/c-basics/sections/17-preprocessor/03-libraries/meta
@@ -0,0 +1 @@
+{"title": "Include"}
diff --git a/oer/courses/c-basics/sections/17-preprocessor/03-libraries/program.c b/oer/courses/c-basics/sections/17-preprocessor/03-libraries/program.c
new file mode 100644
index 0000000..cc6f4d7
--- /dev/null
+++ b/oer/courses/c-basics/sections/17-preprocessor/03-libraries/program.c
@@ -0,0 +1,25 @@
+#include
+#include
+// You typicly write all of your includes in the beginning
+
+// We want to use some math function.
+// To do so we have to either write them our self or include a library.
+// Because we are lazy and don't want to spend time debugging we will include the math.h library.
+
+// TODO: Include math.h
+// Be carefull! For some libraries you have to tell the linker which libraries he has to link to your program
+// I.g in this case, because we are compiling with gcc, we need to set the -lm flag
+
+int main(int argc, const char *argv[])
+{
+ int Value = 90;
+ float SinValue = sin(Value);
+ float CosinValue = cos(Value);
+ printf("The sin of %d is %4.2f and the cosin is %4.2f.", Value, SinValue, CosinValue);
+}
+
+// On many linux-distributions you can use "man " to get information
+// If you are on linux, try using :
+// man atof
+// man printf
+// man sin
diff --git a/oer/courses/c-basics/sections/17-preprocessor/03-libraries/regex b/oer/courses/c-basics/sections/17-preprocessor/03-libraries/regex
new file mode 100644
index 0000000..7e6f8ca
--- /dev/null
+++ b/oer/courses/c-basics/sections/17-preprocessor/03-libraries/regex
@@ -0,0 +1 @@
+^The sin of 90 is 0.89 and the cosin is -0.45.$
diff --git a/oer/courses/c-basics/sections/17-preprocessor/03-libraries/type b/oer/courses/c-basics/sections/17-preprocessor/03-libraries/type
new file mode 100644
index 0000000..7d393ec
--- /dev/null
+++ b/oer/courses/c-basics/sections/17-preprocessor/03-libraries/type
@@ -0,0 +1 @@
+program/match-regex
diff --git a/oer/courses/c-basics/sections/17-preprocessor/section b/oer/courses/c-basics/sections/17-preprocessor/section
new file mode 100644
index 0000000..acceea5
--- /dev/null
+++ b/oer/courses/c-basics/sections/17-preprocessor/section
@@ -0,0 +1 @@
+{"title": "Preprocessor", "description": "Preprocessing on your source code."}
diff --git a/oer/courses/c-basics/sections/24-dynamic-memory/01-introduction/content.html b/oer/courses/c-basics/sections/24-dynamic-memory/01-introduction/content.html
new file mode 100644
index 0000000..f905c78
--- /dev/null
+++ b/oer/courses/c-basics/sections/24-dynamic-memory/01-introduction/content.html
@@ -0,0 +1,20 @@
+
+ You already learned a bit about the stack. Now it is time to take deeper look at how the stack works and what it is used for.
+
+
+ The stack handles basically anything concerning your subroutines. It provides a simple way to change to a different function and return while keeping all the local data accessible.
+
+
+ Earlier we told you, that the stack only can pop and push. This is normally true, but to achieve the calling and returning of the function, we need two more instructions. The call instruction and the ret instruction. This is all done with only two pointers into your stack memory.
+
+
+ We need to know the top of the stack. This is handled with the stack pointer. And we need to know the position of the old stack pointer, the one before we called a subroutine. That is the base pointer. Together they form the current stack frame.
+
+
+So how does calling a function work? This can vary from architecture to architecture, but there are lots of similarities. You first have to save certain registers. There are conventions for each register, if the caller or the callee has to save them. Then all the arguments for the subroutine get pushed followed by the return address. Finally the old base pointer gets pushed on the stack and the new one points to the stack pointer. Now the stack is prepared for the subroutine.
+
+
+ The stack is then used to hold all your local data or to call more functions. To return you simply move the stack pointer to the base pointer and then pop the old base pointer. Then you call ret, which
+ just changes the instruction pointer to the return address. Last but not least you have to restore the registers. If the function has a return value, you have to place it in the designated return register. On x86 platforms it is
+ the eax register.
+
diff --git a/oer/courses/c-basics/sections/24-dynamic-memory/01-introduction/meta b/oer/courses/c-basics/sections/24-dynamic-memory/01-introduction/meta
new file mode 100644
index 0000000..2892de8
--- /dev/null
+++ b/oer/courses/c-basics/sections/24-dynamic-memory/01-introduction/meta
@@ -0,0 +1 @@
+{"title": "Stack Revision"}
diff --git a/oer/courses/c-basics/sections/24-dynamic-memory/01-introduction/type b/oer/courses/c-basics/sections/24-dynamic-memory/01-introduction/type
new file mode 100644
index 0000000..be49eeb
--- /dev/null
+++ b/oer/courses/c-basics/sections/24-dynamic-memory/01-introduction/type
@@ -0,0 +1 @@
+text/html
diff --git a/oer/courses/c-basics/sections/24-dynamic-memory/02-heap/Makefile b/oer/courses/c-basics/sections/24-dynamic-memory/02-heap/Makefile
new file mode 100644
index 0000000..b5d8321
--- /dev/null
+++ b/oer/courses/c-basics/sections/24-dynamic-memory/02-heap/Makefile
@@ -0,0 +1,6 @@
+
+all:
+ gcc --std=c99 fib.c program.c -o program
+
+clean:
+ rm -f program
\ No newline at end of file
diff --git a/oer/courses/c-basics/sections/24-dynamic-memory/02-heap/content.html b/oer/courses/c-basics/sections/24-dynamic-memory/02-heap/content.html
new file mode 100644
index 0000000..04ae7d0
--- /dev/null
+++ b/oer/courses/c-basics/sections/24-dynamic-memory/02-heap/content.html
@@ -0,0 +1,20 @@
+
+ Up until now all our data has been allocated on the stack.
+ This is fine for most purposes, but limits our ability to hold memory globally, instead of local to a function.
+ When a function returns, all of its local data gets popped of the stack and can't be used later.
+ Also the stack is smaller than the heap. So even if you only need a giant block of memory in a function, you should allocate it on the heap.
+
+
+ To allocate memory on the heap, you use functions like malloc. You have to specify the size in bytes you want to allocate.
+ Because the heap doesn't know, when you don't need your data anymore, you have to free it yourself. Otherwise this memory can't be used
+ by other processes. This is commonly called a memory leak. To free the memory you call functions like free. You have to pass the pointer to
+ the memory you want to free.
+
+
+ Unfortunately the heap is slower than the stack. So if you see yourself allocating lots of stuff in a row, maybe think about allocating it in one go and
+ use pointer-arithmetic to get pointers with the right offsets.
+
+
+ In the following code we have a function that builds an array with all numbers of the Fibonacci sequence up until the n-ths one using the fib-function from earlier in
+ the course. But when you run it you will notice that something is wrong. Try to fix it.
+
diff --git a/oer/courses/c-basics/sections/24-dynamic-memory/02-heap/fib.c b/oer/courses/c-basics/sections/24-dynamic-memory/02-heap/fib.c
new file mode 100644
index 0000000..391e926
--- /dev/null
+++ b/oer/courses/c-basics/sections/24-dynamic-memory/02-heap/fib.c
@@ -0,0 +1,9 @@
+#include "fib.h"
+int fib(int n)
+{
+ if (n == 0)
+ return 0;
+ if (n == 1)
+ return 1;
+ return (fib(n - 1) + fib(n - 2));
+}
diff --git a/oer/courses/c-basics/sections/24-dynamic-memory/02-heap/fib.h b/oer/courses/c-basics/sections/24-dynamic-memory/02-heap/fib.h
new file mode 100644
index 0000000..5a3331e
--- /dev/null
+++ b/oer/courses/c-basics/sections/24-dynamic-memory/02-heap/fib.h
@@ -0,0 +1,6 @@
+#ifndef FIB_H
+#define FIB_H
+
+int fib(int n);
+
+#endif
diff --git a/oer/courses/c-basics/sections/24-dynamic-memory/02-heap/meta b/oer/courses/c-basics/sections/24-dynamic-memory/02-heap/meta
new file mode 100644
index 0000000..566eaf3
--- /dev/null
+++ b/oer/courses/c-basics/sections/24-dynamic-memory/02-heap/meta
@@ -0,0 +1 @@
+{"title": "The Heap"}
diff --git a/oer/courses/c-basics/sections/24-dynamic-memory/02-heap/program.c b/oer/courses/c-basics/sections/24-dynamic-memory/02-heap/program.c
new file mode 100644
index 0000000..ecc2f2d
--- /dev/null
+++ b/oer/courses/c-basics/sections/24-dynamic-memory/02-heap/program.c
@@ -0,0 +1,31 @@
+#include
+#include
+#include "fib.h"
+
+// TODO: Fix this function.
+int* BuildFibArray(int n)
+{
+ int Numbers[n];
+ for (int x = 0; x < n; x++) {
+ Numbers[x] = fib(x);
+ }
+ int *Array = Numbers;
+ return Array;
+}
+
+int main(int argc, const char *argv[])
+{
+ int *fibs = BuildFibArray(10);
+
+ // Doing some stuff that could overide the values we point to
+ fib(5);
+
+ printf("Fib: ");
+ for (int i = 0; i < 10; i++)
+ printf("%d, ", fibs[i]);
+ printf("\n");
+
+ // As you noticed this doesn't print out the right numbers
+ // That is because, when we return from the function, the array is no longer allocated.
+ // So the pointer points to just garbage. If we are lucky nothing did overwrite the values, but normaly thats not the case.
+}
diff --git a/oer/courses/c-basics/sections/24-dynamic-memory/02-heap/regex b/oer/courses/c-basics/sections/24-dynamic-memory/02-heap/regex
new file mode 100644
index 0000000..8c09097
--- /dev/null
+++ b/oer/courses/c-basics/sections/24-dynamic-memory/02-heap/regex
@@ -0,0 +1 @@
+^\s*Fib: 0, 1, 1, 2, 3, 5, 8, 13, 21, 34,\s*$
\ No newline at end of file
diff --git a/oer/courses/c-basics/sections/24-dynamic-memory/02-heap/type b/oer/courses/c-basics/sections/24-dynamic-memory/02-heap/type
new file mode 100644
index 0000000..7d393ec
--- /dev/null
+++ b/oer/courses/c-basics/sections/24-dynamic-memory/02-heap/type
@@ -0,0 +1 @@
+program/match-regex
diff --git a/oer/courses/c-basics/sections/24-dynamic-memory/04-concat-strings/Makefile b/oer/courses/c-basics/sections/24-dynamic-memory/04-concat-strings/Makefile
new file mode 100644
index 0000000..becf11b
--- /dev/null
+++ b/oer/courses/c-basics/sections/24-dynamic-memory/04-concat-strings/Makefile
@@ -0,0 +1,8 @@
+
+all:
+ gcc --std=c99 program.c -o program
+ gcc --std=c99 solution.c -o solution
+
+clean:
+ rm -f program
+ rm -f solution
diff --git a/oer/courses/c-basics/sections/24-dynamic-memory/04-concat-strings/content.html b/oer/courses/c-basics/sections/24-dynamic-memory/04-concat-strings/content.html
new file mode 100644
index 0000000..f6b5fd1
--- /dev/null
+++ b/oer/courses/c-basics/sections/24-dynamic-memory/04-concat-strings/content.html
@@ -0,0 +1,8 @@
+
+ Another example were you could allocate memory on the heap is the concatenation of two strings.
+ This has the advantage that you don't have to pass memory with the right size into the function.
+ The downside is, that you have to remember to free the memory when you don't need it anymore.
+
+
+ Implement the concat function with malloc.
+
diff --git a/oer/courses/c-basics/sections/24-dynamic-memory/04-concat-strings/execute.sh b/oer/courses/c-basics/sections/24-dynamic-memory/04-concat-strings/execute.sh
new file mode 100755
index 0000000..0aaad72
--- /dev/null
+++ b/oer/courses/c-basics/sections/24-dynamic-memory/04-concat-strings/execute.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+program_out=$(./program)
+echo $program_out
diff --git a/oer/courses/c-basics/sections/24-dynamic-memory/04-concat-strings/meta b/oer/courses/c-basics/sections/24-dynamic-memory/04-concat-strings/meta
new file mode 100644
index 0000000..7b59830
--- /dev/null
+++ b/oer/courses/c-basics/sections/24-dynamic-memory/04-concat-strings/meta
@@ -0,0 +1 @@
+{"title": "Example"}
diff --git a/oer/courses/c-basics/sections/24-dynamic-memory/04-concat-strings/program.c b/oer/courses/c-basics/sections/24-dynamic-memory/04-concat-strings/program.c
new file mode 100644
index 0000000..586fdd2
--- /dev/null
+++ b/oer/courses/c-basics/sections/24-dynamic-memory/04-concat-strings/program.c
@@ -0,0 +1,16 @@
+#include
+// TODO: Include the approriate headers
+char* concat(char* first, char* second)
+{
+ // TODO: allocate memory and copy both strings to it
+}
+int main(int argc, const char *argv[])
+{
+ char hello[] = "Hello";
+ char world[] = "World!";
+
+ char* out = concat(hello, world);
+ printf("%s", out);
+
+ // Don't forget to free the memory
+}
diff --git a/oer/courses/c-basics/sections/24-dynamic-memory/04-concat-strings/solution.c b/oer/courses/c-basics/sections/24-dynamic-memory/04-concat-strings/solution.c
new file mode 100644
index 0000000..4a77450
--- /dev/null
+++ b/oer/courses/c-basics/sections/24-dynamic-memory/04-concat-strings/solution.c
@@ -0,0 +1,27 @@
+#include
+// TODO: Include the approriate headers
+#include
+char* concat(char* first, char* second)
+{
+ // TODO: allocate dynamic memory and copy both strings to it
+ char* both = malloc(sizeof(char) * 13);
+ int x = 0;
+ while (first[x] != 0) {
+ both[x] = first[x];
+ x++;
+ }
+ int y = 0;
+ while (second[y] != 0) {
+ both[x + y] = second[y];
+ y++;
+ }
+ return both;
+}
+int main(int argc, const char *argv[])
+{
+ char hello[] = "Hello";
+ char world[] = "World!";
+
+ char* out = concat(hello, world);
+ printf("%s", out);
+}
diff --git a/oer/courses/c-basics/sections/24-dynamic-memory/04-concat-strings/test.sh b/oer/courses/c-basics/sections/24-dynamic-memory/04-concat-strings/test.sh
new file mode 100755
index 0000000..aae0644
--- /dev/null
+++ b/oer/courses/c-basics/sections/24-dynamic-memory/04-concat-strings/test.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+
+correct=true
+
+program_out=$(./program)
+solution_out=$(./solution)
+
+if [ "$program_out" == "$solution_out" ]
+then
+ echo "PASS " $program_out " equals " $solution_out
+else
+ echo "FAIL " $program_out " DOES NOT EQUAL " $solution_out
+ correct=false
+fi
+
+
+if [ "$correct" = true ]
+then
+ echo "PASS";
+else
+ echo "FAIL";
+fi
+
diff --git a/oer/courses/c-basics/sections/24-dynamic-memory/04-concat-strings/type b/oer/courses/c-basics/sections/24-dynamic-memory/04-concat-strings/type
new file mode 100644
index 0000000..1bb833c
--- /dev/null
+++ b/oer/courses/c-basics/sections/24-dynamic-memory/04-concat-strings/type
@@ -0,0 +1 @@
+program/scriptgrade
diff --git a/oer/courses/c-basics/sections/24-dynamic-memory/section b/oer/courses/c-basics/sections/24-dynamic-memory/section
new file mode 100644
index 0000000..a8b6224
--- /dev/null
+++ b/oer/courses/c-basics/sections/24-dynamic-memory/section
@@ -0,0 +1 @@
+{"title": "Memory", "description": "Stack vs. Heap"}
diff --git a/oer/courses/c-basics/sections/26-files/01-read/Lorem_Ipsum.txt b/oer/courses/c-basics/sections/26-files/01-read/Lorem_Ipsum.txt
new file mode 100644
index 0000000..102374b
--- /dev/null
+++ b/oer/courses/c-basics/sections/26-files/01-read/Lorem_Ipsum.txt
@@ -0,0 +1 @@
+Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
diff --git a/oer/courses/c-basics/sections/26-files/01-read/Makefile b/oer/courses/c-basics/sections/26-files/01-read/Makefile
new file mode 100644
index 0000000..b3b65da
--- /dev/null
+++ b/oer/courses/c-basics/sections/26-files/01-read/Makefile
@@ -0,0 +1,8 @@
+
+all:
+ gcc --std=c99 program.c -o program
+ gcc --std=c99 solution.c -o solution
+
+clean:
+ rm -f program
+ rm -f solution
diff --git a/oer/courses/c-basics/sections/26-files/01-read/content.html b/oer/courses/c-basics/sections/26-files/01-read/content.html
new file mode 100644
index 0000000..efb3a37
--- /dev/null
+++ b/oer/courses/c-basics/sections/26-files/01-read/content.html
@@ -0,0 +1,2 @@
+Something you almost always will have to deal with is the reading
+or writing of files to or from the hard-drive.
diff --git a/oer/courses/c-basics/sections/26-files/01-read/execute.sh b/oer/courses/c-basics/sections/26-files/01-read/execute.sh
new file mode 100755
index 0000000..0aaad72
--- /dev/null
+++ b/oer/courses/c-basics/sections/26-files/01-read/execute.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+program_out=$(./program)
+echo $program_out
diff --git a/oer/courses/c-basics/sections/26-files/01-read/meta b/oer/courses/c-basics/sections/26-files/01-read/meta
new file mode 100644
index 0000000..e9a40bf
--- /dev/null
+++ b/oer/courses/c-basics/sections/26-files/01-read/meta
@@ -0,0 +1 @@
+{"title": "Reading Files"}
diff --git a/oer/courses/c-basics/sections/26-files/01-read/program.c b/oer/courses/c-basics/sections/26-files/01-read/program.c
new file mode 100644
index 0000000..e10f009
--- /dev/null
+++ b/oer/courses/c-basics/sections/26-files/01-read/program.c
@@ -0,0 +1,37 @@
+#include
+#include
+
+int main(int argc, const char *argv[])
+{
+ // First we must open the file. we have to pass the name and our mode.
+ // we only want to read so we pass "r"
+ FILE *file = fopen("Lorem_Ipsum.txt","r");
+
+ // Check if we succeded
+ if(file)
+ {
+ // TODO: Read up on how to get the filesize and the data from the file with stdio
+ // tipp: fseek, ftell, fread ...
+
+ // TODO: Get the filesize
+ int Filesize = 0;
+
+ char *Buffer = malloc(sizeof(char)*(Filesize+1));
+ Buffer[Filesize] = 0;
+ // This is optianal but it is sometimes convenient to nullterminate your buffer
+ // If you dont want to do that you just have to allocate the exact amount
+
+ // TODO: Copy the data into the Buffer
+
+ // Now you have read the data into a buffer and you could mess with it, if you wanted to.
+ // For now were will just print it out;
+ printf("%s", Buffer);
+
+ // if you use the file the whole liftime of the program you actualy don't need to close it.
+ fclose(file);
+ }
+ else
+ {
+ // Here you could write your error handling or log the error;
+ }
+}
diff --git a/oer/courses/c-basics/sections/26-files/01-read/solution.c b/oer/courses/c-basics/sections/26-files/01-read/solution.c
new file mode 100644
index 0000000..8a67969
--- /dev/null
+++ b/oer/courses/c-basics/sections/26-files/01-read/solution.c
@@ -0,0 +1,30 @@
+#include
+#include
+
+int main(int argc, const char *argv[])
+{
+ FILE *file = fopen("Lorem_Ipsum.txt","r");
+
+ if(file)
+ {
+ fseek(file, 0 , SEEK_END);
+ int Filesize = ftell(file);
+ rewind(file);
+
+ char *Buffer = malloc(sizeof(char)*(Filesize+1));
+ Buffer[Filesize] = 0;
+
+ fread(Buffer, 1, Filesize, file);
+
+ // Now you have read the data into a buffer and you could mess with it, if you wanted to.
+ // For now were will just print it out;
+ printf("%s", Buffer);
+
+ // if you use the file the whole liftime of the program you actualy don't need to close it.
+ fclose(file);
+ }
+ else
+ {
+ // Here you could write your error handling or log the error;
+ }
+}
diff --git a/oer/courses/c-basics/sections/26-files/01-read/test.sh b/oer/courses/c-basics/sections/26-files/01-read/test.sh
new file mode 100755
index 0000000..aae0644
--- /dev/null
+++ b/oer/courses/c-basics/sections/26-files/01-read/test.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+
+correct=true
+
+program_out=$(./program)
+solution_out=$(./solution)
+
+if [ "$program_out" == "$solution_out" ]
+then
+ echo "PASS " $program_out " equals " $solution_out
+else
+ echo "FAIL " $program_out " DOES NOT EQUAL " $solution_out
+ correct=false
+fi
+
+
+if [ "$correct" = true ]
+then
+ echo "PASS";
+else
+ echo "FAIL";
+fi
+
diff --git a/oer/courses/c-basics/sections/26-files/01-read/type b/oer/courses/c-basics/sections/26-files/01-read/type
new file mode 100644
index 0000000..1bb833c
--- /dev/null
+++ b/oer/courses/c-basics/sections/26-files/01-read/type
@@ -0,0 +1 @@
+program/scriptgrade
diff --git a/oer/courses/c-basics/sections/26-files/02-write/Makefile b/oer/courses/c-basics/sections/26-files/02-write/Makefile
new file mode 100644
index 0000000..b9a49c2
--- /dev/null
+++ b/oer/courses/c-basics/sections/26-files/02-write/Makefile
@@ -0,0 +1,7 @@
+all:
+ gcc --std=c99 program.c -o program
+ gcc --std=c99 solution.c -o solution
+
+clean:
+ rm -f program
+ rm -f solution
diff --git a/oer/courses/c-basics/sections/26-files/02-write/content.html b/oer/courses/c-basics/sections/26-files/02-write/content.html
new file mode 100644
index 0000000..b6990fd
--- /dev/null
+++ b/oer/courses/c-basics/sections/26-files/02-write/content.html
@@ -0,0 +1,4 @@
+Sometimes you don't only want your programs to just diplay some
+stuff on the screen or some text in a console. You want them to
+manipulate data and store it somewhere. This is what we are doing
+now.
diff --git a/oer/courses/c-basics/sections/26-files/02-write/execute.sh b/oer/courses/c-basics/sections/26-files/02-write/execute.sh
new file mode 100755
index 0000000..ef209cf
--- /dev/null
+++ b/oer/courses/c-basics/sections/26-files/02-write/execute.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+./program This is a Test.
+cat output.txt
+
diff --git a/oer/courses/c-basics/sections/26-files/02-write/meta b/oer/courses/c-basics/sections/26-files/02-write/meta
new file mode 100644
index 0000000..55823a0
--- /dev/null
+++ b/oer/courses/c-basics/sections/26-files/02-write/meta
@@ -0,0 +1 @@
+{"title": "Writing Files"}
diff --git a/oer/courses/c-basics/sections/26-files/02-write/program.c b/oer/courses/c-basics/sections/26-files/02-write/program.c
new file mode 100644
index 0000000..054932c
--- /dev/null
+++ b/oer/courses/c-basics/sections/26-files/02-write/program.c
@@ -0,0 +1,20 @@
+#include
+#include
+
+// This time we make a simple program, which just writes its arguments into a file
+int main(int argc, char *argv[])
+{
+ // TODO: read up on all the modes and choose the one, that creates a new file and dicards the old one.
+ FILE *file = fopen("output.txt", "");
+
+ if(file)
+ {
+ for(int Index = 0; Index < argc; Index++)
+ {
+ char *CurrentString = argv[Index];
+ // TODO: print the string into the file. Each one in a new line
+ // TIP: fprintf
+ }
+ fclose(file);
+ }
+}
diff --git a/oer/courses/c-basics/sections/26-files/02-write/solution.c b/oer/courses/c-basics/sections/26-files/02-write/solution.c
new file mode 100644
index 0000000..a98b519
--- /dev/null
+++ b/oer/courses/c-basics/sections/26-files/02-write/solution.c
@@ -0,0 +1,18 @@
+#include
+#include
+
+// This time we make a simple program, which just writes its arguments into a file
+int main(int argc, char *argv[])
+{
+ FILE *file = fopen("output.txt", "w");
+
+ if(file)
+ {
+ for(int Index = 1; Index < argc; Index++)
+ {
+ char *CurrentString = argv[Index];
+ fprintf(file, "%s ",CurrentString);
+ }
+ fclose(file);
+ }
+}
diff --git a/oer/courses/c-basics/sections/26-files/02-write/test.sh b/oer/courses/c-basics/sections/26-files/02-write/test.sh
new file mode 100755
index 0000000..68af8d6
--- /dev/null
+++ b/oer/courses/c-basics/sections/26-files/02-write/test.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+correct=true
+
+./program This is a test
+program_out=$(cat output.txt)
+./solution This is a test
+solution_out=$(cat output.txt)
+
+if [ "$program_out" == "$solution_out" ]
+then
+ echo "PASS " $program_out " equals " $solution_out
+else
+ echo "FAIL " $program_out " DOES NOT EQUAL " $solution_out
+ correct=false
+fi
+
+
+if [ "$correct" = true ]
+then
+ echo "PASS";
+else
+ echo "FAIL";
+fi
+
diff --git a/oer/courses/c-basics/sections/26-files/02-write/type b/oer/courses/c-basics/sections/26-files/02-write/type
new file mode 100644
index 0000000..1bb833c
--- /dev/null
+++ b/oer/courses/c-basics/sections/26-files/02-write/type
@@ -0,0 +1 @@
+program/scriptgrade
diff --git a/oer/courses/c-basics/sections/26-files/section b/oer/courses/c-basics/sections/26-files/section
new file mode 100644
index 0000000..215f62a
--- /dev/null
+++ b/oer/courses/c-basics/sections/26-files/section
@@ -0,0 +1 @@
+{"title": "Files", "description": "Learn how to handle files in c."}
diff --git a/oer/courses/c-mpi/meta b/oer/courses/c-mpi/meta
new file mode 100644
index 0000000..30d5a51
--- /dev/null
+++ b/oer/courses/c-mpi/meta
@@ -0,0 +1 @@
+{"title": "MPI: Message Passing Interface", "description": "A quick introduction to MPI. A basic understanding of C is a requirment for this course."}
diff --git a/oer/courses/c-mpi/sections/01-introduction/01-c-hello/Makefile b/oer/courses/c-mpi/sections/01-introduction/01-c-hello/Makefile
new file mode 100644
index 0000000..cc4fe35
--- /dev/null
+++ b/oer/courses/c-mpi/sections/01-introduction/01-c-hello/Makefile
@@ -0,0 +1,5 @@
+
+all:
+ mpicc -lrt --std=c99 program.c -o program
+clean:
+ rm -f program
diff --git a/oer/courses/c-mpi/sections/01-introduction/01-c-hello/content.html b/oer/courses/c-mpi/sections/01-introduction/01-c-hello/content.html
new file mode 100644
index 0000000..722e2ba
--- /dev/null
+++ b/oer/courses/c-mpi/sections/01-introduction/01-c-hello/content.html
@@ -0,0 +1,5 @@
+MPI is a parallelization framework for use on multiple machines and processors.
+
+For this first exercise, we will send a single integer from one process to the other.
+
+
diff --git a/oer/courses/c-mpi/sections/01-introduction/01-c-hello/job.slurm b/oer/courses/c-mpi/sections/01-introduction/01-c-hello/job.slurm
new file mode 100644
index 0000000..07240f1
--- /dev/null
+++ b/oer/courses/c-mpi/sections/01-introduction/01-c-hello/job.slurm
@@ -0,0 +1,3 @@
+#!/bin/sh
+#SBATCH -N 2
+mpiexec program
diff --git a/oer/courses/c-mpi/sections/01-introduction/01-c-hello/meta b/oer/courses/c-mpi/sections/01-introduction/01-c-hello/meta
new file mode 100644
index 0000000..210a30b
--- /dev/null
+++ b/oer/courses/c-mpi/sections/01-introduction/01-c-hello/meta
@@ -0,0 +1 @@
+{"title": "Hello World!"}
diff --git a/oer/courses/c-mpi/sections/01-introduction/01-c-hello/program.c b/oer/courses/c-mpi/sections/01-introduction/01-c-hello/program.c
new file mode 100644
index 0000000..97532e1
--- /dev/null
+++ b/oer/courses/c-mpi/sections/01-introduction/01-c-hello/program.c
@@ -0,0 +1,21 @@
+#include
+#include
+#include
+#include
+int main(int argc, char *argv[])
+{
+ int rank;
+ MPI_Init(&argc, &argv);
+ MPI_Comm_rank(MPI_COMM_WORLD, &rank);
+ if (rank == 0) {
+ srand(2);
+ int random = rand();
+ MPI_Send(&random, 1, MPI_INT, 1, 0, MPI_COMM_WORLD);
+ printf("rank 0 random: %d \t", random);
+ } else if (rank == 1) {
+ int random;
+ // Recieve data from rank 0 here:
+ printf("rank 1, random: %d", random);
+ }
+ MPI_Finalize();
+}
diff --git a/oer/courses/c-mpi/sections/01-introduction/01-c-hello/regex b/oer/courses/c-mpi/sections/01-introduction/01-c-hello/regex
new file mode 100644
index 0000000..ed41b84
--- /dev/null
+++ b/oer/courses/c-mpi/sections/01-introduction/01-c-hello/regex
@@ -0,0 +1 @@
+rank\s\d\srandom:\s(\d*).*\1$
diff --git a/oer/courses/c-mpi/sections/01-introduction/01-c-hello/solution.c b/oer/courses/c-mpi/sections/01-introduction/01-c-hello/solution.c
new file mode 100644
index 0000000..d87e78d
--- /dev/null
+++ b/oer/courses/c-mpi/sections/01-introduction/01-c-hello/solution.c
@@ -0,0 +1,21 @@
+#include
+#include
+#include
+#include
+int main(int argc, char *argv[])
+{
+ int rank;
+ MPI_Init(&argc, &argv);
+ MPI_Comm_rank(MPI_COMM_WORLD, &rank);
+ if (rank == 0) {
+ srand(2);
+ int random = rand();
+ MPI_Send(&random, 1, MPI_INT, 1, 0, MPI_COMM_WORLD);
+ printf("rank 0 random: %d \t", random);
+ } else if (rank == 1) {
+ int random;
+ MPI_Recv(&random, 1, MPI_INT, 0, 0, MPI_COMM_WORLD, MPI_STATUS_IGNORE);
+ printf("rank 1, random: %d", random);
+ }
+ MPI_Finalize();
+}
diff --git a/oer/courses/c-mpi/sections/01-introduction/01-c-hello/type b/oer/courses/c-mpi/sections/01-introduction/01-c-hello/type
new file mode 100644
index 0000000..1960383
--- /dev/null
+++ b/oer/courses/c-mpi/sections/01-introduction/01-c-hello/type
@@ -0,0 +1 @@
+program/match-regex-parallel
diff --git a/oer/courses/c-mpi/sections/01-introduction/02-bcast/Makefile b/oer/courses/c-mpi/sections/01-introduction/02-bcast/Makefile
new file mode 100644
index 0000000..cc4fe35
--- /dev/null
+++ b/oer/courses/c-mpi/sections/01-introduction/02-bcast/Makefile
@@ -0,0 +1,5 @@
+
+all:
+ mpicc -lrt --std=c99 program.c -o program
+clean:
+ rm -f program
diff --git a/oer/courses/c-mpi/sections/01-introduction/02-bcast/content.html b/oer/courses/c-mpi/sections/01-introduction/02-bcast/content.html
new file mode 100644
index 0000000..c9233ca
--- /dev/null
+++ b/oer/courses/c-mpi/sections/01-introduction/02-bcast/content.html
@@ -0,0 +1 @@
+We have sucessfully sent a single value from one process to another, now we will brodcast the value to all other processes instead.
diff --git a/oer/courses/c-mpi/sections/01-introduction/02-bcast/job.slurm b/oer/courses/c-mpi/sections/01-introduction/02-bcast/job.slurm
new file mode 100644
index 0000000..0d617e3
--- /dev/null
+++ b/oer/courses/c-mpi/sections/01-introduction/02-bcast/job.slurm
@@ -0,0 +1,3 @@
+#!/bin/sh
+#SBATCH -n 4
+mpiexec program
diff --git a/oer/courses/c-mpi/sections/01-introduction/02-bcast/meta b/oer/courses/c-mpi/sections/01-introduction/02-bcast/meta
new file mode 100644
index 0000000..210a30b
--- /dev/null
+++ b/oer/courses/c-mpi/sections/01-introduction/02-bcast/meta
@@ -0,0 +1 @@
+{"title": "Hello World!"}
diff --git a/oer/courses/c-mpi/sections/01-introduction/02-bcast/program.c b/oer/courses/c-mpi/sections/01-introduction/02-bcast/program.c
new file mode 100644
index 0000000..63e1310
--- /dev/null
+++ b/oer/courses/c-mpi/sections/01-introduction/02-bcast/program.c
@@ -0,0 +1,19 @@
+#include
+#include
+#include
+#include
+int main(int argc, char *argv[])
+{
+ int rank;
+ MPI_Init(&argc, &argv);
+ MPI_Comm_rank(MPI_COMM_WORLD, &rank);
+ int random;
+ if (rank == 0) {
+ srand(2);
+ random = rand();
+ }
+ // Add the broadcast directive below:
+
+ printf("rank %d, random: %d\n", rank, random);
+ MPI_Finalize();
+}
diff --git a/oer/courses/c-mpi/sections/01-introduction/02-bcast/regex b/oer/courses/c-mpi/sections/01-introduction/02-bcast/regex
new file mode 100644
index 0000000..11d91f9
--- /dev/null
+++ b/oer/courses/c-mpi/sections/01-introduction/02-bcast/regex
@@ -0,0 +1 @@
+.*random:\s(\d{2,})\n.*\1\n.*\1.*\n.*\1
diff --git a/oer/courses/c-mpi/sections/01-introduction/02-bcast/solution.c b/oer/courses/c-mpi/sections/01-introduction/02-bcast/solution.c
new file mode 100644
index 0000000..26680c2
--- /dev/null
+++ b/oer/courses/c-mpi/sections/01-introduction/02-bcast/solution.c
@@ -0,0 +1,18 @@
+#include
+#include
+#include
+#include
+int main(int argc, char *argv[])
+{
+ int rank;
+ MPI_Init(&argc, &argv);
+ MPI_Comm_rank(MPI_COMM_WORLD, &rank);
+ int random;
+ if (rank == 0) {
+ srand(2);
+ random = rand();
+ }
+ MPI_Bcast(&random, 1, MPI_INT, 0, MPI_COMM_WORLD);
+ printf("rank %d, random: %d\n", rank, random);
+ MPI_Finalize();
+}
diff --git a/oer/courses/c-mpi/sections/01-introduction/02-bcast/type b/oer/courses/c-mpi/sections/01-introduction/02-bcast/type
new file mode 100644
index 0000000..1960383
--- /dev/null
+++ b/oer/courses/c-mpi/sections/01-introduction/02-bcast/type
@@ -0,0 +1 @@
+program/match-regex-parallel
diff --git a/oer/courses/c-mpi/sections/01-introduction/section b/oer/courses/c-mpi/sections/01-introduction/section
new file mode 100644
index 0000000..bab5de8
--- /dev/null
+++ b/oer/courses/c-mpi/sections/01-introduction/section
@@ -0,0 +1 @@
+{"title": "Introduction", "description": "The very basics."}
diff --git a/oer/courses/c-newcomers/meta b/oer/courses/c-newcomers/meta
new file mode 100644
index 0000000..48d7c46
--- /dev/null
+++ b/oer/courses/c-newcomers/meta
@@ -0,0 +1 @@
+{"title": "C for Newcomers", "description": "An introductory course covering concepts of the programming language C and computer science. It is intended for people, who have little background in computer science."}
diff --git a/oer/courses/c-newcomers/sections/01-introduction/00-welcome/content.md b/oer/courses/c-newcomers/sections/01-introduction/00-welcome/content.md
new file mode 100644
index 0000000..5756de8
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/01-introduction/00-welcome/content.md
@@ -0,0 +1,23 @@
+Welcome to the introductory course for the programming language C.
+This course will show you the basic concepts of programming with more
+or less practical examples, while not going to deep into the technical jargon.
+
+Programming is a usefull skill to automate all sorts of task, like evaluating data or controlling a system.
+You can also write tools -- small or complex, to help you in your daily tasks or write fun stuff like games.
+The more experience you have, the more incredible things you can program.
+
+At the end of this course, you should be able to write small programs, do some basic calculations and even program a virtual lift!
+
+So have some **fun** and don't be afraid to poke around.
+
+## Description of the online learning platform
+
+Before we start, we briefly describe this online learning platform.
+This course is divided into topic related **sections** containing each several related **exercises**.
+
+In each exercise, we provide some introductory description, potentially with some external links for further reference and the actual **task** to perform.
+
+Press the *continue* button, to finish the current exercise in the section and proceed.
+Alternatively, you may use the navigation bars on the left to navigate the **sections** and on the top to navigate the contained **exercises**.
+
+Now press *continue*.
diff --git a/oer/courses/c-newcomers/sections/01-introduction/00-welcome/meta b/oer/courses/c-newcomers/sections/01-introduction/00-welcome/meta
new file mode 100644
index 0000000..b75c1c1
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/01-introduction/00-welcome/meta
@@ -0,0 +1 @@
+{"title": "Introduction"}
diff --git a/oer/courses/c-newcomers/sections/01-introduction/00-welcome/type b/oer/courses/c-newcomers/sections/01-introduction/00-welcome/type
new file mode 100644
index 0000000..be49eeb
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/01-introduction/00-welcome/type
@@ -0,0 +1 @@
+text/html
diff --git a/oer/courses/c-newcomers/sections/01-introduction/01-programming/Makefile b/oer/courses/c-newcomers/sections/01-introduction/01-programming/Makefile
new file mode 100644
index 0000000..82883ac
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/01-introduction/01-programming/Makefile
@@ -0,0 +1,8 @@
+
+all:
+ gcc program.c -o program
+ #gcc solution.c -o solution
+
+clean:
+ rm -f program
+ rm -f solution
diff --git a/oer/courses/c-newcomers/sections/01-introduction/01-programming/content.md b/oer/courses/c-newcomers/sections/01-introduction/01-programming/content.md
new file mode 100644
index 0000000..a313a26
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/01-introduction/01-programming/content.md
@@ -0,0 +1,31 @@
+The first thing you probably want to know is: What is programming?
+A program tells the computer what to do.
+It is like writing a recipe:
+You give the computer instructions to follow and the computer
+just executes them in order to get the result.
+_Remember_: The computer doesn't know what you try to achieve. It just does, what you tell him.
+
+## Description of the online learning platform (2)
+
+Below this text you see a text editor. The editor contains the program, i.e., the code to execute by the computer. In each exercise, we provide a basic skeleton for you to change and play with.
+Now it contains your very first program.
+
+Below the editor are three buttons, **Execute** will tell the system to run your instructions and will output the results below.
+**Submit results** tells the system to check if your program is correct.
+Once the results were submitted correctly, you can press the **Continue** button.
+
+## Knowledge
+
+The source code is just some special text, which will get translated into executable code.
+The line **int main()** in Line 3 tells the PC where your program starts.
+Everything between the curly braces between Line 5 and 6 will be executed.
+Everything behind two slashes "//" is a comment and will be ignored by the computer.
+Thus, Line 5 will not cause any action by the computer.
+
+## Task
+
+For now the only instruction that will be executed is the line **printf("Hello NAME");**
+This is a instruction to write the text between the quotes to the console, here "Hello Name".
+Use the execute button to execute the code, do you see the output?
+Then try the submit solution button to check the result: The provided code must be changed to be correct.
+Change the program, such that it will display instead of NAME your actual name to greet you properly.
diff --git a/oer/courses/c-newcomers/sections/01-introduction/01-programming/meta b/oer/courses/c-newcomers/sections/01-introduction/01-programming/meta
new file mode 100644
index 0000000..34f304e
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/01-introduction/01-programming/meta
@@ -0,0 +1 @@
+{"title": "Your first Program"}
diff --git a/oer/courses/c-newcomers/sections/01-introduction/01-programming/program.c b/oer/courses/c-newcomers/sections/01-introduction/01-programming/program.c
new file mode 100644
index 0000000..0238303
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/01-introduction/01-programming/program.c
@@ -0,0 +1,7 @@
+#include //This is just a way to load in some functionality
+
+int main() // defines the start of your program
+{
+ // printf writes the text in quotes to the console
+ printf("Hello NAME"); // TODO change the text
+}
diff --git a/oer/courses/c-newcomers/sections/01-introduction/01-programming/regex b/oer/courses/c-newcomers/sections/01-introduction/01-programming/regex
new file mode 100644
index 0000000..a6f7a8d
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/01-introduction/01-programming/regex
@@ -0,0 +1 @@
+^Hello .*(?
+
+int main()
+{
+ printf("My BMI is %f", 0.0); // TODO: Replace the 0.0 with the calculation of your BMI
+}
diff --git a/oer/courses/c-newcomers/sections/01-introduction/02-bmi/regex b/oer/courses/c-newcomers/sections/01-introduction/02-bmi/regex
new file mode 100644
index 0000000..f25e9c1
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/01-introduction/02-bmi/regex
@@ -0,0 +1 @@
+^My BMI is [1-9][0-9]*\.[0-9]*\s*$
diff --git a/oer/courses/c-newcomers/sections/01-introduction/02-bmi/type b/oer/courses/c-newcomers/sections/01-introduction/02-bmi/type
new file mode 100644
index 0000000..7d393ec
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/01-introduction/02-bmi/type
@@ -0,0 +1 @@
+program/match-regex
diff --git a/oer/courses/c-newcomers/sections/01-introduction/03-variables/Makefile b/oer/courses/c-newcomers/sections/01-introduction/03-variables/Makefile
new file mode 100644
index 0000000..1f05f47
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/01-introduction/03-variables/Makefile
@@ -0,0 +1,4 @@
+all:
+ gcc program.c -o program
+clean:
+ rm -f program
diff --git a/oer/courses/c-newcomers/sections/01-introduction/03-variables/content.md b/oer/courses/c-newcomers/sections/01-introduction/03-variables/content.md
new file mode 100644
index 0000000..67b9cb6
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/01-introduction/03-variables/content.md
@@ -0,0 +1,32 @@
+As you could see, it is pretty simple to print out some basic calculations.
+But sometimes you want do more complicated ones.
+Then it is a good idea to save parts of the calculations in so called **variables**.
+
+## Knowledge
+
+Variables are like drawers, where you can store and label your solutions, but also update and replace them.
+You then can use the name of the **variable** just like a number,
+but it holds the data of what you have put into it before.
+
+To declare these variables you first write the type, e.g.,
+**float** for decimals and **int** for whole numbers, then the name of the variable.
+This is needed that the computer can understand the program.
+To assign a value to a variable, you write equals and then the value or mathematical expression it should compute before it assigns the data.
+
+A very simple example is:
+```
+float x = 4.0;
+float y = 3.0;
+float result = x * y + 3.0;
+```
+
+You can also declare first what the variable is and then change it's value:
+```
+float x;
+x = 3.0; // now the value is 3.0
+x = 4.0; // now the value of x is 4.0
+```
+
+## Task
+
+Your task is to rewrite the program to compute the BMI to use variables with height and weight.
diff --git a/oer/courses/c-newcomers/sections/01-introduction/03-variables/meta b/oer/courses/c-newcomers/sections/01-introduction/03-variables/meta
new file mode 100644
index 0000000..164f77a
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/01-introduction/03-variables/meta
@@ -0,0 +1 @@
+{"title": "BMI - Variables"}
diff --git a/oer/courses/c-newcomers/sections/01-introduction/03-variables/program.c b/oer/courses/c-newcomers/sections/01-introduction/03-variables/program.c
new file mode 100644
index 0000000..4393a1c
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/01-introduction/03-variables/program.c
@@ -0,0 +1,12 @@
+#include
+
+int main()
+{
+ // TODO: Fill in those Variables
+ float Weight = 0;
+ float Height = 0;
+ // TODO: use the variables Weight and Height to calculate the BMI and save it in a new variable
+ float bmi = 0; // add here the way how to compute the BMI
+
+ printf("My BMI is %f", 0); // TODO: replace the 0 with the variable, which holds the BMI
+}
diff --git a/oer/courses/c-newcomers/sections/01-introduction/03-variables/regex b/oer/courses/c-newcomers/sections/01-introduction/03-variables/regex
new file mode 100644
index 0000000..f25e9c1
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/01-introduction/03-variables/regex
@@ -0,0 +1 @@
+^My BMI is [1-9][0-9]*\.[0-9]*\s*$
diff --git a/oer/courses/c-newcomers/sections/01-introduction/03-variables/type b/oer/courses/c-newcomers/sections/01-introduction/03-variables/type
new file mode 100644
index 0000000..7d393ec
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/01-introduction/03-variables/type
@@ -0,0 +1 @@
+program/match-regex
diff --git a/oer/courses/c-newcomers/sections/01-introduction/section b/oer/courses/c-newcomers/sections/01-introduction/section
new file mode 100644
index 0000000..5437a09
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/01-introduction/section
@@ -0,0 +1 @@
+{"title": "Introduction", "description": "Writing Text to the Console"}
diff --git a/oer/courses/c-newcomers/sections/02-dice/01-dice/Makefile b/oer/courses/c-newcomers/sections/02-dice/01-dice/Makefile
new file mode 100644
index 0000000..1f05f47
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/02-dice/01-dice/Makefile
@@ -0,0 +1,4 @@
+all:
+ gcc program.c -o program
+clean:
+ rm -f program
diff --git a/oer/courses/c-newcomers/sections/02-dice/01-dice/content.md b/oer/courses/c-newcomers/sections/02-dice/01-dice/content.md
new file mode 100644
index 0000000..33b4241
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/02-dice/01-dice/content.md
@@ -0,0 +1,21 @@
+We now move away from normal math calculations and move to the topic of random numbers.
+Your task will be, to code a program, that rolls a dice and prints out the number.
+
+## Knowledge
+
+For that we need to include new functionality. To do that, we need to write: ``#include ;``.
+In there are among other instructions **srand** and **rand**.
+To call these instructions you have to put open and closed parentheses behind them.
+
+Because computers cannot create real random numbers but instead fake randomness with complex functions, we need to set a starting point for our **random number generator**, a so called seed that changes every time we call the program.
+To do that we use the ``srand()`` instruction, which sets the seed of the random number generator. The only problem is, every time we run the program we would end up with the same result.
+To avoid this we will also include the instruction time with ``#include `` to get the current time and pass that as the seed.
+
+We then can use ``rand()`` to get a random number. Because we only want numbers between 1 and 6, we have to use the modulo-operator %.
+Don't worry, if you are not familiar with the math-concept of modulo. It just gives you the remainder of a whole number division.
+So any number modulo 25 will give you a number between 0 and 24.
+
+## Task
+
+So that is all you need to know about random numbers. Now try to implement the dice program.
+
diff --git a/oer/courses/c-newcomers/sections/02-dice/01-dice/execute.sh b/oer/courses/c-newcomers/sections/02-dice/01-dice/execute.sh
new file mode 100755
index 0000000..185c136
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/02-dice/01-dice/execute.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+./program
diff --git a/oer/courses/c-newcomers/sections/02-dice/01-dice/meta b/oer/courses/c-newcomers/sections/02-dice/01-dice/meta
new file mode 100644
index 0000000..5444976
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/02-dice/01-dice/meta
@@ -0,0 +1 @@
+{"title": "Roll a dice"}
diff --git a/oer/courses/c-newcomers/sections/02-dice/01-dice/program.c b/oer/courses/c-newcomers/sections/02-dice/01-dice/program.c
new file mode 100644
index 0000000..e527cda
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/02-dice/01-dice/program.c
@@ -0,0 +1,15 @@
+#include // printf
+#include // rand and srand
+#include // time
+
+int main()
+{
+ srand(time(0)); // seeding the random number generator with the current time
+
+ // TODO: add some computation to restrict Number to 1-6
+ // Because a dice has only whole numbers, we use int
+ int Number = rand();
+
+
+ printf("You rolled a %d", Number);
+}
diff --git a/oer/courses/c-newcomers/sections/02-dice/01-dice/test.sh b/oer/courses/c-newcomers/sections/02-dice/01-dice/test.sh
new file mode 100755
index 0000000..5f724ea
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/02-dice/01-dice/test.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+pass=true
+out=""
+regex='^You rolled a [1-6]$'
+
+# figure out a way to make this more reliable
+for i in {1..1}
+do
+ sleep .15
+ program_out=$(./program)
+ if [[ "$program_out" =~ $regex ]]
+ then
+ out="$out\nPASS $program_out"
+ else
+ pass=false
+ out="$out\nFAIL $program_out"
+ fi
+done
+if("$pass" = true)
+then
+ echo PASS
+else
+ echo FAIL
+fi
+echo ""
+echo -e $out
diff --git a/oer/courses/c-newcomers/sections/02-dice/01-dice/type b/oer/courses/c-newcomers/sections/02-dice/01-dice/type
new file mode 100644
index 0000000..1bb833c
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/02-dice/01-dice/type
@@ -0,0 +1 @@
+program/scriptgrade
diff --git a/oer/courses/c-newcomers/sections/02-dice/02-2-dice/Makefile b/oer/courses/c-newcomers/sections/02-dice/02-2-dice/Makefile
new file mode 100644
index 0000000..1f05f47
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/02-dice/02-2-dice/Makefile
@@ -0,0 +1,4 @@
+all:
+ gcc program.c -o program
+clean:
+ rm -f program
diff --git a/oer/courses/c-newcomers/sections/02-dice/02-2-dice/content.md b/oer/courses/c-newcomers/sections/02-dice/02-2-dice/content.md
new file mode 100644
index 0000000..93fbdab
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/02-dice/02-2-dice/content.md
@@ -0,0 +1,26 @@
+Rolling one dice isn't that exiting. Every side has the same chance. Now we want to roll two dice at the same time without writing the same code all over.
+To do that, we use **functions**.
+
+## Knowledge
+
+Functions are like subprograms, which you can call. They look just like our main program.
+You actually called functions before. Remember those more complex instructions like ``printf`` and ``rand``.
+They were all functions.
+
+The first thing you have to write, is the **return type**. The return type tells the computer, what kind of value you function calculates and returns.
+For our dice example this would be an **int**. There are also functions which return nothing. In that case the return type is **void**.
+
+Next comes the name. You can name your functions any name you like with a few restrictions.
+After the name you write the **arguments** in parentheses. They also have a type and a name. The dice function doesn't need any arguments.
+Between the curly braces comes your code. In the end you have to write **return** and behind that the value your function calculated.
+
+Here is an example of a simple add function:
+
+ int add(int a, int b)
+ {
+ return a+b;
+ }
+
+## Task
+
+Your task is to implement the die function and call twice to simulate the rolling of two dice.
diff --git a/oer/courses/c-newcomers/sections/02-dice/02-2-dice/execute.sh b/oer/courses/c-newcomers/sections/02-dice/02-2-dice/execute.sh
new file mode 100755
index 0000000..185c136
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/02-dice/02-2-dice/execute.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+./program
diff --git a/oer/courses/c-newcomers/sections/02-dice/02-2-dice/meta b/oer/courses/c-newcomers/sections/02-dice/02-2-dice/meta
new file mode 100644
index 0000000..be8ae2e
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/02-dice/02-2-dice/meta
@@ -0,0 +1 @@
+{"title": "Roll two dice"}
diff --git a/oer/courses/c-newcomers/sections/02-dice/02-2-dice/program.c b/oer/courses/c-newcomers/sections/02-dice/02-2-dice/program.c
new file mode 100644
index 0000000..c5923a8
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/02-dice/02-2-dice/program.c
@@ -0,0 +1,15 @@
+#include // printf
+#include // rand and srand
+#include // time
+
+//TODO: Write the dice function here
+
+int main()
+{
+ srand(time(0)); // you only have to set up your seed once
+
+ int Number = (rand()%6)+1;
+
+ // call the dice function and don't forget to add them together
+ printf("You rolled a %d",Number);
+}
diff --git a/oer/courses/c-newcomers/sections/02-dice/02-2-dice/test.sh b/oer/courses/c-newcomers/sections/02-dice/02-2-dice/test.sh
new file mode 100755
index 0000000..dda7e00
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/02-dice/02-2-dice/test.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+pass=true
+out=""
+regex='^You rolled a (1[0-2]|[1-9])$'
+
+# figure out a way to test this more reliable
+for i in {1..1}
+do
+ sleep .15
+ program_out=$(./program)
+ if [[ "$program_out" =~ $regex ]]
+ then
+ out="$out\nPASS $program_out"
+ else
+ pass=false
+ out="$out\nFAIL $program_out"
+ fi
+done
+if("$pass" = true)
+then
+ echo PASS
+else
+ echo FAIL
+fi
+echo ""
+echo -e $out
diff --git a/oer/courses/c-newcomers/sections/02-dice/02-2-dice/type b/oer/courses/c-newcomers/sections/02-dice/02-2-dice/type
new file mode 100644
index 0000000..1bb833c
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/02-dice/02-2-dice/type
@@ -0,0 +1 @@
+program/scriptgrade
diff --git a/oer/courses/c-newcomers/sections/02-dice/03-multible-rolls/Makefile b/oer/courses/c-newcomers/sections/02-dice/03-multible-rolls/Makefile
new file mode 100644
index 0000000..1f05f47
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/02-dice/03-multible-rolls/Makefile
@@ -0,0 +1,4 @@
+all:
+ gcc program.c -o program
+clean:
+ rm -f program
diff --git a/oer/courses/c-newcomers/sections/02-dice/03-multible-rolls/content.md b/oer/courses/c-newcomers/sections/02-dice/03-multible-rolls/content.md
new file mode 100644
index 0000000..9b644a5
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/02-dice/03-multible-rolls/content.md
@@ -0,0 +1,54 @@
+
+
+Now, that you can roll two dice at the same time, let's try to do some statistics.
+For that we need a way do something multiple times. In programming these constructs
+are called loops.
+
+## Knowledge
+
+Loops may seem to have a convoluted syntax, but once you got it, it is straightforward.
+First comes the keyword for, followed by open and closed parentheses. Then you set up your counter variable,
+the condition, under which you stay in the loop and the instruction, which gets executed at the end, between the parentheses.
+
+
+
+
+ Definition of the for-loop
+
for(initialization; condition; increment/decrement)
+{
+ // Looped code
+}
+
+
+
+
+
+ Here is an example of a loop with 10 iterations:
+
for(int i = 0; i < 10; i=i+1)
+{
+ printf("We are in the %d. iteration", i+1);
+}
+
+
+
+
+ | Operator |
+ Meaning |
+
+
+ | == |
+ True, when both sides are equal |
+
+
+ | != |
+ True, when both side are not equal |
+
+
+ | < |
+ True, when left is less than right |
+
+
+ | > |
+ True, when left is bigger than right |
+
+
+ | <= |
+ True, when left is less than or equal to the right |
+
+
+ | >= |
+ True, when left is bigger or equal to the right |
+
+
+ | && |
+ Only true, if both conditions are true |
+
+
+ | || |
+ True, when one condition is true |
+
+
+ | ! |
+ negates the condition |
+
+
+
+## Model
+
+ Our model now has a top floor, which is safed in the conveniently named variable ``TopFloor``.
+ To represent that in the code you need to add a check if we already reached the top and react accordingly.
+
+## Task
+
+ Your task is to check if the lift reached the top floor and change the direction to downwards.
diff --git a/oer/courses/c-newcomers/sections/03-lift/03-smaller-building/meta b/oer/courses/c-newcomers/sections/03-lift/03-smaller-building/meta
new file mode 100644
index 0000000..bafeec8
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/03-lift/03-smaller-building/meta
@@ -0,0 +1 @@
+{"title": "Limited Height"}
diff --git a/oer/courses/c-newcomers/sections/03-lift/03-smaller-building/program.c b/oer/courses/c-newcomers/sections/03-lift/03-smaller-building/program.c
new file mode 100644
index 0000000..5019e62
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/03-lift/03-smaller-building/program.c
@@ -0,0 +1,26 @@
+#include
+#include //provides a boolean datatype bool to save the values true or false
+
+int main()
+{
+ int CurrentFloor = 0;
+ int TopFloor = 10;
+
+ bool GoingUp = true;
+
+ for(int Timestep = 0; Timestep < 15; Timestep++)
+ {
+ printf("I'm currently at floor %d\n", CurrentFloor);
+ if(GoingUp)
+ {
+ CurrentFloor++;
+ }
+ else
+ {
+ CurrentFloor--;
+ }
+
+ // TODO: check if we reached the top floor and set the GoingUp variable to the appropiate value
+ // (true for up and false for down)
+ }
+}
diff --git a/oer/courses/c-newcomers/sections/03-lift/03-smaller-building/regex b/oer/courses/c-newcomers/sections/03-lift/03-smaller-building/regex
new file mode 100644
index 0000000..bbafa20
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/03-lift/03-smaller-building/regex
@@ -0,0 +1 @@
+^.*0\n.*1\n.*2\n.*3\n.*4\n.*5\n.*6\n.*7\n.*8\n.*9\n.*10\n.*9\n.*8\n.*7\n.*6\n$
\ No newline at end of file
diff --git a/oer/courses/c-newcomers/sections/03-lift/03-smaller-building/type b/oer/courses/c-newcomers/sections/03-lift/03-smaller-building/type
new file mode 100644
index 0000000..7d393ec
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/03-lift/03-smaller-building/type
@@ -0,0 +1 @@
+program/match-regex
diff --git a/oer/courses/c-newcomers/sections/03-lift/04-goal/Makefile b/oer/courses/c-newcomers/sections/03-lift/04-goal/Makefile
new file mode 100644
index 0000000..1f05f47
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/03-lift/04-goal/Makefile
@@ -0,0 +1,4 @@
+all:
+ gcc program.c -o program
+clean:
+ rm -f program
diff --git a/oer/courses/c-newcomers/sections/03-lift/04-goal/content.md b/oer/courses/c-newcomers/sections/03-lift/04-goal/content.md
new file mode 100644
index 0000000..bf828fa
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/03-lift/04-goal/content.md
@@ -0,0 +1,11 @@
+Our Lift can now move up and down, but it still doesn't have any ability to move to a specific floor.
+
+## Model
+
+To represent that in the model, we added the variable ``TargetFloor``, which indicates to what floor the lift should move.
+You have to check if the lift has to move up or down.
+When the lift reached the target, it should stop for now.
+
+## Task
+
+Your task is to implement the movement to that floor. It should take the shortest route. When it reached the target, set the variable isDone to true.
diff --git a/oer/courses/c-newcomers/sections/03-lift/04-goal/meta b/oer/courses/c-newcomers/sections/03-lift/04-goal/meta
new file mode 100644
index 0000000..cdf9341
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/03-lift/04-goal/meta
@@ -0,0 +1 @@
+{"title": "Setting Goals"}
diff --git a/oer/courses/c-newcomers/sections/03-lift/04-goal/program.c b/oer/courses/c-newcomers/sections/03-lift/04-goal/program.c
new file mode 100644
index 0000000..e2aa4bc
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/03-lift/04-goal/program.c
@@ -0,0 +1,29 @@
+#include
+#include
+
+int main()
+{
+ int CurrentFloor = 8;
+ int TargetFloor = 2;
+
+ bool GoingUp = true;
+ bool isDone = false;
+
+ for(int Timestep = 0; Timestep < 15 && !isDone; Timestep++)
+ {
+ printf("I'm currently at floor %d\n", CurrentFloor);
+ // TODO: replace this with a more apropiate logic
+ // for choosing the direction
+ if(GoingUp)
+ {
+ CurrentFloor++;
+ }
+ else
+ {
+ CurrentFloor--;
+ }
+
+ // TODO: check if we reached the target floor and set the isDone variable to true
+ }
+ printf("I ended up in floor %d.", CurrentFloor);
+}
diff --git a/oer/courses/c-newcomers/sections/03-lift/04-goal/regex b/oer/courses/c-newcomers/sections/03-lift/04-goal/regex
new file mode 100644
index 0000000..cbfc33c
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/03-lift/04-goal/regex
@@ -0,0 +1 @@
+^(.|\s)*I ended up in floor 2\.\s*$
\ No newline at end of file
diff --git a/oer/courses/c-newcomers/sections/03-lift/04-goal/type b/oer/courses/c-newcomers/sections/03-lift/04-goal/type
new file mode 100644
index 0000000..7d393ec
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/03-lift/04-goal/type
@@ -0,0 +1 @@
+program/match-regex
diff --git a/oer/courses/c-newcomers/sections/03-lift/05-pending-goal/Makefile b/oer/courses/c-newcomers/sections/03-lift/05-pending-goal/Makefile
new file mode 100644
index 0000000..1f05f47
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/03-lift/05-pending-goal/Makefile
@@ -0,0 +1,4 @@
+all:
+ gcc program.c -o program
+clean:
+ rm -f program
diff --git a/oer/courses/c-newcomers/sections/03-lift/05-pending-goal/content.md b/oer/courses/c-newcomers/sections/03-lift/05-pending-goal/content.md
new file mode 100644
index 0000000..db99866
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/03-lift/05-pending-goal/content.md
@@ -0,0 +1,10 @@
+The lift can now reach exactly one target floor. But a lift can get more than one request. For now we only take a second one.
+
+## Model
+So now our model is able to have multible targets. Basically a active one safed in ``TargetFloor`` and a secondary one saved in ``PendingFloor``.
+This lift controller should prioritize the target floor first, but, if there is any pending floor that can be done one the way, it should stop there.
+Otherwise you have to update the target floor.
+
+## Task
+
+Your task is to program that behavior.
diff --git a/oer/courses/c-newcomers/sections/03-lift/05-pending-goal/meta b/oer/courses/c-newcomers/sections/03-lift/05-pending-goal/meta
new file mode 100644
index 0000000..a43cb3e
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/03-lift/05-pending-goal/meta
@@ -0,0 +1 @@
+{"title": "Pending Floors"}
diff --git a/oer/courses/c-newcomers/sections/03-lift/05-pending-goal/program.c b/oer/courses/c-newcomers/sections/03-lift/05-pending-goal/program.c
new file mode 100644
index 0000000..ade36bf
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/03-lift/05-pending-goal/program.c
@@ -0,0 +1,41 @@
+#include
+#include
+
+int main()
+{
+ int CurrentFloor = 8;
+ int TargetFloor = 2;
+ int PendingFloor = 6;
+
+ bool reachedPendingFloor = false;
+ bool isDone = false;
+
+ for(int Timestep = 0; Timestep < 15 && !isDone; Timestep++)
+ {
+ printf("I'm currently at floor %d\n", CurrentFloor);
+
+ if(CurrentFloor < TargetFloor)
+ {
+ CurrentFloor++;
+ }
+ else
+ {
+ CurrentFloor--;
+ }
+
+ // TODO: check, when you not reached the pending floor yet,
+ // if you reached it now, print out "I waited in floor "
+
+ if(CurrentFloor == TargetFloor)
+ {
+ printf("I waited in floor %d.\n", CurrentFloor);
+
+ // TODO: when you not reached the pending floor yet,
+ // set it to the target floor
+
+ // TODO: set isDone and reachedPendingFloor appropriately
+ isDone = true;
+ }
+
+ }
+}
diff --git a/oer/courses/c-newcomers/sections/03-lift/05-pending-goal/regex b/oer/courses/c-newcomers/sections/03-lift/05-pending-goal/regex
new file mode 100644
index 0000000..7ec2913
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/03-lift/05-pending-goal/regex
@@ -0,0 +1 @@
+^(.|\s)*I waited in floor 6\.(\s|.)*I waited in floor 2\.\s*$
\ No newline at end of file
diff --git a/oer/courses/c-newcomers/sections/03-lift/05-pending-goal/type b/oer/courses/c-newcomers/sections/03-lift/05-pending-goal/type
new file mode 100644
index 0000000..7d393ec
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/03-lift/05-pending-goal/type
@@ -0,0 +1 @@
+program/match-regex
diff --git a/oer/courses/c-newcomers/sections/03-lift/06-more-requests/Makefile b/oer/courses/c-newcomers/sections/03-lift/06-more-requests/Makefile
new file mode 100644
index 0000000..1f05f47
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/03-lift/06-more-requests/Makefile
@@ -0,0 +1,4 @@
+all:
+ gcc program.c -o program
+clean:
+ rm -f program
diff --git a/oer/courses/c-newcomers/sections/03-lift/06-more-requests/content.md b/oer/courses/c-newcomers/sections/03-lift/06-more-requests/content.md
new file mode 100644
index 0000000..d461013
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/03-lift/06-more-requests/content.md
@@ -0,0 +1,23 @@
+The lift controller is almost complete. It needs to be able to have more than just one pending floor and it needs a way to get new requests.
+Let's concentrate on the first thing first.
+
+## Knowledge
+
+We already know how to speak in terms of multiple variables. We just use an array.
+There are at least two reasonable solutions, on how to implement this array to encode the pending floors.
+We could have an array, where each index stands for a floor and the value for whether or not the floor is pending.
+The other way would be just a list of all the pending floors, **but** then we need a way of marking indices the lift already finished.
+For example we could use the Value -1, this only works of course, if we don't have underground floors.
+
+## Model
+
+We think the first solution is a bit cleaner. So in our model we have the array, where every index is a floor. That way we also don't
+have to worry about duplicates. The array in question is called ``PendingFloors``.
+
+Because we have more pending floors, we now also have to check if we reached all, if not we have to keep going. And on every level we have to
+check if the floor we are on is a pending floor.
+
+## Task
+
+Change the program to support multiple pending floors. When choosing the next target floor, use the first not finished floor from the pending floor array.
+The lift will **not** reach every floor, because we don't simulate enough time-steps.
diff --git a/oer/courses/c-newcomers/sections/03-lift/06-more-requests/meta b/oer/courses/c-newcomers/sections/03-lift/06-more-requests/meta
new file mode 100644
index 0000000..9a62e77
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/03-lift/06-more-requests/meta
@@ -0,0 +1 @@
+{"title": "More Requests"}
diff --git a/oer/courses/c-newcomers/sections/03-lift/06-more-requests/program.c b/oer/courses/c-newcomers/sections/03-lift/06-more-requests/program.c
new file mode 100644
index 0000000..db14945
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/03-lift/06-more-requests/program.c
@@ -0,0 +1,61 @@
+#include
+#include
+
+int main()
+{
+ int CurrentFloor = 8;
+ int TargetFloor = 2;
+ bool PendingFloors[10] = {};
+ PendingFloors[0] = true; // Floor 1
+ PendingFloors[2] = true; // Floor 3
+ PendingFloors[5] = true; // Floor 6
+ PendingFloors[7] = true; // Floor 8
+ PendingFloors[9] = true; // Floor 10
+
+ bool reachedAllPendingFloors = false;
+ bool isDone = false;
+
+ for(int Timestep = 0; Timestep < 15 && !isDone; Timestep++)
+ {
+ printf("I'm currently at floor %d\n", CurrentFloor);
+
+ if(CurrentFloor < TargetFloor)
+ {
+ CurrentFloor++;
+ }
+ else
+ {
+ CurrentFloor--;
+ }
+
+ // TODO: Check for the correct pending floor
+ if(!reachedAllPendingFloors && CurrentFloor == PendingFloors[0])
+ {
+ printf("I waited in floor %d.\n", CurrentFloor);
+ // TODO: change this to only set the index to finished
+ reachedAllPendingFloors = true;
+ }
+
+ // TODO: check if there are any more pending floors left and set
+ // reachedAllPendingFloors appropriately
+
+ if(CurrentFloor == TargetFloor)
+ {
+ printf("I waited in floor %d.\n", CurrentFloor);
+
+ if(!reachedAllPendingFloors)
+ {
+ // TODO: get the first floor that isn't finished yet.
+ // TIP: the break keyword allows you to stop a loop
+ TargetFloor = PendingFloors[0];
+ // TODO: change this to only indicate, that the new target floor is no pending floor anymore
+ reachedAllPendingFloors = true;
+ }
+ else
+ {
+ isDone = true;
+ }
+ }
+
+ }
+}
diff --git a/oer/courses/c-newcomers/sections/03-lift/06-more-requests/regex b/oer/courses/c-newcomers/sections/03-lift/06-more-requests/regex
new file mode 100644
index 0000000..d9b93f1
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/03-lift/06-more-requests/regex
@@ -0,0 +1 @@
+^(.|\s)*I waited in floor 6\.(\s|.)*I waited in floor 3\.(\s|.)*I waited in floor 2\.(\s|.)*I waited in floor 8\.(\s|.)*$
\ No newline at end of file
diff --git a/oer/courses/c-newcomers/sections/03-lift/06-more-requests/type b/oer/courses/c-newcomers/sections/03-lift/06-more-requests/type
new file mode 100644
index 0000000..7d393ec
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/03-lift/06-more-requests/type
@@ -0,0 +1 @@
+program/match-regex
diff --git a/oer/courses/c-newcomers/sections/03-lift/07-requests-over-time/Makefile b/oer/courses/c-newcomers/sections/03-lift/07-requests-over-time/Makefile
new file mode 100644
index 0000000..1f05f47
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/03-lift/07-requests-over-time/Makefile
@@ -0,0 +1,4 @@
+all:
+ gcc program.c -o program
+clean:
+ rm -f program
diff --git a/oer/courses/c-newcomers/sections/03-lift/07-requests-over-time/content.md b/oer/courses/c-newcomers/sections/03-lift/07-requests-over-time/content.md
new file mode 100644
index 0000000..94f6b94
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/03-lift/07-requests-over-time/content.md
@@ -0,0 +1,12 @@
+Because a lift can take request while it is running, let's simmulate getting one request for each timestep.
+
+## Model
+
+For this we prepared a list of request, which should only be applyed to the pending requests one by one.
+The request are stored in the array ``RequestsOverTime``, where each index stands for one time-step.
+So each time-step you need to look at the appropriate request and set the pending floor accordingly.
+As with last time, the lift will not be able to visit all the floors, because we simulate not enough time-steps.
+
+## Task
+
+Implement the applying of requests over time.
diff --git a/oer/courses/c-newcomers/sections/03-lift/07-requests-over-time/meta b/oer/courses/c-newcomers/sections/03-lift/07-requests-over-time/meta
new file mode 100644
index 0000000..4553200
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/03-lift/07-requests-over-time/meta
@@ -0,0 +1 @@
+{"title": "Requests Over Time"}
diff --git a/oer/courses/c-newcomers/sections/03-lift/07-requests-over-time/program.c b/oer/courses/c-newcomers/sections/03-lift/07-requests-over-time/program.c
new file mode 100644
index 0000000..0f7d902
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/03-lift/07-requests-over-time/program.c
@@ -0,0 +1,72 @@
+#include
+#include
+
+int main()
+{
+ int CurrentFloor = 8;
+ int TargetFloor = 2;
+ int RequestsOverTime[15] = {2,6,1,8,10,5,3,2,10,7,8,4,5,1,7};
+ int PendingFloors[10] = {};
+
+ bool reachedAllPendingFloors = false;
+ bool isDone = false;
+
+ for(int Timestep = 0; Timestep < 15 && !isDone; Timestep++)
+ {
+ printf("I'm currently at floor %d\n", CurrentFloor);
+ // TODO: Take the next Request from RequestOverTime and put it into the PendingFloors array
+ // at the index of the timestep
+
+ if(CurrentFloor < TargetFloor)
+ {
+ CurrentFloor++;
+ }
+ else
+ {
+ CurrentFloor--;
+ }
+
+ bool foundFloor = false;
+ if(!reachedAllPendingFloors && PendingFloors[CurrentFloor])
+ {
+
+ printf("I waited in floor %d.\n", CurrentFloor);
+ PendingFloors[CurrentFloor] = false;
+ foundFloor = true;
+ }
+
+ reachedAllPendingFloors = true;
+ for(int i = 0; i < 15; i++)
+ {
+ if(PendingFloors[i] != false)
+ {
+ reachedAllPendingFloors = false;
+ break;
+ }
+ }
+
+ if(CurrentFloor == TargetFloor)
+ {
+ if(!foundFloor)
+ printf("I waited in floor %d.\n", CurrentFloor);
+
+ if(!reachedAllPendingFloors)
+ {
+ for(int i = 0; i < 15; i++)
+ {
+ if(PendingFloors[i] != false)
+ {
+ TargetFloor = PendingFloors[i];
+ PendingFloors[i] = false;
+ break;
+ }
+ }
+ }
+ else
+ {
+ isDone = true;
+ }
+ }
+
+ }
+}
diff --git a/oer/courses/c-newcomers/sections/03-lift/07-requests-over-time/regex b/oer/courses/c-newcomers/sections/03-lift/07-requests-over-time/regex
new file mode 100644
index 0000000..d9b93f1
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/03-lift/07-requests-over-time/regex
@@ -0,0 +1 @@
+^(.|\s)*I waited in floor 6\.(\s|.)*I waited in floor 3\.(\s|.)*I waited in floor 2\.(\s|.)*I waited in floor 8\.(\s|.)*$
\ No newline at end of file
diff --git a/oer/courses/c-newcomers/sections/03-lift/07-requests-over-time/type b/oer/courses/c-newcomers/sections/03-lift/07-requests-over-time/type
new file mode 100644
index 0000000..7d393ec
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/03-lift/07-requests-over-time/type
@@ -0,0 +1 @@
+program/match-regex
diff --git a/oer/courses/c-newcomers/sections/03-lift/08-complete-lift/Makefile b/oer/courses/c-newcomers/sections/03-lift/08-complete-lift/Makefile
new file mode 100644
index 0000000..1f05f47
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/03-lift/08-complete-lift/Makefile
@@ -0,0 +1,4 @@
+all:
+ gcc program.c -o program
+clean:
+ rm -f program
diff --git a/oer/courses/c-newcomers/sections/03-lift/08-complete-lift/content.md b/oer/courses/c-newcomers/sections/03-lift/08-complete-lift/content.md
new file mode 100644
index 0000000..0405ced
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/03-lift/08-complete-lift/content.md
@@ -0,0 +1,11 @@
+That's were all the task for the simple lift controller. Below you find a solution for the last task.
+But there is always room for improvements. Here are just some examples one could do to improve or expand the lift controller:
+
+* Use more appropriate data structures like a queue
+* Parsing the command-line arguments to determine the requests
+* Change it to work with arbitrary amounts of time-steps
+* Implement different phases like moving to a different floor and waiting at a floor with a State Machine
+
+This is just some ideas we have you could try, if you gathered more experience. For that you could try out the C-Basic course or find
+coding resources on your own.
+
diff --git a/oer/courses/c-newcomers/sections/03-lift/08-complete-lift/meta b/oer/courses/c-newcomers/sections/03-lift/08-complete-lift/meta
new file mode 100644
index 0000000..649dfae
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/03-lift/08-complete-lift/meta
@@ -0,0 +1 @@
+{"title": "Completed Lift"}
diff --git a/oer/courses/c-newcomers/sections/03-lift/08-complete-lift/program.c b/oer/courses/c-newcomers/sections/03-lift/08-complete-lift/program.c
new file mode 100644
index 0000000..8ca1aca
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/03-lift/08-complete-lift/program.c
@@ -0,0 +1,74 @@
+#include
+#include
+
+int main()
+{
+ int CurrentFloor = 8;
+ int TargetFloor = 2;
+ int RequestOverTime[15] = {2,6,1,8,10,5,3,2,10,7,8,4,5,1,7};
+ int PendingFloors[10] = {};
+
+ bool reachedAllPendingFloors = false;
+ bool isDone = false;
+
+ for(int Timestep = 0; Timestep < 15 && !isDone; Timestep++)
+ {
+ printf("I'm currently at floor %d\n", CurrentFloor);
+ PendingFloors[RequestOverTime[Timestep]] = true;
+
+ if(CurrentFloor < TargetFloor)
+ {
+ CurrentFloor++;
+ }
+ else
+ {
+ CurrentFloor--;
+ }
+
+ bool foundFloor = false;
+ if(!reachedAllPendingFloors)
+ {
+
+ if(CurrentFloor == PendingFloors[CurrentFloor])
+ {
+ foundFloor = true;
+ PendingFloors[CurrentFloor] = false;
+ printf("I waited in floor %d.\n", CurrentFloor);
+ }
+ }
+
+ reachedAllPendingFloors = true;
+ for(int i = 0; i < 15; i++)
+ {
+ if(PendingFloors[i] != false)
+ {
+ reachedAllPendingFloors = false;
+ break;
+ }
+ }
+
+ if(CurrentFloor == TargetFloor)
+ {
+ if(!foundFloor)
+ printf("I waited in floor %d.\n", CurrentFloor);
+
+ if(!reachedAllPendingFloors)
+ {
+ for(int i = 0; i < 15; i++)
+ {
+ if(PendingFloors[i] != false)
+ {
+ TargetFloor = PendingFloors[i];
+ PendingFloors[i] = false;
+ break;
+ }
+ }
+ }
+ else
+ {
+ isDone = true;
+ }
+ }
+
+ }
+}
diff --git a/oer/courses/c-newcomers/sections/03-lift/08-complete-lift/regex b/oer/courses/c-newcomers/sections/03-lift/08-complete-lift/regex
new file mode 100644
index 0000000..d9b93f1
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/03-lift/08-complete-lift/regex
@@ -0,0 +1 @@
+^(.|\s)*I waited in floor 6\.(\s|.)*I waited in floor 3\.(\s|.)*I waited in floor 2\.(\s|.)*I waited in floor 8\.(\s|.)*$
\ No newline at end of file
diff --git a/oer/courses/c-newcomers/sections/03-lift/08-complete-lift/type b/oer/courses/c-newcomers/sections/03-lift/08-complete-lift/type
new file mode 100644
index 0000000..7d393ec
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/03-lift/08-complete-lift/type
@@ -0,0 +1 @@
+program/match-regex
diff --git a/oer/courses/c-newcomers/sections/03-lift/section b/oer/courses/c-newcomers/sections/03-lift/section
new file mode 100644
index 0000000..647bf22
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/03-lift/section
@@ -0,0 +1 @@
+{"title": "Lift", "description": "A simple lift controller"}
diff --git a/oer/courses/c-newcomers/sections/04-supermarket/01-while-loop/Makefile b/oer/courses/c-newcomers/sections/04-supermarket/01-while-loop/Makefile
new file mode 100644
index 0000000..1f05f47
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/04-supermarket/01-while-loop/Makefile
@@ -0,0 +1,4 @@
+all:
+ gcc program.c -o program
+clean:
+ rm -f program
diff --git a/oer/courses/c-newcomers/sections/04-supermarket/01-while-loop/content.md b/oer/courses/c-newcomers/sections/04-supermarket/01-while-loop/content.md
new file mode 100644
index 0000000..41e7073
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/04-supermarket/01-while-loop/content.md
@@ -0,0 +1,30 @@
+The next exercises will focus around simulating a supermarket with multiple customers and multiple queues.
+In contrast to the lift-course we will not simulate a fixed amount of time. Instead we will simulate
+until all customers are served.
+
+## Model
+
+As with the lift we will take tiny steps and will increase the complexity of the model bit by bit.
+Our end goal is to have a bunch of customers with different items, which all take different amounts of time to scan,
+which will be served by multiple cashiers.
+
+To get there we start with only one customer and one cashier. Each item should take the same amount of time.
+To do that, we keep track of the item count in the Variable ``CustomerItemCount``.
+When one gets processed we simply need do decrement that value.
+
+## Knowledge
+
+Because we don't want a fixed amount of time steps, like we did with the lift, we need a different kind of _loop_.
+A **while-loop** loops as long as its condition is true.
+
+ while(condition)
+ {
+ // looped code here
+ }
+
+This is exactly what we need to serve all customers until no one is left or for now until all items are gone.
+
+## Task
+
+For now your task will be to implement one cashier and one customer with 5 items.
+Each item should take the same amount of time for now.
diff --git a/oer/courses/c-newcomers/sections/04-supermarket/01-while-loop/meta b/oer/courses/c-newcomers/sections/04-supermarket/01-while-loop/meta
new file mode 100644
index 0000000..31398ce
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/04-supermarket/01-while-loop/meta
@@ -0,0 +1 @@
+{"title": "Customer and Cashier"}
diff --git a/oer/courses/c-newcomers/sections/04-supermarket/01-while-loop/program.c b/oer/courses/c-newcomers/sections/04-supermarket/01-while-loop/program.c
new file mode 100644
index 0000000..6d84633
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/04-supermarket/01-while-loop/program.c
@@ -0,0 +1,25 @@
+#include
+#include
+
+int main()
+{
+ bool CustomerHasItems = true;
+ int CustomerItemCount = 5;
+
+ /*
+ * This is a while loop.
+ * It functions similar to the for-loop,
+ * but, instead of counting up a variable, it only
+ * checks for the condition.
+ */
+ while(CustomerHasItems)
+ {
+ // TODO: Process the items
+ printf("Scanning a product. %d to go.\n", CustomerItemCount);
+
+ // TODO: check if there are still items to process
+ // and set CustomerHasItems appropriately
+ CustomerHasItems = false;
+ }
+
+}
diff --git a/oer/courses/c-newcomers/sections/04-supermarket/01-while-loop/regex b/oer/courses/c-newcomers/sections/04-supermarket/01-while-loop/regex
new file mode 100644
index 0000000..9441f20
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/04-supermarket/01-while-loop/regex
@@ -0,0 +1 @@
+(.|\s)*Scanning a product\. 0 to go\.$
\ No newline at end of file
diff --git a/oer/courses/c-newcomers/sections/04-supermarket/01-while-loop/type b/oer/courses/c-newcomers/sections/04-supermarket/01-while-loop/type
new file mode 100644
index 0000000..7d393ec
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/04-supermarket/01-while-loop/type
@@ -0,0 +1 @@
+program/match-regex
diff --git a/oer/courses/c-newcomers/sections/04-supermarket/02-enums/Makefile b/oer/courses/c-newcomers/sections/04-supermarket/02-enums/Makefile
new file mode 100644
index 0000000..1f05f47
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/04-supermarket/02-enums/Makefile
@@ -0,0 +1,4 @@
+all:
+ gcc program.c -o program
+clean:
+ rm -f program
diff --git a/oer/courses/c-newcomers/sections/04-supermarket/02-enums/content.md b/oer/courses/c-newcomers/sections/04-supermarket/02-enums/content.md
new file mode 100644
index 0000000..b5d8ea1
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/04-supermarket/02-enums/content.md
@@ -0,0 +1,45 @@
+Now that the cashier can scan items, the next step will be to have different items which take different amount of time.
+
+## Model
+
+In our model we now not only have to track the amount of items, but also the type. The items of the customer are stored in the ``CustomerItems`` array.
+You could have stored each item type as a different number, but this gets confusing and hard to maintain. Thats why we used an enum. We talk about how enums work later.
+
+To model the time each of these item needs, we have an array ``Time``, which associates with each item type a unique time.
+
+Now that items take different amounts of time, it gets interessting how long the whole scanning process took. For that we update the time in the variable ``TimePassed``.
+The time is counted in secconds.
+
+## Knowledge
+
+Know back to how enums work. An enum is a way to declare new types. In the background it only binds a number to a name. This makes your code more readable and easier to change,
+because the numbers are automatically generated. It doesn't matter if you add one member or delete one or change the order.
+
+Here is an example of an enum for food types.
+
+ typedef enum
+ {
+ Burger,
+ Pizza,
+ Steak,
+ Salad,
+ Porkchop,
+
+ Food_type_count,
+ }food;
+
+The last line ``Food_type_count`` is a nice trick to get the amount of members of an enum. This only works because the compiler, the program which translates your code into machine readable code,
+just counts up the numbers. In this case Burger is 0 and Pizza is 1 ... and Food_type_count is 5;
+You could then use this for example to associate a kcal-value to them with an array.
+
+ food kcal[Food_type_count];
+ kcal[Burger] = 600;
+ kcal[Salad] = 150;
+
+etc.
+
+This may not be the most elegant solution, but it is a pretty simple one.
+
+## Task
+
+Your task is to implement the items enum and update the amount of time depending on the scanned item.
\ No newline at end of file
diff --git a/oer/courses/c-newcomers/sections/04-supermarket/02-enums/meta b/oer/courses/c-newcomers/sections/04-supermarket/02-enums/meta
new file mode 100644
index 0000000..7eb7f67
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/04-supermarket/02-enums/meta
@@ -0,0 +1 @@
+{"title": "Item Types"}
diff --git a/oer/courses/c-newcomers/sections/04-supermarket/02-enums/program.c b/oer/courses/c-newcomers/sections/04-supermarket/02-enums/program.c
new file mode 100644
index 0000000..46de00b
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/04-supermarket/02-enums/program.c
@@ -0,0 +1,36 @@
+#include
+#include
+
+// TODO: implement the item enum
+
+int main()
+{
+ bool CustomerHasItems = true;
+ int TimePassed = 0;
+
+#define CUSTOMER_ITEM_COUNT 5 // This declares a constant
+ item CustomerItems[CUSTOMER_ITEM_COUNT] = {tissues, pasta, tomato_sauce, bread, butter};
+
+ // NOTE: time is in seconds
+ item Time[ITEM_TYPE_COUNT];
+ Time[tissues] = 1;
+ Time[pasta] = 2;
+ Time[tomato_sauce] = 3;
+ Time[bread] = 10;
+ Time[butter] = 2;
+ Time[batteries] = 2;
+ Time[toothbrush] = 1;
+
+ int ItemsLeft = CUSTOMER_ITEM_COUNT;
+ while(CustomerHasItems)
+ {
+ // TODO: increase time based on the scaned item
+ TimePassed++;
+ ItemsLeft--;
+ printf("Time since start: %d. Scanning a product. %d to go.\n", TimePassed, ItemsLeft);
+
+ if(!ItemsLeft)
+ CustomerHasItems = false;
+ }
+
+}
diff --git a/oer/courses/c-newcomers/sections/04-supermarket/02-enums/regex b/oer/courses/c-newcomers/sections/04-supermarket/02-enums/regex
new file mode 100644
index 0000000..03fdaa7
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/04-supermarket/02-enums/regex
@@ -0,0 +1 @@
+^(.|\s)*Time since start: 18\. Scanning a product\. 0 to go\.$
\ No newline at end of file
diff --git a/oer/courses/c-newcomers/sections/04-supermarket/02-enums/type b/oer/courses/c-newcomers/sections/04-supermarket/02-enums/type
new file mode 100644
index 0000000..7d393ec
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/04-supermarket/02-enums/type
@@ -0,0 +1 @@
+program/match-regex
diff --git a/oer/courses/c-newcomers/sections/04-supermarket/03-states/Makefile b/oer/courses/c-newcomers/sections/04-supermarket/03-states/Makefile
new file mode 100644
index 0000000..1f05f47
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/04-supermarket/03-states/Makefile
@@ -0,0 +1,4 @@
+all:
+ gcc program.c -o program
+clean:
+ rm -f program
diff --git a/oer/courses/c-newcomers/sections/04-supermarket/03-states/content.md b/oer/courses/c-newcomers/sections/04-supermarket/03-states/content.md
new file mode 100644
index 0000000..13abb85
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/04-supermarket/03-states/content.md
@@ -0,0 +1,35 @@
+This is great. Each item can now take different amounts of time to be scanned, but when you have multiple cashiers,
+one can scan many "easy" items, while the other scans one slowly. So simply adding up the time won't cut it.
+
+To prepare the program for more than one cashier, this needs to change. To stay on the topics of enums we
+will use a construct known as a [finite-state-machine](https://en.wikipedia.org/wiki/Finite-state_machine).
+
+## Knowledge
+
+A finite-state-machine let's you easily define different behaviours depending on what state their are in.
+Basically you need a variable to track the state, in this case it is ``CurrentState`` and you need a way of
+implementing different behaviour based on the current state. For that you can simply use if statements.
+
+If you have more than one condition you want to test on, for example three different states,
+you can use the **else if** statement. This allows you to first test if one thing is true and, if is not,
+you can test for the second condition. You can chain as many else if statements as you want.
+
+ if(condition1)
+ {
+ // gets executed if condition 1 is true
+ }
+ else if(condition2)
+ {
+ // gets executed if condition1 is false and condition2 is true
+ }
+ else
+ {
+ // gets executed if non of the conditions above are true
+ }
+
+So our cashier has the state STATE_ready_for_item and STATE_scanning. These are represented as an enum.
+
+## Task
+
+Your task will be to implement the state-machine with an enum, such that while scanning
+you only increment the time-step by one.
\ No newline at end of file
diff --git a/oer/courses/c-newcomers/sections/04-supermarket/03-states/meta b/oer/courses/c-newcomers/sections/04-supermarket/03-states/meta
new file mode 100644
index 0000000..c6d1282
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/04-supermarket/03-states/meta
@@ -0,0 +1 @@
+{"title": "States"}
diff --git a/oer/courses/c-newcomers/sections/04-supermarket/03-states/program.c b/oer/courses/c-newcomers/sections/04-supermarket/03-states/program.c
new file mode 100644
index 0000000..b13ca77
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/04-supermarket/03-states/program.c
@@ -0,0 +1,59 @@
+#include
+#include
+
+typedef enum
+{
+ STATE_ready_for_item,
+ STATE_scanning,
+}state;
+
+typedef enum
+{
+ tissues,
+ pasta,
+ tomato_sauce,
+ bread,
+ butter,
+ batteries,
+ toothbrush,
+
+ ITEM_TYPE_COUNT,
+}item;
+
+int main()
+{
+ bool CustomerHasItems = true;
+ int TimePassed = 0;
+
+#define CUSTOMER_ITEM_COUNT 5 // This declares a constant
+ item CustomerItems[CUSTOMER_ITEM_COUNT] = {tissues, pasta, tomato_sauce, bread, butter};
+
+ // NOTE: time is in seconds
+ item Time[ITEM_TYPE_COUNT];
+ Time[tissues] = 1;
+ Time[pasta] = 2;
+ Time[tomato_sauce] = 3;
+ Time[bread] = 10;
+ Time[butter] = 2;
+ Time[batteries] = 2;
+ Time[toothbrush] = 1;
+
+ int ItemsLeft = CUSTOMER_ITEM_COUNT;
+ state CurrentState = STATE_ready_for_item; // The state the cashier is in
+ while(CustomerHasItems)
+ {
+ // TODO: Implement the state machine here
+ int CurrentItemIndex = CUSTOMER_ITEM_COUNT - ItemsLeft;
+ item CurrentItem = CustomerItems[CurrentItemIndex];
+
+ TimePassed += Time[CurrentItem];
+ ItemsLeft--;
+
+ // Print this only while scanning
+ printf("Time since start: %d. Scanning a product. %d to go.\n", TimePassed, ItemsLeft);
+
+ if(!ItemsLeft)
+ CustomerHasItems = false;
+ }
+
+}
diff --git a/oer/courses/c-newcomers/sections/04-supermarket/03-states/regex b/oer/courses/c-newcomers/sections/04-supermarket/03-states/regex
new file mode 100644
index 0000000..5210f36
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/04-supermarket/03-states/regex
@@ -0,0 +1 @@
+^(.*\n){17,18}Time since start: 18. Scanning a product. 0 to go.$
\ No newline at end of file
diff --git a/oer/courses/c-newcomers/sections/04-supermarket/03-states/type b/oer/courses/c-newcomers/sections/04-supermarket/03-states/type
new file mode 100644
index 0000000..7d393ec
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/04-supermarket/03-states/type
@@ -0,0 +1 @@
+program/match-regex
diff --git a/oer/courses/c-newcomers/sections/04-supermarket/04-customer/Makefile b/oer/courses/c-newcomers/sections/04-supermarket/04-customer/Makefile
new file mode 100644
index 0000000..1f05f47
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/04-supermarket/04-customer/Makefile
@@ -0,0 +1,4 @@
+all:
+ gcc program.c -o program
+clean:
+ rm -f program
diff --git a/oer/courses/c-newcomers/sections/04-supermarket/04-customer/content.md b/oer/courses/c-newcomers/sections/04-supermarket/04-customer/content.md
new file mode 100644
index 0000000..203da62
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/04-supermarket/04-customer/content.md
@@ -0,0 +1,34 @@
+You prepared the cashier for the step to multiple cashiers. But let's not go there yet.
+First you should flesh out the concept of a customer.
+
+## Model
+
+In our model the customer should have a list of items he buys, but you could add more things to make it more interesting.
+For example some customers pack their items painfully slow and some really fast. So let's add that too.
+So the scanning phase takes the amount of time of the item plus the packing-speed.
+
+## Knowledge
+
+For that we need a new language construct. The struct.
+A struct works similar to an enum, but instead counting up numbers, you basically packing
+multiple variables together to build more complex data-types.
+
+Here is an example of a struct for a person:
+
+ typedef struct
+ {
+ char *Name; // This is some Text
+ int Age;
+
+ gender Gender; // This is an enum
+ }person;
+
+If you want to access a member of the struct you write first the name of the variable containing the struct, then a dot and then the name of the member.
+For example we have a variable Bob ``person Bob`` and want to assign him an age of 35 ``Bob.age = 35``.
+
+Because the file got a little big, we pulled out some of the definitions like the enums into a
+header file and included it with the command `#include "supermarket.h"`.
+
+## Task
+
+Your task is to implement a struct for the customer and take the packing speed into account.
\ No newline at end of file
diff --git a/oer/courses/c-newcomers/sections/04-supermarket/04-customer/meta b/oer/courses/c-newcomers/sections/04-supermarket/04-customer/meta
new file mode 100644
index 0000000..6441171
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/04-supermarket/04-customer/meta
@@ -0,0 +1 @@
+{"title": "Customer"}
diff --git a/oer/courses/c-newcomers/sections/04-supermarket/04-customer/program.c b/oer/courses/c-newcomers/sections/04-supermarket/04-customer/program.c
new file mode 100644
index 0000000..8035634
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/04-supermarket/04-customer/program.c
@@ -0,0 +1,57 @@
+#include
+#include
+#include "supermarket.h"
+
+#define CUSTOMER_ITEM_COUNT 5
+// TODO: Implement the struct here with an array of 5 items and a packing speed
+
+int main()
+{
+ bool CustomerHasItems = true;
+ int TimePassed = 0;
+
+ // TODO: replace this with a your struct and add a packing speed of 2
+ item CustomerItems[CUSTOMER_ITEM_COUNT] = {tissues, pasta, tomato_sauce, bread, butter};
+
+ // NOTE: To access a member of your customer struct you have to use the .-operator
+ // e.g Customer.PackingSpeed = 23;
+
+ // NOTE: the Time-array is now a global Variable
+ initTimeTable();
+
+ int ItemsLeft = CUSTOMER_ITEM_COUNT;
+ state CurrentState = STATE_ready_for_item;
+ int TimeToScan = 0;
+ while(CustomerHasItems)
+ {
+ if(CurrentState == STATE_ready_for_item)
+ {
+ int CurrentItemIndex = CUSTOMER_ITEM_COUNT - ItemsLeft;
+
+ // TODO: Change this to use the customer struct
+ item CurrentItem = CustomerItems[CurrentItemIndex];
+
+ // TODO: add the packing speed on top of the scanning time
+ TimeToScan = Time[CurrentItem];
+ CurrentState = STATE_scanning;
+ }
+ else
+ {
+ TimePassed ++;
+ TimeToScan --;
+
+ if (TimeToScan == 0)
+ {
+ ItemsLeft--;
+ CurrentState = STATE_ready_for_item;
+ }
+ printf("Time since start: %d. Scanning a product. %d to go.\n", TimePassed, ItemsLeft);
+
+ }
+
+
+ if(!ItemsLeft)
+ CustomerHasItems = false;
+ }
+
+}
diff --git a/oer/courses/c-newcomers/sections/04-supermarket/04-customer/regex b/oer/courses/c-newcomers/sections/04-supermarket/04-customer/regex
new file mode 100644
index 0000000..1fbecda
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/04-supermarket/04-customer/regex
@@ -0,0 +1 @@
+^(.*\n){27,28}Time since start: 28. Scanning a product. 0 to go.$
\ No newline at end of file
diff --git a/oer/courses/c-newcomers/sections/04-supermarket/04-customer/supermarket.h b/oer/courses/c-newcomers/sections/04-supermarket/04-customer/supermarket.h
new file mode 100644
index 0000000..5e88b1a
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/04-supermarket/04-customer/supermarket.h
@@ -0,0 +1,31 @@
+typedef enum
+{
+ STATE_ready_for_item,
+ STATE_scanning,
+}state;
+
+typedef enum
+{
+ tissues,
+ pasta,
+ tomato_sauce,
+ bread,
+ butter,
+ batteries,
+ toothbrush,
+
+ ITEM_TYPE_COUNT,
+}item;
+
+item Time[ITEM_TYPE_COUNT];
+
+void initTimeTable()
+{
+ Time[tissues] = 1;
+ Time[pasta] = 2;
+ Time[tomato_sauce] = 3;
+ Time[bread] = 10;
+ Time[butter] = 2;
+ Time[batteries] = 2;
+ Time[toothbrush] = 1;
+}
diff --git a/oer/courses/c-newcomers/sections/04-supermarket/04-customer/type b/oer/courses/c-newcomers/sections/04-supermarket/04-customer/type
new file mode 100644
index 0000000..7d393ec
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/04-supermarket/04-customer/type
@@ -0,0 +1 @@
+program/match-regex
diff --git a/oer/courses/c-newcomers/sections/04-supermarket/05-customers/Makefile b/oer/courses/c-newcomers/sections/04-supermarket/05-customers/Makefile
new file mode 100644
index 0000000..1f05f47
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/04-supermarket/05-customers/Makefile
@@ -0,0 +1,4 @@
+all:
+ gcc program.c -o program
+clean:
+ rm -f program
diff --git a/oer/courses/c-newcomers/sections/04-supermarket/05-customers/content.md b/oer/courses/c-newcomers/sections/04-supermarket/05-customers/content.md
new file mode 100644
index 0000000..21b2fc5
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/04-supermarket/05-customers/content.md
@@ -0,0 +1,12 @@
+Now that we fleshed out the notion of what a customer is, it is easier to create more than one.
+In fact for this task we already made an array of multiple customers.
+
+## Model
+
+In our model we now have an array with different customers to be served.
+But we now have to handle the case, where the cashier gets a new customer.
+For that we added a new state STATE_ready_for_customer
+
+## Task
+
+Your task is to implement, that, if a customer is finished, the cashier gets a new one.
\ No newline at end of file
diff --git a/oer/courses/c-newcomers/sections/04-supermarket/05-customers/meta b/oer/courses/c-newcomers/sections/04-supermarket/05-customers/meta
new file mode 100644
index 0000000..4856a80
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/04-supermarket/05-customers/meta
@@ -0,0 +1 @@
+{"title": "Customers"}
diff --git a/oer/courses/c-newcomers/sections/04-supermarket/05-customers/program.c b/oer/courses/c-newcomers/sections/04-supermarket/05-customers/program.c
new file mode 100644
index 0000000..2f35a3f
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/04-supermarket/05-customers/program.c
@@ -0,0 +1,81 @@
+#include
+#include
+#include "supermarket.h"
+
+#define CUSTOMER_ITEM_COUNT 5
+typedef struct
+{
+ item Items[CUSTOMER_ITEM_COUNT];
+ int PackingSpeed;
+}customer;
+
+int main()
+{
+ bool CustomersLeft = true;
+ int TimePassed = 0;
+
+ // NOTE: the {...} syntax is an easy way to initialize structs
+ customer CustomerQueue[3] =
+ {
+ {
+ {tissues, pasta, tomato_sauce, bread, butter},
+ 2
+ },
+ {
+ {toothbrush, batteries, bread, bread, butter},
+ 3
+ },
+ {
+ {bread, batteries, tomato_sauce, pasta, tissues},
+ 9
+ }
+ };
+ int NextQueueIndex = 0;
+
+ initTimeTable();
+
+ int ItemsLeft = CUSTOMER_ITEM_COUNT;
+ int TimeToScan = 0;
+
+ state CurrentState = STATE_ready_for_customer;
+ int CurrentCustomer = 0;
+ int CurrentItemIndex;
+ while(CustomersLeft)
+ {
+ if(CurrentState == STATE_ready_for_item)
+ {
+ // TODO: check if there are items left
+ // if not, change to the STATE_ready_for_customer state
+ // and don't forget to reset ItemsLeft
+ CurrentItemIndex = CUSTOMER_ITEM_COUNT - ItemsLeft;
+ item CurrentItem = CustomerQueue[CurrentCustomer].Items[CurrentItemIndex];
+
+ TimeToScan = Time[CurrentItem] + CustomerQueue[CurrentCustomer].PackingSpeed;
+ CurrentState = STATE_scanning;
+ }
+ else if (CurrentState == STATE_scanning)
+ {
+ TimePassed ++;
+ TimeToScan --;
+
+ if (TimeToScan == 0)
+ {
+ ItemsLeft--;
+ CurrentState = STATE_ready_for_item;
+ // NOTE: we moved the printf inside so the console doesn't get spammed with messages
+ printf("Time since start: %ds. Scanned product %d. %d to go.\n", TimePassed, CurrentItemIndex, ItemsLeft);
+ }
+
+ }
+ else // NOTE: we added the state STATE_ready_for_customer
+ {
+ // TODO: implement this.
+ // don't forget to check if there are any customers left and to change
+ // the state
+ printf("Currently serving customer %d\n", CurrentCustomer);
+ CustomersLeft = false;
+ }
+
+ }
+
+}
diff --git a/oer/courses/c-newcomers/sections/04-supermarket/05-customers/regex b/oer/courses/c-newcomers/sections/04-supermarket/05-customers/regex
new file mode 100644
index 0000000..c851b70
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/04-supermarket/05-customers/regex
@@ -0,0 +1 @@
+^.*customer 0(.*\n){6}.*customer 1(.*\n){6}.*customer 2(.*\n){5}Time since start: 131..*0 to go.$
\ No newline at end of file
diff --git a/oer/courses/c-newcomers/sections/04-supermarket/05-customers/solution.c b/oer/courses/c-newcomers/sections/04-supermarket/05-customers/solution.c
new file mode 100644
index 0000000..ff356f9
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/04-supermarket/05-customers/solution.c
@@ -0,0 +1,88 @@
+;; This buffer is for text that is not saved, and for Lisp evaluation.
+;; To create a file, visit it with C-x C-f and enter text in its buffer.
+
+#include
+#include
+#include "supermarket.h"
+
+#define CUSTOMER_ITEM_COUNT 5
+typedef struct
+{
+ item Items[CUSTOMER_ITEM_COUNT];
+ int PackingSpeed;
+}customer;
+
+int main()
+{
+ bool CustomersLeft = true;
+ int TimePast = 0;
+
+ customer CustomerQueue[3] = {
+
+ // NOTE: the {...} syntax is an easy way to initialize structs
+ {
+ {tissues, pasta, tomato_sauce, bread, butter},
+ 2
+ },
+ {
+ {toothbrush, batteries, bread, bread, butter},
+ 3
+ },
+ {
+ {bread, batteries, tomato_sauce, pasta, tissues},
+ 9
+ }
+ };
+ int NextQueueIndex = 0;
+
+ initTimeTable();
+
+ int ItemsLeft = CUSTOMER_ITEM_COUNT;
+ state CurrentState = STATE_ready_for_customer;
+ int CurrentCustomer = 0;
+ int TimeToScan = 0;
+ while(CustomersLeft)
+ {
+ if(CurrentState == STATE_ready_for_item)
+ {
+ if(ItemsLeft > 0)
+ {
+ int CurrentItemIndex = CUSTOMER_ITEM_COUNT - ItemsLeft;
+ item CurrentItem = CustomerQueue[CurrentCustomer].Items[CurrentItemIndex];
+
+ TimeToScan = Time[CurrentItem] + CustomerQueue[CurrentCustomer].PackingSpeed;
+ CurrentState = STATE_scanning;
+ }
+ else
+ {
+ CurrentState = STATE_ready_for_customer;
+ }
+ }
+ else if (CurrentState == STATE_scanning)
+ {
+ TimePast ++;
+ TimeToScan --;
+
+ if (TimeToScan == 0)
+ {
+ ItemsLeft--;
+ CurrentState = STATE_ready_for_item;
+ }
+ printf("Time since start: %d. Scanning a product. %d to go.\n", TimePast, ItemsLeft);
+
+ }
+ else
+ {
+ if(NextQueueIndex < 3)
+ {
+ CurrentCustomer = NextQueueIndex++;
+ CurrentState = STATE_ready_for_items;
+ }
+ else
+ {
+ CustomersLeft = false;
+ }
+ }
+ }
+
+}
diff --git a/oer/courses/c-newcomers/sections/04-supermarket/05-customers/supermarket.h b/oer/courses/c-newcomers/sections/04-supermarket/05-customers/supermarket.h
new file mode 100644
index 0000000..c175816
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/04-supermarket/05-customers/supermarket.h
@@ -0,0 +1,32 @@
+typedef enum
+{
+ STATE_ready_for_item,
+ STATE_ready_for_customer,
+ STATE_scanning,
+}state;
+
+typedef enum
+{
+ tissues,
+ pasta,
+ tomato_sauce,
+ bread,
+ butter,
+ batteries,
+ toothbrush,
+
+ ITEM_TYPE_COUNT,
+}item;
+
+item Time[ITEM_TYPE_COUNT];
+
+void initTimeTable()
+{
+ Time[tissues] = 1;
+ Time[pasta] = 2;
+ Time[tomato_sauce] = 3;
+ Time[bread] = 10;
+ Time[butter] = 2;
+ Time[batteries] = 2;
+ Time[toothbrush] = 1;
+}
diff --git a/oer/courses/c-newcomers/sections/04-supermarket/05-customers/type b/oer/courses/c-newcomers/sections/04-supermarket/05-customers/type
new file mode 100644
index 0000000..7d393ec
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/04-supermarket/05-customers/type
@@ -0,0 +1 @@
+program/match-regex
diff --git a/oer/courses/c-newcomers/sections/04-supermarket/06-refactor-cashier/Makefile b/oer/courses/c-newcomers/sections/04-supermarket/06-refactor-cashier/Makefile
new file mode 100644
index 0000000..1f05f47
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/04-supermarket/06-refactor-cashier/Makefile
@@ -0,0 +1,4 @@
+all:
+ gcc program.c -o program
+clean:
+ rm -f program
diff --git a/oer/courses/c-newcomers/sections/04-supermarket/06-refactor-cashier/content.md b/oer/courses/c-newcomers/sections/04-supermarket/06-refactor-cashier/content.md
new file mode 100644
index 0000000..c89fd57
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/04-supermarket/06-refactor-cashier/content.md
@@ -0,0 +1,15 @@
+Our next goal is to have multiple cashiers, so we can serve multiple customers at ones.
+Because this is kind of a big step, we will break it down to two smaller exercises.
+
+The first step is to put all the variables for the cashier-state-machine into a struct and
+pull out the code into a function (let's call it step). This kind of code change, which doesn't
+change the behavior of your program, is called refactoring.
+
+This may seem like a lot of busy work, but it is really important. Specially if you want to reuse code.
+
+Don't be discouraged, if you get a ton of error-messages. This is normal for this kind of work.
+Just read them carefully one by one and fix them.
+
+If this seems to you as to much code change at ones, just take your time and do one TODO at the time.
+
+Your task is to refactor the cashier code.
\ No newline at end of file
diff --git a/oer/courses/c-newcomers/sections/04-supermarket/06-refactor-cashier/meta b/oer/courses/c-newcomers/sections/04-supermarket/06-refactor-cashier/meta
new file mode 100644
index 0000000..18474ff
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/04-supermarket/06-refactor-cashier/meta
@@ -0,0 +1 @@
+{"title": "Refactor the Cashier"}
diff --git a/oer/courses/c-newcomers/sections/04-supermarket/06-refactor-cashier/program.c b/oer/courses/c-newcomers/sections/04-supermarket/06-refactor-cashier/program.c
new file mode 100644
index 0000000..b9b5b3b
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/04-supermarket/06-refactor-cashier/program.c
@@ -0,0 +1,80 @@
+#include
+#include
+#include "supermarket.h"
+
+// NOTE: these need to be global now, because the step function needs to edit them.
+bool CustomersLeft = true;
+int TimePassed = 0;
+int NextQueueIndex;
+
+// TODO: define the cashier struct here
+
+// TODO: declare your cashier here as a global variable
+
+// TODO: define the step function here
+
+int main()
+{
+ // NOTE: CustomerQueue is now a global Variable
+ InitCustomerQueue();
+
+ initTimeTable();
+ NextQueueIndex = 0;
+
+ // TODO: move this to the cashier struct
+ //-----
+ int TimeToScan = 0;
+ state CurrentState = STATE_ready_for_customer;
+ int CurrentCustomer = 0;
+ int CurrentItemIndex;
+ //-----
+
+ // NOTE: we change the program to compute ItemsLeft instead of keeping it in a varriable
+ while(CustomersLeft)
+ {
+ // TODO: refactor this code to the step function
+ if(CurrentState == STATE_ready_for_item)
+ {
+ if(CurrentItemIndex < CUSTOMER_ITEM_COUNT)
+ {
+ item CurrentItem = CustomerQueue[CurrentCustomer].Items[CurrentItemIndex];
+
+ TimeToScan = Time[CurrentItem] + CustomerQueue[CurrentCustomer].PackingSpeed;
+ CurrentState = STATE_scanning;
+ }
+ else
+ {
+ CurrentState = STATE_ready_for_customer;
+ }
+ }
+ else if (CurrentState == STATE_scanning)
+ {
+ TimePassed ++;
+ TimeToScan --;
+
+ if (TimeToScan == 0)
+ {
+ CurrentItemIndex++;
+ CurrentState = STATE_ready_for_item;
+ printf("Time since start: %ds. Scanned product %d. %d to go.\n",
+ TimePassed, CurrentItemIndex,
+ CUSTOMER_ITEM_COUNT-CurrentItemIndex);
+ }
+
+ }
+ else
+ {
+ if(NextQueueIndex < 3)
+ {
+ CurrentCustomer = NextQueueIndex++;
+ CurrentState = STATE_ready_for_item;
+ CurrentItemIndex = 0;
+ printf("Currently serving customer %d.\n", CurrentCustomer);
+ }
+ else
+ {
+ CustomersLeft = false;
+ }
+ }
+ }
+}
diff --git a/oer/courses/c-newcomers/sections/04-supermarket/06-refactor-cashier/regex b/oer/courses/c-newcomers/sections/04-supermarket/06-refactor-cashier/regex
new file mode 100644
index 0000000..c851b70
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/04-supermarket/06-refactor-cashier/regex
@@ -0,0 +1 @@
+^.*customer 0(.*\n){6}.*customer 1(.*\n){6}.*customer 2(.*\n){5}Time since start: 131..*0 to go.$
\ No newline at end of file
diff --git a/oer/courses/c-newcomers/sections/04-supermarket/06-refactor-cashier/supermarket.h b/oer/courses/c-newcomers/sections/04-supermarket/06-refactor-cashier/supermarket.h
new file mode 100644
index 0000000..410a8bf
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/04-supermarket/06-refactor-cashier/supermarket.h
@@ -0,0 +1,65 @@
+typedef enum
+{
+ STATE_ready_for_item,
+ STATE_ready_for_customer,
+ STATE_scanning,
+ STATE_finished,
+}state;
+
+typedef enum
+{
+ tissues,
+ pasta,
+ tomato_sauce,
+ bread,
+ butter,
+ batteries,
+ toothbrush,
+
+ ITEM_TYPE_COUNT,
+}item;
+
+item Time[ITEM_TYPE_COUNT];
+
+void initTimeTable()
+{
+ Time[tissues] = 1;
+ Time[pasta] = 2;
+ Time[tomato_sauce] = 3;
+ Time[bread] = 10;
+ Time[butter] = 2;
+ Time[batteries] = 2;
+ Time[toothbrush] = 1;
+}
+#define CUSTOMER_ITEM_COUNT 5
+typedef struct
+{
+ item Items[CUSTOMER_ITEM_COUNT];
+ int PackingSpeed;
+}customer;
+
+customer CustomerQueue[3];
+void InitCustomerQueue()
+{
+ CustomerQueue[0].Items[0] = tissues;
+ CustomerQueue[0].Items[1] = pasta;
+ CustomerQueue[0].Items[2] = tomato_sauce;
+ CustomerQueue[0].Items[3] = bread;
+ CustomerQueue[0].Items[4] = butter;
+ CustomerQueue[0].PackingSpeed = 2;
+
+ CustomerQueue[1].Items[0] = toothbrush;
+ CustomerQueue[1].Items[1] = batteries;
+ CustomerQueue[1].Items[2] = bread;
+ CustomerQueue[1].Items[3] = bread;
+ CustomerQueue[1].Items[4] = butter;
+ CustomerQueue[1].PackingSpeed = 3;
+
+ CustomerQueue[2].Items[0] = bread;
+ CustomerQueue[2].Items[1] = batteries;
+ CustomerQueue[2].Items[2] = tomato_sauce;
+ CustomerQueue[2].Items[3] = pasta;
+ CustomerQueue[2].Items[4] = tissues;
+ CustomerQueue[2].PackingSpeed = 9;
+
+}
diff --git a/oer/courses/c-newcomers/sections/04-supermarket/06-refactor-cashier/type b/oer/courses/c-newcomers/sections/04-supermarket/06-refactor-cashier/type
new file mode 100644
index 0000000..7d393ec
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/04-supermarket/06-refactor-cashier/type
@@ -0,0 +1 @@
+program/match-regex
diff --git a/oer/courses/c-newcomers/sections/04-supermarket/07-multiple-cashiers/Makefile b/oer/courses/c-newcomers/sections/04-supermarket/07-multiple-cashiers/Makefile
new file mode 100644
index 0000000..1f05f47
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/04-supermarket/07-multiple-cashiers/Makefile
@@ -0,0 +1,4 @@
+all:
+ gcc program.c -o program
+clean:
+ rm -f program
diff --git a/oer/courses/c-newcomers/sections/04-supermarket/07-multiple-cashiers/content.md b/oer/courses/c-newcomers/sections/04-supermarket/07-multiple-cashiers/content.md
new file mode 100644
index 0000000..a87022e
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/04-supermarket/07-multiple-cashiers/content.md
@@ -0,0 +1,5 @@
+Now to the seccond step. Instead of one cashier we want to make 2 cashiers.
+For that we need an array, which holds the cashiers and we need to change
+the step function to work on said array.
+
+Your task is to do exactly that.
\ No newline at end of file
diff --git a/oer/courses/c-newcomers/sections/04-supermarket/07-multiple-cashiers/meta b/oer/courses/c-newcomers/sections/04-supermarket/07-multiple-cashiers/meta
new file mode 100644
index 0000000..2e483e4
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/04-supermarket/07-multiple-cashiers/meta
@@ -0,0 +1 @@
+{"title": "Multiple Cashiers"}
diff --git a/oer/courses/c-newcomers/sections/04-supermarket/07-multiple-cashiers/program.c b/oer/courses/c-newcomers/sections/04-supermarket/07-multiple-cashiers/program.c
new file mode 100644
index 0000000..e059704
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/04-supermarket/07-multiple-cashiers/program.c
@@ -0,0 +1,93 @@
+#include
+#include
+#include "supermarket.h"
+
+int FinishedCashiers = 0;
+int TimePassed = 0;
+int NextQueueIndex;
+
+typedef struct
+{
+ state CurrentState;
+ int CurrentCustomer;
+ int CurrentItemIndex;
+
+ int TimeToScan;
+}cashier;
+
+// TODO: Change this number to 2 after you changed the step function
+#define CASHIER_COUNT 1
+
+// TODO: Changes this to an array of 2 cashiers
+cashier Cashier = {STATE_ready_for_customer, 0, 0, 0};
+
+// TODO: Changes this to use the index of the cashier
+void step(int Index)
+{
+ if(Cashier.CurrentState == STATE_ready_for_item)
+ {
+ if(Cashier.CurrentItemIndex < CUSTOMER_ITEM_COUNT)
+ {
+ item CurrentItem = CustomerQueue[Cashier.CurrentCustomer].Items[Cashier.CurrentItemIndex];
+ Cashier.TimeToScan = Time[CurrentItem] + CustomerQueue[Cashier.CurrentCustomer].PackingSpeed;
+ Cashier.CurrentState = STATE_scanning;
+ }
+ else
+ {
+ Cashier.CurrentState = STATE_ready_for_customer;
+ }
+ }
+ else if (Cashier.CurrentState == STATE_scanning)
+ {
+ Cashier.TimeToScan --;
+ if (Cashier.TimeToScan == 0)
+ {
+ Cashier.CurrentItemIndex++;
+ Cashier.CurrentState = STATE_ready_for_item;
+ printf("Time since start: %ds. Cashier %d scanned product %d. %d to go.\n",
+ TimePassed, Index, Cashier.CurrentItemIndex,
+ CUSTOMER_ITEM_COUNT-Cashier.CurrentItemIndex);
+ }
+ }
+ else if (Cashier.CurrentState == STATE_ready_for_customer)
+ {
+ if(NextQueueIndex < 3)
+ {
+ Cashier.CurrentCustomer = NextQueueIndex++;
+ Cashier.CurrentState = STATE_ready_for_item;
+ Cashier.CurrentItemIndex = 0;
+ printf("Cashier %d currently serving customer %d.\n", Index, Cashier.CurrentCustomer);
+ }
+ else
+ {
+ // NOTE: Counting up when Cashier is done and there is no more
+ // customer to serve
+ FinishedCashiers++;
+
+ // NOTE: we added a State for when the cashier is done
+ Cashier.CurrentState = STATE_finished;
+ }
+ }
+}
+
+int main()
+{
+ InitCustomerQueue();
+
+ initTimeTable();
+ NextQueueIndex = 0;
+
+ // NOTE: we now need to wait until all cashiers are done
+ while(FinishedCashiers < CASHIER_COUNT)
+ {
+ // TODO: loop over all cashiers
+ step(0);
+
+ //---------------------------------
+
+ // NOTE: this gives us slightly diffrent numbers,
+ // because we are now also counting state changes.
+ // You could change that. It just would make the program more complex.
+ TimePassed ++;
+ }
+}
diff --git a/oer/courses/c-newcomers/sections/04-supermarket/07-multiple-cashiers/regex b/oer/courses/c-newcomers/sections/04-supermarket/07-multiple-cashiers/regex
new file mode 100644
index 0000000..4ae6aeb
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/04-supermarket/07-multiple-cashiers/regex
@@ -0,0 +1 @@
+^(.*\n)*Cashier 0(.*\n)*Cashier 1.*\n(.*\n)*.*103s.*$
\ No newline at end of file
diff --git a/oer/courses/c-newcomers/sections/04-supermarket/07-multiple-cashiers/supermarket.h b/oer/courses/c-newcomers/sections/04-supermarket/07-multiple-cashiers/supermarket.h
new file mode 100644
index 0000000..410a8bf
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/04-supermarket/07-multiple-cashiers/supermarket.h
@@ -0,0 +1,65 @@
+typedef enum
+{
+ STATE_ready_for_item,
+ STATE_ready_for_customer,
+ STATE_scanning,
+ STATE_finished,
+}state;
+
+typedef enum
+{
+ tissues,
+ pasta,
+ tomato_sauce,
+ bread,
+ butter,
+ batteries,
+ toothbrush,
+
+ ITEM_TYPE_COUNT,
+}item;
+
+item Time[ITEM_TYPE_COUNT];
+
+void initTimeTable()
+{
+ Time[tissues] = 1;
+ Time[pasta] = 2;
+ Time[tomato_sauce] = 3;
+ Time[bread] = 10;
+ Time[butter] = 2;
+ Time[batteries] = 2;
+ Time[toothbrush] = 1;
+}
+#define CUSTOMER_ITEM_COUNT 5
+typedef struct
+{
+ item Items[CUSTOMER_ITEM_COUNT];
+ int PackingSpeed;
+}customer;
+
+customer CustomerQueue[3];
+void InitCustomerQueue()
+{
+ CustomerQueue[0].Items[0] = tissues;
+ CustomerQueue[0].Items[1] = pasta;
+ CustomerQueue[0].Items[2] = tomato_sauce;
+ CustomerQueue[0].Items[3] = bread;
+ CustomerQueue[0].Items[4] = butter;
+ CustomerQueue[0].PackingSpeed = 2;
+
+ CustomerQueue[1].Items[0] = toothbrush;
+ CustomerQueue[1].Items[1] = batteries;
+ CustomerQueue[1].Items[2] = bread;
+ CustomerQueue[1].Items[3] = bread;
+ CustomerQueue[1].Items[4] = butter;
+ CustomerQueue[1].PackingSpeed = 3;
+
+ CustomerQueue[2].Items[0] = bread;
+ CustomerQueue[2].Items[1] = batteries;
+ CustomerQueue[2].Items[2] = tomato_sauce;
+ CustomerQueue[2].Items[3] = pasta;
+ CustomerQueue[2].Items[4] = tissues;
+ CustomerQueue[2].PackingSpeed = 9;
+
+}
diff --git a/oer/courses/c-newcomers/sections/04-supermarket/07-multiple-cashiers/type b/oer/courses/c-newcomers/sections/04-supermarket/07-multiple-cashiers/type
new file mode 100644
index 0000000..7d393ec
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/04-supermarket/07-multiple-cashiers/type
@@ -0,0 +1 @@
+program/match-regex
diff --git a/oer/courses/c-newcomers/sections/04-supermarket/section b/oer/courses/c-newcomers/sections/04-supermarket/section
new file mode 100644
index 0000000..9e3a7e4
--- /dev/null
+++ b/oer/courses/c-newcomers/sections/04-supermarket/section
@@ -0,0 +1 @@
+{"title": "Supermarket", "description": "Simulate cashiers and customers"}
diff --git a/oer/courses/c-openmp/meta b/oer/courses/c-openmp/meta
new file mode 100644
index 0000000..a107d5f
--- /dev/null
+++ b/oer/courses/c-openmp/meta
@@ -0,0 +1 @@
+{"title": "OpenMP", "description": "A quick introduction to OpenMP. A basic understanding of C is a requirment for this course."}
diff --git a/oer/courses/c-openmp/sections/01-introduction/00-parallel/Makefile b/oer/courses/c-openmp/sections/01-introduction/00-parallel/Makefile
new file mode 100644
index 0000000..8bdb4e3
--- /dev/null
+++ b/oer/courses/c-openmp/sections/01-introduction/00-parallel/Makefile
@@ -0,0 +1,5 @@
+
+all:
+ gcc -fopenmp -lrt --std=c99 program.c -o program
+clean:
+ rm -f program
diff --git a/oer/courses/c-openmp/sections/01-introduction/00-parallel/content.md b/oer/courses/c-openmp/sections/01-introduction/00-parallel/content.md
new file mode 100644
index 0000000..51e90c9
--- /dev/null
+++ b/oer/courses/c-openmp/sections/01-introduction/00-parallel/content.md
@@ -0,0 +1,12 @@
+OpenMP is a parallelization framework that allows the programmer to easily do thread-level parallelization.
+It provides simple compiler directives, with which you mark up the parts of the code, which you want to execute in parallel.
+
+## Knowledge
+
+The simplest compiler directive is the ``#pragma omp parallel``, which opens a parallel region, where the same code is executed on all threads.
+You can find all the important directives in the [quick reference](http://openmp.org/mp-documents/OpenMP3.1-CCard.pdf).
+Additional details can be found in the full [OpenMP specification](http://www.openmp.org/mp-documents/OpenMP3.1.pdf). For details on OpenMP compiler directives see section 2.
+
+## Task
+
+Use the omp parallel pragma to print the thread number of multiple threads.
diff --git a/oer/courses/c-openmp/sections/01-introduction/00-parallel/meta b/oer/courses/c-openmp/sections/01-introduction/00-parallel/meta
new file mode 100644
index 0000000..210a30b
--- /dev/null
+++ b/oer/courses/c-openmp/sections/01-introduction/00-parallel/meta
@@ -0,0 +1 @@
+{"title": "Hello World!"}
diff --git a/oer/courses/c-openmp/sections/01-introduction/00-parallel/program b/oer/courses/c-openmp/sections/01-introduction/00-parallel/program
new file mode 100755
index 0000000..bb7a1d9
Binary files /dev/null and b/oer/courses/c-openmp/sections/01-introduction/00-parallel/program differ
diff --git a/oer/courses/c-openmp/sections/01-introduction/00-parallel/program.c b/oer/courses/c-openmp/sections/01-introduction/00-parallel/program.c
new file mode 100644
index 0000000..3c6a8db
--- /dev/null
+++ b/oer/courses/c-openmp/sections/01-introduction/00-parallel/program.c
@@ -0,0 +1,13 @@
+#include
+#include
+#include
+#include
+
+int main(int argc, const char *argv[])
+{
+ // To execute the code in parallel insert the omp parallel pragma below:
+
+ printf("Hello World from thread: %d\n", omp_get_thread_num());
+
+ return 0;
+}
diff --git a/oer/courses/c-openmp/sections/01-introduction/00-parallel/regex b/oer/courses/c-openmp/sections/01-introduction/00-parallel/regex
new file mode 100644
index 0000000..76333a0
--- /dev/null
+++ b/oer/courses/c-openmp/sections/01-introduction/00-parallel/regex
@@ -0,0 +1 @@
+(Hello World from thread: \d\n){2,}
diff --git a/oer/courses/c-openmp/sections/01-introduction/00-parallel/solution.c b/oer/courses/c-openmp/sections/01-introduction/00-parallel/solution.c
new file mode 100644
index 0000000..e1ee048
--- /dev/null
+++ b/oer/courses/c-openmp/sections/01-introduction/00-parallel/solution.c
@@ -0,0 +1,13 @@
+#include
+#include
+#include
+#include
+
+int main(int argc, const char *argv[])
+{
+ // To execute the code in parallel insert the omp parallel pragma below:
+ #pragma omp parallel
+ printf("Hello World from thread: %d\n", omp_get_thread_num());
+
+ return 0;
+}
diff --git a/oer/courses/c-openmp/sections/01-introduction/00-parallel/type b/oer/courses/c-openmp/sections/01-introduction/00-parallel/type
new file mode 100644
index 0000000..7d393ec
--- /dev/null
+++ b/oer/courses/c-openmp/sections/01-introduction/00-parallel/type
@@ -0,0 +1 @@
+program/match-regex
diff --git a/oer/courses/c-openmp/sections/01-introduction/01-numthreads/Makefile b/oer/courses/c-openmp/sections/01-introduction/01-numthreads/Makefile
new file mode 100644
index 0000000..8bdb4e3
--- /dev/null
+++ b/oer/courses/c-openmp/sections/01-introduction/01-numthreads/Makefile
@@ -0,0 +1,5 @@
+
+all:
+ gcc -fopenmp -lrt --std=c99 program.c -o program
+clean:
+ rm -f program
diff --git a/oer/courses/c-openmp/sections/01-introduction/01-numthreads/a.out b/oer/courses/c-openmp/sections/01-introduction/01-numthreads/a.out
new file mode 100755
index 0000000..6d3f33b
Binary files /dev/null and b/oer/courses/c-openmp/sections/01-introduction/01-numthreads/a.out differ
diff --git a/oer/courses/c-openmp/sections/01-introduction/01-numthreads/content.md b/oer/courses/c-openmp/sections/01-introduction/01-numthreads/content.md
new file mode 100644
index 0000000..08acc12
--- /dev/null
+++ b/oer/courses/c-openmp/sections/01-introduction/01-numthreads/content.md
@@ -0,0 +1,11 @@
+In this exercise you learn how to specify the number of threads.
+
+## Knowledge
+
+Many of the omp directives can be further specified by clauses. Among others you can specify shared variables or private ones.
+With the clause ``num_threads()`` you can tell the compiler, how many threads are supposed to run the code.
+To find out which clauses can be used with each directive, check the [quick reference](http://openmp.org/mp-documents/OpenMP3.1-CCard.pdf).
+
+## Task
+
+Run the code on 7 different threads.
\ No newline at end of file
diff --git a/oer/courses/c-openmp/sections/01-introduction/01-numthreads/meta b/oer/courses/c-openmp/sections/01-introduction/01-numthreads/meta
new file mode 100644
index 0000000..ade798c
--- /dev/null
+++ b/oer/courses/c-openmp/sections/01-introduction/01-numthreads/meta
@@ -0,0 +1 @@
+{"title": "Thread Numbers"}
diff --git a/oer/courses/c-openmp/sections/01-introduction/01-numthreads/program b/oer/courses/c-openmp/sections/01-introduction/01-numthreads/program
new file mode 100755
index 0000000..76f7838
Binary files /dev/null and b/oer/courses/c-openmp/sections/01-introduction/01-numthreads/program differ
diff --git a/oer/courses/c-openmp/sections/01-introduction/01-numthreads/program.c b/oer/courses/c-openmp/sections/01-introduction/01-numthreads/program.c
new file mode 100644
index 0000000..e6289b7
--- /dev/null
+++ b/oer/courses/c-openmp/sections/01-introduction/01-numthreads/program.c
@@ -0,0 +1,11 @@
+#include
+#include
+
+int main(int argc, const char *argv[])
+{
+ // TODO: parallelize this in 7 threads:
+ #pragma omp parallel
+ printf("Thread: %d\n", omp_get_thread_num());
+
+ return 0;
+}
diff --git a/oer/courses/c-openmp/sections/01-introduction/01-numthreads/regex b/oer/courses/c-openmp/sections/01-introduction/01-numthreads/regex
new file mode 100644
index 0000000..c9a3078
--- /dev/null
+++ b/oer/courses/c-openmp/sections/01-introduction/01-numthreads/regex
@@ -0,0 +1 @@
+^(Thread: \d\n){7}$
diff --git a/oer/courses/c-openmp/sections/01-introduction/01-numthreads/solution.c b/oer/courses/c-openmp/sections/01-introduction/01-numthreads/solution.c
new file mode 100644
index 0000000..eb7a2ca
--- /dev/null
+++ b/oer/courses/c-openmp/sections/01-introduction/01-numthreads/solution.c
@@ -0,0 +1,22 @@
+#include
+#include
+#include
+
+void workload()
+{
+ // We are simulating a workload by sleeping the thread
+ // This is obviously not an accurate representation
+ // of real computation, but it works for this example
+ sleep(1);
+}
+
+int main(int argc, const char *argv[])
+{
+ // TODO: parallelize this:
+ #pragma omp parallel num_threads(7)
+ #pragma omp for
+ for (int i = 0; i<10; i++) {
+ printf("Iteration %d in thread: %d\n", i, omp_get_thread_num());
+ }
+ return 0;
+}
diff --git a/oer/courses/c-openmp/sections/01-introduction/01-numthreads/type b/oer/courses/c-openmp/sections/01-introduction/01-numthreads/type
new file mode 100644
index 0000000..7d393ec
--- /dev/null
+++ b/oer/courses/c-openmp/sections/01-introduction/01-numthreads/type
@@ -0,0 +1 @@
+program/match-regex
diff --git a/oer/courses/c-openmp/sections/01-introduction/01-parallel-for/Makefile b/oer/courses/c-openmp/sections/01-introduction/01-parallel-for/Makefile
new file mode 100644
index 0000000..8bdb4e3
--- /dev/null
+++ b/oer/courses/c-openmp/sections/01-introduction/01-parallel-for/Makefile
@@ -0,0 +1,5 @@
+
+all:
+ gcc -fopenmp -lrt --std=c99 program.c -o program
+clean:
+ rm -f program
diff --git a/oer/courses/c-openmp/sections/01-introduction/01-parallel-for/content.md b/oer/courses/c-openmp/sections/01-introduction/01-parallel-for/content.md
new file mode 100644
index 0000000..54db812
--- /dev/null
+++ b/oer/courses/c-openmp/sections/01-introduction/01-parallel-for/content.md
@@ -0,0 +1,12 @@
+For this exercise, we are using a simulated workload to see the effect of distributing it to different threads.
+
+## Knowledge
+In this case we have a simple for-loop. If we would leave the code as is, each thread would just do the same work.
+But we want to increase the speed by distributing the workload among the threads.
+To do that, we have to tell the compiler with the directive ``#pragma omp for``, that the for loop should be split up
+and each thread just does one part of the range.
+
+## Task
+
+Parrallelize the loop such that the workload is shared among all threads!
+You will notice an increase in performance. The time measured time is wall-clock time, meaning the real world time that elapsed during the computation.
diff --git a/oer/courses/c-openmp/sections/01-introduction/01-parallel-for/meta b/oer/courses/c-openmp/sections/01-introduction/01-parallel-for/meta
new file mode 100644
index 0000000..0bf2017
--- /dev/null
+++ b/oer/courses/c-openmp/sections/01-introduction/01-parallel-for/meta
@@ -0,0 +1 @@
+{"title": "For Loops"}
diff --git a/oer/courses/c-openmp/sections/01-introduction/01-parallel-for/program.c b/oer/courses/c-openmp/sections/01-introduction/01-parallel-for/program.c
new file mode 100644
index 0000000..bce81b2
--- /dev/null
+++ b/oer/courses/c-openmp/sections/01-introduction/01-parallel-for/program.c
@@ -0,0 +1,38 @@
+#include
+#include
+#include
+#include
+
+void workload()
+{
+ // We are simulating a workload by sleeping the thread
+ // This is obviously not an accurate representation
+ // of real computation, but it works for this example
+ usleep(100000);
+}
+
+int main(int argc, const char *argv[])
+{
+ // this sets the default number of threads to 5
+ // you can still overwrite the number of threads used in a parallel region with a clause
+ omp_set_num_threads(5);
+
+ // We use openMP functions to measure our programs run time.
+ double start = omp_get_wtime();
+
+ #pragma omp parallel
+ {
+ // A for loop inside a parallel section can be parallelized using
+ // the for directive
+ // TODO: Share the workload of the loop below among all threads
+ for (int i = 0; i<10; i++) {
+ workload();
+ printf("Iteration %d in thread: %d\n", i, omp_get_thread_num());
+ }
+ }
+
+ double end = omp_get_wtime();
+ printf("That took a total of %f seconds.\n", end - start);
+
+ return 0;
+}
diff --git a/oer/courses/c-openmp/sections/01-introduction/01-parallel-for/regex b/oer/courses/c-openmp/sections/01-introduction/01-parallel-for/regex
new file mode 100644
index 0000000..bac3232
--- /dev/null
+++ b/oer/courses/c-openmp/sections/01-introduction/01-parallel-for/regex
@@ -0,0 +1 @@
+That took a total of 0\.2.*
diff --git a/oer/courses/c-openmp/sections/01-introduction/01-parallel-for/solution.c b/oer/courses/c-openmp/sections/01-introduction/01-parallel-for/solution.c
new file mode 100644
index 0000000..eb7a2ca
--- /dev/null
+++ b/oer/courses/c-openmp/sections/01-introduction/01-parallel-for/solution.c
@@ -0,0 +1,22 @@
+#include
+#include
+#include
+
+void workload()
+{
+ // We are simulating a workload by sleeping the thread
+ // This is obviously not an accurate representation
+ // of real computation, but it works for this example
+ sleep(1);
+}
+
+int main(int argc, const char *argv[])
+{
+ // TODO: parallelize this:
+ #pragma omp parallel num_threads(7)
+ #pragma omp for
+ for (int i = 0; i<10; i++) {
+ printf("Iteration %d in thread: %d\n", i, omp_get_thread_num());
+ }
+ return 0;
+}
diff --git a/oer/courses/c-openmp/sections/01-introduction/01-parallel-for/type b/oer/courses/c-openmp/sections/01-introduction/01-parallel-for/type
new file mode 100644
index 0000000..7d393ec
--- /dev/null
+++ b/oer/courses/c-openmp/sections/01-introduction/01-parallel-for/type
@@ -0,0 +1 @@
+program/match-regex
diff --git a/oer/courses/c-openmp/sections/01-introduction/05-private/Makefile b/oer/courses/c-openmp/sections/01-introduction/05-private/Makefile
new file mode 100644
index 0000000..7f6d788
--- /dev/null
+++ b/oer/courses/c-openmp/sections/01-introduction/05-private/Makefile
@@ -0,0 +1,6 @@
+
+all:
+ gcc -fopenmp -lm --std=gnu99 program.c -o program
+
+clean:
+ rm -f program
diff --git a/oer/courses/c-openmp/sections/01-introduction/05-private/content.md b/oer/courses/c-openmp/sections/01-introduction/05-private/content.md
new file mode 100644
index 0000000..b26da5a
--- /dev/null
+++ b/oer/courses/c-openmp/sections/01-introduction/05-private/content.md
@@ -0,0 +1,11 @@
+We want each of the two threads in the code below to print the numbers from 5-10. With the current code this is not working as both threads use the same counter in the while loop.
+Sometimes we want each thread to have it's own copy of a variable, when this is desired we can use OpenMPs private clause to give each thread it's own instance.
+
+## Knowledge
+
+To mark a variable as private you add ``private(var1, var2)`` to your directive. Some directive such as the omp for directiv assume certain variables as private by default.
+In the omp for example it is the loop counter. Thats why you didn't had to specify a private varible befor.
+
+## Task
+
+Add a private clause to the code, so that both threads output the numbers 5 to 10.
diff --git a/oer/courses/c-openmp/sections/01-introduction/05-private/meta b/oer/courses/c-openmp/sections/01-introduction/05-private/meta
new file mode 100644
index 0000000..6b7f3d1
--- /dev/null
+++ b/oer/courses/c-openmp/sections/01-introduction/05-private/meta
@@ -0,0 +1 @@
+{"title": "Private Variables"}
diff --git a/oer/courses/c-openmp/sections/01-introduction/05-private/program.c b/oer/courses/c-openmp/sections/01-introduction/05-private/program.c
new file mode 100644
index 0000000..c70ff24
--- /dev/null
+++ b/oer/courses/c-openmp/sections/01-introduction/05-private/program.c
@@ -0,0 +1,24 @@
+#include
+#include
+#include
+
+int main(int argc, const char *argv[])
+{
+ // We use two threads for this exercise
+ omp_set_num_threads(2);
+
+ // The variable is declared outside the parallel section
+ int i;
+
+ // The variable needs to be private to get the full output
+ #pragma omp parallel
+ {
+ i = 5;
+ while(i <= 10) {
+ printf("Iteration %d in thread: %d\n", i, omp_get_thread_num());
+ i++;
+ }
+ }
+
+ return 0;
+}
diff --git a/oer/courses/c-openmp/sections/01-introduction/05-private/regex b/oer/courses/c-openmp/sections/01-introduction/05-private/regex
new file mode 100644
index 0000000..8ddb688
--- /dev/null
+++ b/oer/courses/c-openmp/sections/01-introduction/05-private/regex
@@ -0,0 +1 @@
+(Iteration\s\d+\sin\sthread:\s[01]\n?){12}
diff --git a/oer/courses/c-openmp/sections/01-introduction/05-private/solution.c b/oer/courses/c-openmp/sections/01-introduction/05-private/solution.c
new file mode 100644
index 0000000..997a4fb
--- /dev/null
+++ b/oer/courses/c-openmp/sections/01-introduction/05-private/solution.c
@@ -0,0 +1,24 @@
+#include
+#include
+#include
+
+int main(int argc, const char *argv[])
+{
+ // We use two threads for this exercise
+ omp_set_num_threads(2);
+
+ // The variable is declared outside the parallel section
+ int i;
+
+ // The variable needs to be private to get the full output
+ #pragma omp parallel private(i)
+ {
+ i = 5;
+ while(i <= 10) {
+ printf("Iteration %d in thread: %d\n", i, omp_get_thread_num());
+ i++;
+ }
+ }
+
+ return 0;
+}
diff --git a/oer/courses/c-openmp/sections/01-introduction/05-private/type b/oer/courses/c-openmp/sections/01-introduction/05-private/type
new file mode 100644
index 0000000..7d393ec
--- /dev/null
+++ b/oer/courses/c-openmp/sections/01-introduction/05-private/type
@@ -0,0 +1 @@
+program/match-regex
diff --git a/oer/courses/c-openmp/sections/01-introduction/section b/oer/courses/c-openmp/sections/01-introduction/section
new file mode 100644
index 0000000..19363f4
--- /dev/null
+++ b/oer/courses/c-openmp/sections/01-introduction/section
@@ -0,0 +1 @@
+{"title": "Introduction", "description": "Basic constructs of OpenMP."}
diff --git a/oer/courses/c-openmp/sections/02-advanced/02-add/Makefile b/oer/courses/c-openmp/sections/02-advanced/02-add/Makefile
new file mode 100644
index 0000000..bbde708
--- /dev/null
+++ b/oer/courses/c-openmp/sections/02-advanced/02-add/Makefile
@@ -0,0 +1,6 @@
+
+all:
+ gcc -fopenmp -lm --std=c99 program.c -o program
+
+clean:
+ rm -f program
diff --git a/oer/courses/c-openmp/sections/02-advanced/02-add/content.md b/oer/courses/c-openmp/sections/02-advanced/02-add/content.md
new file mode 100644
index 0000000..e71375e
--- /dev/null
+++ b/oer/courses/c-openmp/sections/02-advanced/02-add/content.md
@@ -0,0 +1,13 @@
+Multiple threads writing to the same variable at the same time lead to data races, which can cause random behaviour depending on, which threads is faster, or
+corrupt your data. To prevent these race conditions we need to lock all outer threads out while one is writing to a shared variable.
+
+## Knowledge
+
+One way of dealing with race conditions are critical sections. Only one thread is allowed in the same critical sections. The others have to wait until the critical section is free again.
+Then the next thread can claim the critical section. You could solve this particular problem more elegantly and we will come back to that, but for now just use critical sections.
+
+To mark a block as a critical section, use the compiler directive ``pragma omp critical``.
+
+## Task
+
+Resolve the race condition with a critical section.
diff --git a/oer/courses/c-openmp/sections/02-advanced/02-add/meta b/oer/courses/c-openmp/sections/02-advanced/02-add/meta
new file mode 100644
index 0000000..59145bf
--- /dev/null
+++ b/oer/courses/c-openmp/sections/02-advanced/02-add/meta
@@ -0,0 +1 @@
+{"title": "Dataraces & Critical Sections"}
diff --git a/oer/courses/c-openmp/sections/02-advanced/02-add/program.c b/oer/courses/c-openmp/sections/02-advanced/02-add/program.c
new file mode 100644
index 0000000..3dc0f8e
--- /dev/null
+++ b/oer/courses/c-openmp/sections/02-advanced/02-add/program.c
@@ -0,0 +1,20 @@
+#include
+#include
+#include
+
+int main(int argc, const char *argv[])
+{
+ int sum = 0;
+
+ // The line below is just shorthand for a
+ // loop directive inside a parallel block
+ #pragma omp parallel for num_threads(2)
+ for (int i = 0; i < 10000; i++) {
+ // TODO: prevent this from causing race conditions
+ // use a critical section
+ sum++;
+ }
+
+ printf("sum: %d\n", sum);
+ return 0;
+}
diff --git a/oer/courses/c-openmp/sections/02-advanced/02-add/regex b/oer/courses/c-openmp/sections/02-advanced/02-add/regex
new file mode 100644
index 0000000..28b74ec
--- /dev/null
+++ b/oer/courses/c-openmp/sections/02-advanced/02-add/regex
@@ -0,0 +1 @@
+sum: 10000
diff --git a/oer/courses/c-openmp/sections/02-advanced/02-add/type b/oer/courses/c-openmp/sections/02-advanced/02-add/type
new file mode 100644
index 0000000..7d393ec
--- /dev/null
+++ b/oer/courses/c-openmp/sections/02-advanced/02-add/type
@@ -0,0 +1 @@
+program/match-regex
diff --git a/oer/courses/c-openmp/sections/02-advanced/03-reduce/Makefile b/oer/courses/c-openmp/sections/02-advanced/03-reduce/Makefile
new file mode 100644
index 0000000..bbde708
--- /dev/null
+++ b/oer/courses/c-openmp/sections/02-advanced/03-reduce/Makefile
@@ -0,0 +1,6 @@
+
+all:
+ gcc -fopenmp -lm --std=c99 program.c -o program
+
+clean:
+ rm -f program
diff --git a/oer/courses/c-openmp/sections/02-advanced/03-reduce/content.md b/oer/courses/c-openmp/sections/02-advanced/03-reduce/content.md
new file mode 100644
index 0000000..0369aaf
--- /dev/null
+++ b/oer/courses/c-openmp/sections/02-advanced/03-reduce/content.md
@@ -0,0 +1,13 @@
+Some race conditions can be resolved by every thread calculating the result in a private variable and combining all the results in the end.
+This is often faster, because it involves less waiting.
+
+## Knowledge
+
+To use the reduction, you have to add the reduction clause ``reduction(operator : var)`` to your compiler directive.
+You can use reductions for a handful of operations. Most of the arithmetic operators and some of the logic and bitwise ones plus min and max.
+For a complete list check the [quick reference](http://www.openmp.org/wp-content/uploads/OpenMP3.1-CCard.pdf).
+Reduction only need to synchronize as often as there are threads instead of how many operations are actually done.
+
+## Task
+
+Instead of using a critical section as before, try your hand at a reduction variable instead.
diff --git a/oer/courses/c-openmp/sections/02-advanced/03-reduce/meta b/oer/courses/c-openmp/sections/02-advanced/03-reduce/meta
new file mode 100644
index 0000000..57e39d3
--- /dev/null
+++ b/oer/courses/c-openmp/sections/02-advanced/03-reduce/meta
@@ -0,0 +1 @@
+{"title": "Reductions"}
diff --git a/oer/courses/c-openmp/sections/02-advanced/03-reduce/program.c b/oer/courses/c-openmp/sections/02-advanced/03-reduce/program.c
new file mode 100644
index 0000000..a763b2d
--- /dev/null
+++ b/oer/courses/c-openmp/sections/02-advanced/03-reduce/program.c
@@ -0,0 +1,16 @@
+#include
+#include
+
+int main(int argc, const char *argv[])
+{
+ int sum = 0;
+
+ // TODO: Use a reduction clause instead to add up the values
+ #pragma omp parallel for num_threads(2)
+ for (int i = 0; i < 10000; i++) {
+ sum++;
+ }
+
+ printf("sum: %d\n", sum);
+ return 0;
+}
diff --git a/oer/courses/c-openmp/sections/02-advanced/03-reduce/regex b/oer/courses/c-openmp/sections/02-advanced/03-reduce/regex
new file mode 100644
index 0000000..28b74ec
--- /dev/null
+++ b/oer/courses/c-openmp/sections/02-advanced/03-reduce/regex
@@ -0,0 +1 @@
+sum: 10000
diff --git a/oer/courses/c-openmp/sections/02-advanced/03-reduce/type b/oer/courses/c-openmp/sections/02-advanced/03-reduce/type
new file mode 100644
index 0000000..7d393ec
--- /dev/null
+++ b/oer/courses/c-openmp/sections/02-advanced/03-reduce/type
@@ -0,0 +1 @@
+program/match-regex
diff --git a/oer/courses/c-openmp/sections/02-advanced/04-atomic/Makefile b/oer/courses/c-openmp/sections/02-advanced/04-atomic/Makefile
new file mode 100644
index 0000000..bbde708
--- /dev/null
+++ b/oer/courses/c-openmp/sections/02-advanced/04-atomic/Makefile
@@ -0,0 +1,6 @@
+
+all:
+ gcc -fopenmp -lm --std=c99 program.c -o program
+
+clean:
+ rm -f program
diff --git a/oer/courses/c-openmp/sections/02-advanced/04-atomic/content.md b/oer/courses/c-openmp/sections/02-advanced/04-atomic/content.md
new file mode 100644
index 0000000..92392ce
--- /dev/null
+++ b/oer/courses/c-openmp/sections/02-advanced/04-atomic/content.md
@@ -0,0 +1,12 @@
+Another synchronization method are atomics.
+
+## Knowledge
+
+Atomics ensure that the marked variables are updated in one step, without any interuptions. That way no other thread can corrupt the data.
+They are not as versatile as critical sections, but if you can use them, they are faster. If you are in a situation, where you can a reduction,
+you should do so, because even though atomics are fast, the less synchronizations of the reductions will still save more time.
+
+## Task
+
+We use the same program as before.
+Use the atomic directive to solve the race condition.
diff --git a/oer/courses/c-openmp/sections/02-advanced/04-atomic/meta b/oer/courses/c-openmp/sections/02-advanced/04-atomic/meta
new file mode 100644
index 0000000..9bf0e13
--- /dev/null
+++ b/oer/courses/c-openmp/sections/02-advanced/04-atomic/meta
@@ -0,0 +1 @@
+{"title": "Atomic Operations"}
diff --git a/oer/courses/c-openmp/sections/02-advanced/04-atomic/program.c b/oer/courses/c-openmp/sections/02-advanced/04-atomic/program.c
new file mode 100644
index 0000000..0c4771a
--- /dev/null
+++ b/oer/courses/c-openmp/sections/02-advanced/04-atomic/program.c
@@ -0,0 +1,17 @@
+#include
+#include
+
+int main(int argc, const char *argv[])
+{
+ int sum = 0;
+ // Use an atomic operation instead to add up the values
+
+ #pragma omp parallel for num_threads(2)
+ for (int i = 0; i < 10000; i++) {
+ sum++;
+ }
+
+ printf("sum: %d\n", sum);
+
+ return 0;
+}
diff --git a/oer/courses/c-openmp/sections/02-advanced/04-atomic/regex b/oer/courses/c-openmp/sections/02-advanced/04-atomic/regex
new file mode 100644
index 0000000..28b74ec
--- /dev/null
+++ b/oer/courses/c-openmp/sections/02-advanced/04-atomic/regex
@@ -0,0 +1 @@
+sum: 10000
diff --git a/oer/courses/c-openmp/sections/02-advanced/04-atomic/solution.c b/oer/courses/c-openmp/sections/02-advanced/04-atomic/solution.c
new file mode 100644
index 0000000..e57faff
--- /dev/null
+++ b/oer/courses/c-openmp/sections/02-advanced/04-atomic/solution.c
@@ -0,0 +1,21 @@
+#include
+#include
+#include
+
+void workload()
+{
+ // We are simulating a workload by sleeping the thread
+ // This is obviously not an accurate representation
+ // of real computation, but it works for this example
+ sleep(1);
+}
+
+int main(int argc, const char *argv[])
+{
+ // TODO: parallelize this:
+ #pragma omp parallel for num_threads(7)
+ for (int i = 0; i<10; i++) {
+ printf("Iteration %d in thread: %d\n", i, omp_get_thread_num());
+ }
+ return 0;
+}
diff --git a/oer/courses/c-openmp/sections/02-advanced/04-atomic/type b/oer/courses/c-openmp/sections/02-advanced/04-atomic/type
new file mode 100644
index 0000000..7d393ec
--- /dev/null
+++ b/oer/courses/c-openmp/sections/02-advanced/04-atomic/type
@@ -0,0 +1 @@
+program/match-regex
diff --git a/oer/courses/c-openmp/sections/02-advanced/07-tasks/Makefile b/oer/courses/c-openmp/sections/02-advanced/07-tasks/Makefile
new file mode 100644
index 0000000..8bdb4e3
--- /dev/null
+++ b/oer/courses/c-openmp/sections/02-advanced/07-tasks/Makefile
@@ -0,0 +1,5 @@
+
+all:
+ gcc -fopenmp -lrt --std=c99 program.c -o program
+clean:
+ rm -f program
diff --git a/oer/courses/c-openmp/sections/02-advanced/07-tasks/content.md b/oer/courses/c-openmp/sections/02-advanced/07-tasks/content.md
new file mode 100644
index 0000000..d32b593
--- /dev/null
+++ b/oer/courses/c-openmp/sections/02-advanced/07-tasks/content.md
@@ -0,0 +1,10 @@
+Task offer an easy way to offload a block of code to another thread, while the main thread can keep going.
+
+## Knowledge
+
+To mark a block of code as a task, use the ``pragma omp task`` directive. The current thread will keep going, while another thread will execute the specified block.
+If you need to be sure that all the task are done before you proceed use the ``pragma omp taskwait`` directive.
+
+## Task
+
+Use task to speed up the code.
\ No newline at end of file
diff --git a/oer/courses/c-openmp/sections/02-advanced/07-tasks/meta b/oer/courses/c-openmp/sections/02-advanced/07-tasks/meta
new file mode 100644
index 0000000..947d54f
--- /dev/null
+++ b/oer/courses/c-openmp/sections/02-advanced/07-tasks/meta
@@ -0,0 +1 @@
+{"title": "Tasks"}
diff --git a/oer/courses/c-openmp/sections/02-advanced/07-tasks/program.c b/oer/courses/c-openmp/sections/02-advanced/07-tasks/program.c
new file mode 100644
index 0000000..978ba28
--- /dev/null
+++ b/oer/courses/c-openmp/sections/02-advanced/07-tasks/program.c
@@ -0,0 +1,30 @@
+#include
+#include
+#include
+#include
+
+void workload()
+{
+ printf("Thread: %d is working on the workload.\n", omp_get_thread_num());
+ sleep(1);
+}
+
+int main(int argc, const char *argv[])
+{
+ double start = omp_get_wtime();
+ omp_set_num_threads(5);
+ // For a task to be actually executed in parallel
+ // it needs to be inside a parallel section
+ #pragma omp parallel
+ // As we only want to create 10 tasks we use a single section
+ #pragma omp single
+ for (int i = 0; i<10; i++) {
+ // TODO: Use a task directive to parallelize the workload
+ workload();
+ }
+
+ double end = omp_get_wtime();
+ printf("That took a total of %f seconds.\n", end - start);
+
+ return 0;
+}
diff --git a/oer/courses/c-openmp/sections/02-advanced/07-tasks/regex b/oer/courses/c-openmp/sections/02-advanced/07-tasks/regex
new file mode 100644
index 0000000..5dd4325
--- /dev/null
+++ b/oer/courses/c-openmp/sections/02-advanced/07-tasks/regex
@@ -0,0 +1 @@
+That took a total of 2\..*
diff --git a/oer/courses/c-openmp/sections/02-advanced/07-tasks/solution.c b/oer/courses/c-openmp/sections/02-advanced/07-tasks/solution.c
new file mode 100644
index 0000000..7c35252
--- /dev/null
+++ b/oer/courses/c-openmp/sections/02-advanced/07-tasks/solution.c
@@ -0,0 +1,30 @@
+#include
+#include
+#include
+#include
+
+void workload()
+{
+ sleep(1);
+}
+
+int main(int argc, const char *argv[])
+{
+ double start = omp_get_wtime();
+ omp_set_num_threads(5);
+ // For a task to be actually executed in parallel
+ // it needs to be inside a parallel section
+ #pragma omp parallel
+ // As we only want to create 10 tasks we use a single section
+ #pragma omp single
+ for (int i = 0; i<10; i++) {
+ // Use a task to parallelize the workload
+ #pragma omp task
+ workload();
+ }
+
+ double end = omp_get_wtime();
+ printf("That took a total of %f seconds.\n", end - start);
+
+ return 0;
+}
diff --git a/oer/courses/c-openmp/sections/02-advanced/07-tasks/type b/oer/courses/c-openmp/sections/02-advanced/07-tasks/type
new file mode 100644
index 0000000..7d393ec
--- /dev/null
+++ b/oer/courses/c-openmp/sections/02-advanced/07-tasks/type
@@ -0,0 +1 @@
+program/match-regex
diff --git a/oer/courses/c-openmp/sections/02-advanced/section b/oer/courses/c-openmp/sections/02-advanced/section
new file mode 100644
index 0000000..7f0c567
--- /dev/null
+++ b/oer/courses/c-openmp/sections/02-advanced/section
@@ -0,0 +1 @@
+{"title": "Further OpenMP Constructs", "description": "Some of the more advanced conecpts of OpenMP."}
diff --git a/oer/courses/c-openmp/sections/03-debugging/01-private/Makefile b/oer/courses/c-openmp/sections/03-debugging/01-private/Makefile
new file mode 100644
index 0000000..7f6d788
--- /dev/null
+++ b/oer/courses/c-openmp/sections/03-debugging/01-private/Makefile
@@ -0,0 +1,6 @@
+
+all:
+ gcc -fopenmp -lm --std=gnu99 program.c -o program
+
+clean:
+ rm -f program
diff --git a/oer/courses/c-openmp/sections/03-debugging/01-private/content.html b/oer/courses/c-openmp/sections/03-debugging/01-private/content.html
new file mode 100644
index 0000000..d7109f7
--- /dev/null
+++ b/oer/courses/c-openmp/sections/03-debugging/01-private/content.html
@@ -0,0 +1,4 @@
+The below Code is expected to just print 42 from both threads. Execute it and see what happens.
+Find out why the code is behaving the way it is and fix the code using an OpenMP clause.
+
+Hint: take a look at the documentation of the private clause.
diff --git a/oer/courses/c-openmp/sections/03-debugging/01-private/meta b/oer/courses/c-openmp/sections/03-debugging/01-private/meta
new file mode 100644
index 0000000..6b7f3d1
--- /dev/null
+++ b/oer/courses/c-openmp/sections/03-debugging/01-private/meta
@@ -0,0 +1 @@
+{"title": "Private Variables"}
diff --git a/oer/courses/c-openmp/sections/03-debugging/01-private/program.c b/oer/courses/c-openmp/sections/03-debugging/01-private/program.c
new file mode 100644
index 0000000..291cdd4
--- /dev/null
+++ b/oer/courses/c-openmp/sections/03-debugging/01-private/program.c
@@ -0,0 +1,18 @@
+#include
+#include
+#include
+
+int main(int argc, const char *argv[])
+{
+ omp_set_num_threads(2);
+
+ int value = 42;
+ // Suppose we want value to be a private variable
+ // The code inside the parallel section should print 42
+ #pragma omp parallel private(value)
+ {
+ printf("Value: %d\n", value);
+ }
+
+ return 0;
+}
diff --git a/oer/courses/c-openmp/sections/03-debugging/01-private/regex b/oer/courses/c-openmp/sections/03-debugging/01-private/regex
new file mode 100644
index 0000000..18f504a
--- /dev/null
+++ b/oer/courses/c-openmp/sections/03-debugging/01-private/regex
@@ -0,0 +1 @@
+(Value: 42\n){2,}
diff --git a/oer/courses/c-openmp/sections/03-debugging/01-private/solution.c b/oer/courses/c-openmp/sections/03-debugging/01-private/solution.c
new file mode 100644
index 0000000..997a4fb
--- /dev/null
+++ b/oer/courses/c-openmp/sections/03-debugging/01-private/solution.c
@@ -0,0 +1,24 @@
+#include
+#include
+#include
+
+int main(int argc, const char *argv[])
+{
+ // We use two threads for this exercise
+ omp_set_num_threads(2);
+
+ // The variable is declared outside the parallel section
+ int i;
+
+ // The variable needs to be private to get the full output
+ #pragma omp parallel private(i)
+ {
+ i = 5;
+ while(i <= 10) {
+ printf("Iteration %d in thread: %d\n", i, omp_get_thread_num());
+ i++;
+ }
+ }
+
+ return 0;
+}
diff --git a/oer/courses/c-openmp/sections/03-debugging/01-private/type b/oer/courses/c-openmp/sections/03-debugging/01-private/type
new file mode 100644
index 0000000..7d393ec
--- /dev/null
+++ b/oer/courses/c-openmp/sections/03-debugging/01-private/type
@@ -0,0 +1 @@
+program/match-regex
diff --git a/oer/courses/c-openmp/sections/03-debugging/02-race/Makefile b/oer/courses/c-openmp/sections/03-debugging/02-race/Makefile
new file mode 100644
index 0000000..7f6d788
--- /dev/null
+++ b/oer/courses/c-openmp/sections/03-debugging/02-race/Makefile
@@ -0,0 +1,6 @@
+
+all:
+ gcc -fopenmp -lm --std=gnu99 program.c -o program
+
+clean:
+ rm -f program
diff --git a/oer/courses/c-openmp/sections/03-debugging/02-race/content.html b/oer/courses/c-openmp/sections/03-debugging/02-race/content.html
new file mode 100644
index 0000000..1528421
--- /dev/null
+++ b/oer/courses/c-openmp/sections/03-debugging/02-race/content.html
@@ -0,0 +1,3 @@
+Some mistake snuck into the code below: it should output the number 168 with each execution but instead it mostly returns numbers just below 168.
+
+Use one of the constructs you learned about in our introduction section.
diff --git a/oer/courses/c-openmp/sections/03-debugging/02-race/meta b/oer/courses/c-openmp/sections/03-debugging/02-race/meta
new file mode 100644
index 0000000..0693a77
--- /dev/null
+++ b/oer/courses/c-openmp/sections/03-debugging/02-race/meta
@@ -0,0 +1 @@
+{"title": "Primes!"}
diff --git a/oer/courses/c-openmp/sections/03-debugging/02-race/program.c b/oer/courses/c-openmp/sections/03-debugging/02-race/program.c
new file mode 100644
index 0000000..5b982c8
--- /dev/null
+++ b/oer/courses/c-openmp/sections/03-debugging/02-race/program.c
@@ -0,0 +1,28 @@
+#include
+#include
+#include
+#include
+
+bool is_prime(int num) {
+ for (int i = 2; i < num; i++) {
+ if (num % i == 0) {
+ return false;
+ }
+ }
+ return true;
+}
+
+int main(int argc, const char *argv[])
+{
+ int num_primes = 0;
+
+ #pragma omp parallel for
+ for (int i = 2; i < 1000; i++)
+ {
+ if (is_prime(i))
+ num_primes++;
+ }
+
+ printf("Number of primes: %d\n", num_primes);
+ return 0;
+}
diff --git a/oer/courses/c-openmp/sections/03-debugging/02-race/regex b/oer/courses/c-openmp/sections/03-debugging/02-race/regex
new file mode 100644
index 0000000..2ab88ea
--- /dev/null
+++ b/oer/courses/c-openmp/sections/03-debugging/02-race/regex
@@ -0,0 +1 @@
+Number of primes: 168
diff --git a/oer/courses/c-openmp/sections/03-debugging/02-race/solution.c b/oer/courses/c-openmp/sections/03-debugging/02-race/solution.c
new file mode 100644
index 0000000..85654a2
--- /dev/null
+++ b/oer/courses/c-openmp/sections/03-debugging/02-race/solution.c
@@ -0,0 +1,29 @@
+#include
+#include
+#include
+#include
+
+bool is_prime(int num) {
+ for (int i = 2; i < num; i++) {
+ if (num % i == 0) {
+ return false;
+ }
+ }
+ return true;
+}
+
+int main(int argc, const char *argv[])
+{
+ int num_primes = 0;
+
+ #pragma omp parallel for
+ for (int i = 2; i < 1000; i++)
+ {
+ if (is_prime(i))
+ #pragma omp atomic
+ num_primes++;
+ }
+
+ printf("Number of primes: %d\n", num_primes);
+ return 0;
+}
diff --git a/oer/courses/c-openmp/sections/03-debugging/02-race/type b/oer/courses/c-openmp/sections/03-debugging/02-race/type
new file mode 100644
index 0000000..7d393ec
--- /dev/null
+++ b/oer/courses/c-openmp/sections/03-debugging/02-race/type
@@ -0,0 +1 @@
+program/match-regex
diff --git a/oer/courses/c-openmp/sections/03-debugging/03-shared/Makefile b/oer/courses/c-openmp/sections/03-debugging/03-shared/Makefile
new file mode 100644
index 0000000..7f6d788
--- /dev/null
+++ b/oer/courses/c-openmp/sections/03-debugging/03-shared/Makefile
@@ -0,0 +1,6 @@
+
+all:
+ gcc -fopenmp -lm --std=gnu99 program.c -o program
+
+clean:
+ rm -f program
diff --git a/oer/courses/c-openmp/sections/03-debugging/03-shared/content.html b/oer/courses/c-openmp/sections/03-debugging/03-shared/content.html
new file mode 100644
index 0000000..ec98ccc
--- /dev/null
+++ b/oer/courses/c-openmp/sections/03-debugging/03-shared/content.html
@@ -0,0 +1 @@
+We just want to print the numbers from one to five in each thread, for some reason we don't get them all. What is the reason, how can we fix this?
diff --git a/oer/courses/c-openmp/sections/03-debugging/03-shared/meta b/oer/courses/c-openmp/sections/03-debugging/03-shared/meta
new file mode 100644
index 0000000..e642494
--- /dev/null
+++ b/oer/courses/c-openmp/sections/03-debugging/03-shared/meta
@@ -0,0 +1 @@
+{"title": "For Loop"}
diff --git a/oer/courses/c-openmp/sections/03-debugging/03-shared/program.c b/oer/courses/c-openmp/sections/03-debugging/03-shared/program.c
new file mode 100644
index 0000000..17c368a
--- /dev/null
+++ b/oer/courses/c-openmp/sections/03-debugging/03-shared/program.c
@@ -0,0 +1,16 @@
+#include
+#include
+#include
+#include
+
+int main(int argc, const char *argv[])
+{
+ int i;
+ #pragma omp parallel num_threads(2)
+ for (i = 1; i <= 5; i++)
+ {
+ printf("Number: %d\n", i);
+ }
+
+ return 0;
+}
diff --git a/oer/courses/c-openmp/sections/03-debugging/03-shared/regex b/oer/courses/c-openmp/sections/03-debugging/03-shared/regex
new file mode 100644
index 0000000..109ded8
--- /dev/null
+++ b/oer/courses/c-openmp/sections/03-debugging/03-shared/regex
@@ -0,0 +1 @@
+(Number:\s\d\n){10}
diff --git a/oer/courses/c-openmp/sections/03-debugging/03-shared/solution.c b/oer/courses/c-openmp/sections/03-debugging/03-shared/solution.c
new file mode 100644
index 0000000..85654a2
--- /dev/null
+++ b/oer/courses/c-openmp/sections/03-debugging/03-shared/solution.c
@@ -0,0 +1,29 @@
+#include
+#include
+#include
+#include
+
+bool is_prime(int num) {
+ for (int i = 2; i < num; i++) {
+ if (num % i == 0) {
+ return false;
+ }
+ }
+ return true;
+}
+
+int main(int argc, const char *argv[])
+{
+ int num_primes = 0;
+
+ #pragma omp parallel for
+ for (int i = 2; i < 1000; i++)
+ {
+ if (is_prime(i))
+ #pragma omp atomic
+ num_primes++;
+ }
+
+ printf("Number of primes: %d\n", num_primes);
+ return 0;
+}
diff --git a/oer/courses/c-openmp/sections/03-debugging/03-shared/type b/oer/courses/c-openmp/sections/03-debugging/03-shared/type
new file mode 100644
index 0000000..7d393ec
--- /dev/null
+++ b/oer/courses/c-openmp/sections/03-debugging/03-shared/type
@@ -0,0 +1 @@
+program/match-regex
diff --git a/oer/courses/c-openmp/sections/03-debugging/section b/oer/courses/c-openmp/sections/03-debugging/section
new file mode 100644
index 0000000..614a425
--- /dev/null
+++ b/oer/courses/c-openmp/sections/03-debugging/section
@@ -0,0 +1 @@
+{"title": "Debugging", "description": "Learn how to find and solve common mistakes."}
diff --git a/oer/courses/c-openmp/sections/04-problem-solving/00-mandelbrot/Makefile b/oer/courses/c-openmp/sections/04-problem-solving/00-mandelbrot/Makefile
new file mode 100644
index 0000000..7f6d788
--- /dev/null
+++ b/oer/courses/c-openmp/sections/04-problem-solving/00-mandelbrot/Makefile
@@ -0,0 +1,6 @@
+
+all:
+ gcc -fopenmp -lm --std=gnu99 program.c -o program
+
+clean:
+ rm -f program
diff --git a/oer/courses/c-openmp/sections/04-problem-solving/00-mandelbrot/content.html b/oer/courses/c-openmp/sections/04-problem-solving/00-mandelbrot/content.html
new file mode 100644
index 0000000..357c6cc
--- /dev/null
+++ b/oer/courses/c-openmp/sections/04-problem-solving/00-mandelbrot/content.html
@@ -0,0 +1,2 @@
+This program displays a representation of the Mandelbrot set.
+Modify the code to run the calculation in parallel. You will be able to observe performance improvements.
diff --git a/oer/courses/c-openmp/sections/04-problem-solving/00-mandelbrot/meta b/oer/courses/c-openmp/sections/04-problem-solving/00-mandelbrot/meta
new file mode 100644
index 0000000..73f850c
--- /dev/null
+++ b/oer/courses/c-openmp/sections/04-problem-solving/00-mandelbrot/meta
@@ -0,0 +1 @@
+{"title": "Mandelbrot Set"}
diff --git a/oer/courses/c-openmp/sections/04-problem-solving/00-mandelbrot/program b/oer/courses/c-openmp/sections/04-problem-solving/00-mandelbrot/program
new file mode 100755
index 0000000..a0f6fc4
Binary files /dev/null and b/oer/courses/c-openmp/sections/04-problem-solving/00-mandelbrot/program differ
diff --git a/oer/courses/c-openmp/sections/04-problem-solving/00-mandelbrot/program.c b/oer/courses/c-openmp/sections/04-problem-solving/00-mandelbrot/program.c
new file mode 100644
index 0000000..f619a64
--- /dev/null
+++ b/oer/courses/c-openmp/sections/04-problem-solving/00-mandelbrot/program.c
@@ -0,0 +1,57 @@
+#include
+#include
+#include
+#include
+#define X_PIXEL 1000
+#define Y_PIXEL 1000
+
+double scaled_x(int x) {
+ return -2.5 + (3.0 / X_PIXEL) * (double)x;
+}
+
+double scaled_y(int y) {
+ return -2.0 + (4.0 / Y_PIXEL) * (double)y;
+}
+
+int main(int argc, const char *argv[])
+{
+ double start = omp_get_wtime();
+
+ char picture[X_PIXEL][Y_PIXEL];
+ for (int px = 0; px < X_PIXEL; px++)
+ for (int py = 0; py < Y_PIXEL; py++)
+ {
+ double cx = scaled_x(px);
+ double cy = scaled_y(py);
+ double x = 0.0;
+ double y = 0.0;
+ int i = 0;
+ int max_i = 1000;
+ while(i < max_i && x*x + y*y < (1 << 16))
+ {
+ double x_tmp = x*x - y*y + cx;
+ double y_tmp = 2*x*y + cy;
+ x = x_tmp;
+ y = y_tmp;
+ i++;
+ }
+ if (i == max_i) {
+ picture[px][py] = '*';
+ } else {
+ picture[px][py] = ' ';
+ }
+ }
+
+ double end = omp_get_wtime();
+
+ // We downscale the image
+ // by only printing one in twenty pixels
+ for (int x = 0; x < X_PIXEL; x+=20) {
+ printf("\n");
+ for (int y = 0; y < Y_PIXEL; y+=20)
+ printf("%c", picture[x][y]);
+
+ }
+
+ printf("\nComputation took %f seconds\n", end - start);
+}
diff --git a/oer/courses/c-openmp/sections/04-problem-solving/00-mandelbrot/regex b/oer/courses/c-openmp/sections/04-problem-solving/00-mandelbrot/regex
new file mode 100644
index 0000000..8d98f9d
--- /dev/null
+++ b/oer/courses/c-openmp/sections/04-problem-solving/00-mandelbrot/regex
@@ -0,0 +1 @@
+.*
diff --git a/oer/courses/c-openmp/sections/04-problem-solving/00-mandelbrot/solution.c b/oer/courses/c-openmp/sections/04-problem-solving/00-mandelbrot/solution.c
new file mode 100644
index 0000000..8cad451
--- /dev/null
+++ b/oer/courses/c-openmp/sections/04-problem-solving/00-mandelbrot/solution.c
@@ -0,0 +1,64 @@
+#include
+#include
+#include
+#include
+#include
+#include
+#define X_PIXEL 1000
+#define Y_PIXEL 1000
+
+static inline bool in_circle(double x, double y)
+{
+ return (x*x + y*y < 1.0);
+}
+
+double scaled_x(int x) {
+ return -2.5 + (3.0 / X_PIXEL) * (double)x;
+}
+
+double scaled_y(int y) {
+ return -2.0 + (4.0 / Y_PIXEL) * (double)y;
+}
+
+int main(int argc, const char *argv[])
+{
+ double start = omp_get_wtime();
+
+ char picture[X_PIXEL][Y_PIXEL];
+ for (int px = 0; px < X_PIXEL; px++)
+ for (int py = 0; py < Y_PIXEL; py++)
+ {
+ double cx = scaled_x(px);
+ double cy = scaled_y(py);
+ double x = 0.0;
+ double y = 0.0;
+ int i = 0;
+ int max_i = 1000;
+ while(i < max_i && x*x + y*y < (1 << 16))
+ {
+ double x_tmp = x*x - y*y + cx;
+ double y_tmp = 2*x*y + cy;
+ x = x_tmp;
+ y = y_tmp;
+ i++;
+ }
+ if (i == max_i) {
+ picture[px][py] = '*';
+ } else {
+ picture[px][py] = ' ';
+ }
+ }
+
+ double end = omp_get_wtime();
+
+ // We downscale the image
+ // by only printing one in twenty pixels
+ for (int x = 0; x < X_PIXEL; x+=20) {
+ printf("\n");
+ for (int y = 0; y < Y_PIXEL; y+=20)
+ printf("%c", picture[x][y]);
+
+ }
+
+ printf("\nComputation took %f seconds\n", end - start);
+}
diff --git a/oer/courses/c-openmp/sections/04-problem-solving/00-mandelbrot/type b/oer/courses/c-openmp/sections/04-problem-solving/00-mandelbrot/type
new file mode 100644
index 0000000..7d393ec
--- /dev/null
+++ b/oer/courses/c-openmp/sections/04-problem-solving/00-mandelbrot/type
@@ -0,0 +1 @@
+program/match-regex
diff --git a/oer/courses/c-openmp/sections/04-problem-solving/01-montecarlo/Makefile b/oer/courses/c-openmp/sections/04-problem-solving/01-montecarlo/Makefile
new file mode 100644
index 0000000..7f6d788
--- /dev/null
+++ b/oer/courses/c-openmp/sections/04-problem-solving/01-montecarlo/Makefile
@@ -0,0 +1,6 @@
+
+all:
+ gcc -fopenmp -lm --std=gnu99 program.c -o program
+
+clean:
+ rm -f program
diff --git a/oer/courses/c-openmp/sections/04-problem-solving/01-montecarlo/a.out b/oer/courses/c-openmp/sections/04-problem-solving/01-montecarlo/a.out
new file mode 100755
index 0000000..67b8b91
Binary files /dev/null and b/oer/courses/c-openmp/sections/04-problem-solving/01-montecarlo/a.out differ
diff --git a/oer/courses/c-openmp/sections/04-problem-solving/01-montecarlo/content.html b/oer/courses/c-openmp/sections/04-problem-solving/01-montecarlo/content.html
new file mode 100644
index 0000000..9b2bba8
--- /dev/null
+++ b/oer/courses/c-openmp/sections/04-problem-solving/01-montecarlo/content.html
@@ -0,0 +1,8 @@
+In this problem we aim to approximate π using the Monte Carlo method.
+
+Modify the code to run the calculation in parallel.
+An interesting issue arises when we try to have reproducible computation.
+ Simply using a seeded pseudo random generator, while accessing it from multiple threads (in a different order each time) defeats the purpose as our computations are still non-deterministic.
+ Instead we use a different generator state in each thread
+ We use the erand48 function to explicitly pass the generators state in each call.
+To ensure different random values for each thread they also need to be seeded with the thread number.
diff --git a/oer/courses/c-openmp/sections/04-problem-solving/01-montecarlo/meta b/oer/courses/c-openmp/sections/04-problem-solving/01-montecarlo/meta
new file mode 100644
index 0000000..e868d5b
--- /dev/null
+++ b/oer/courses/c-openmp/sections/04-problem-solving/01-montecarlo/meta
@@ -0,0 +1 @@
+{"title": "Approximating Pi"}
diff --git a/oer/courses/c-openmp/sections/04-problem-solving/01-montecarlo/program b/oer/courses/c-openmp/sections/04-problem-solving/01-montecarlo/program
new file mode 100755
index 0000000..7913d47
Binary files /dev/null and b/oer/courses/c-openmp/sections/04-problem-solving/01-montecarlo/program differ
diff --git a/oer/courses/c-openmp/sections/04-problem-solving/01-montecarlo/program.c b/oer/courses/c-openmp/sections/04-problem-solving/01-montecarlo/program.c
new file mode 100644
index 0000000..3d7e771
--- /dev/null
+++ b/oer/courses/c-openmp/sections/04-problem-solving/01-montecarlo/program.c
@@ -0,0 +1,51 @@
+#include
+#include
+#include
+#include
+#include
+#include
+
+static inline bool in_circle(double x, double y)
+{
+ return (x*x + y*y < 1.0);
+}
+
+int main(int argc, const char *argv[])
+{
+ omp_set_num_threads(10);
+ // A constant seed is used to keep our results reproducible
+ srand48(42);
+
+ double x;
+ double y;
+
+ int in_circle_count = 0;
+ int total_count = 0;
+
+ unsigned short rand_state[3] = {22, 24, 90};
+ double start = omp_get_wtime();
+
+ // We use now use the Monte Carlo method of approximating pi
+ // TODO: parallelize this block while avoiding data races:
+ {
+ rand_state[0] = rand_state[0] * (unsigned short)omp_get_num_threads();
+
+ // TODO: Use the omp for directive to paralellize
+ // a loop inside a parallel block
+ for (int i = 0; i < 90000000; i++) {
+ x = erand48(rand_state);
+ y = erand48(rand_state);
+
+ if (in_circle(x, y)) {
+ in_circle_count++;
+ }
+ total_count++;
+ }
+ }
+ double quater_pi = (double)in_circle_count / (double)total_count;
+
+ double end = omp_get_wtime();
+ printf("Pi is: %f\n", quater_pi * 4);
+ printf("That took a total of %f seconds.\n", end - start);
+ return 0;
+}
diff --git a/oer/courses/c-openmp/sections/04-problem-solving/01-montecarlo/regex b/oer/courses/c-openmp/sections/04-problem-solving/01-montecarlo/regex
new file mode 100644
index 0000000..876e7e5
--- /dev/null
+++ b/oer/courses/c-openmp/sections/04-problem-solving/01-montecarlo/regex
@@ -0,0 +1 @@
+Pi is: 3.141711
diff --git a/oer/courses/c-openmp/sections/04-problem-solving/01-montecarlo/solution.c b/oer/courses/c-openmp/sections/04-problem-solving/01-montecarlo/solution.c
new file mode 100644
index 0000000..1c8833f
--- /dev/null
+++ b/oer/courses/c-openmp/sections/04-problem-solving/01-montecarlo/solution.c
@@ -0,0 +1,51 @@
+#include
+#include
+#include
+#include
+#include
+#include
+
+static inline bool in_circle(double x, double y)
+{
+ return (x*x + y*y < 1.0);
+}
+
+int main(int argc, const char *argv[])
+{
+ omp_set_num_threads(10);
+ // A constant seed is used to keep our results reproducible
+ srand48(42);
+
+ double x;
+ double y;
+
+ int in_circle_count = 0;
+ int total_count = 0;
+
+ unsigned short rand_state[3];
+ double start = omp_get_wtime();
+
+ // We use now use the Monte Carlo method of approximating pi
+ // TODO: parallelize this while avoiding data races:
+ #pragma omp parallel private(x, y, rand_state) reduction(+:total_count, in_circle_count)
+ {
+ rand_state[0] = rand_state[0] * (unsigned short)omp_get_num_threads();
+
+ #pragma omp for
+ for (int i = 0; i < 90000000; i++) {
+ x = erand48(rand_state);
+ y = erand48(rand_state);
+
+ if (in_circle(x, y)) {
+ in_circle_count++;
+ }
+ total_count++;
+ }
+ }
+ double quater_pi = (double)in_circle_count / (double)total_count;
+
+ double end = omp_get_wtime();
+ printf("Pi is: %f\n", quater_pi * 4);
+ printf("That took a total of %f seconds.\n", end - start);
+ return 0;
+}
diff --git a/oer/courses/c-openmp/sections/04-problem-solving/01-montecarlo/type b/oer/courses/c-openmp/sections/04-problem-solving/01-montecarlo/type
new file mode 100644
index 0000000..7d393ec
--- /dev/null
+++ b/oer/courses/c-openmp/sections/04-problem-solving/01-montecarlo/type
@@ -0,0 +1 @@
+program/match-regex
diff --git a/oer/courses/c-openmp/sections/04-problem-solving/section b/oer/courses/c-openmp/sections/04-problem-solving/section
new file mode 100644
index 0000000..f6b0d8d
--- /dev/null
+++ b/oer/courses/c-openmp/sections/04-problem-solving/section
@@ -0,0 +1 @@
+{"title": "Problem Solving", "description": "Apply what you learned to new problems."}
diff --git a/oer/courses/example-course/meta b/oer/courses/example-course/meta
new file mode 100644
index 0000000..f78dd4d
--- /dev/null
+++ b/oer/courses/example-course/meta
@@ -0,0 +1 @@
+{"title": "Example Course", "description": "A dummy course to showcase the different exercise formats and features of the platform."}
diff --git a/oer/courses/example-course/sections/01-introduction/00-weclome/content.html b/oer/courses/example-course/sections/01-introduction/00-weclome/content.html
new file mode 100644
index 0000000..a7fb08a
--- /dev/null
+++ b/oer/courses/example-course/sections/01-introduction/00-weclome/content.html
@@ -0,0 +1,6 @@
+
+Welcome to the introductory course for learning the C programming language.
+The tutorials and problem sets presented to you are just to get you started,
+for more fundamental C knowledge consider investing into a good book,
+consult the documentation or browse the web.
+
diff --git a/oer/courses/example-course/sections/01-introduction/00-weclome/meta b/oer/courses/example-course/sections/01-introduction/00-weclome/meta
new file mode 100644
index 0000000..b75c1c1
--- /dev/null
+++ b/oer/courses/example-course/sections/01-introduction/00-weclome/meta
@@ -0,0 +1 @@
+{"title": "Introduction"}
diff --git a/oer/courses/example-course/sections/01-introduction/00-weclome/type b/oer/courses/example-course/sections/01-introduction/00-weclome/type
new file mode 100644
index 0000000..be49eeb
--- /dev/null
+++ b/oer/courses/example-course/sections/01-introduction/00-weclome/type
@@ -0,0 +1 @@
+text/html
diff --git a/oer/courses/example-course/sections/01-introduction/01-c-hello/Makefile b/oer/courses/example-course/sections/01-introduction/01-c-hello/Makefile
new file mode 100644
index 0000000..82883ac
--- /dev/null
+++ b/oer/courses/example-course/sections/01-introduction/01-c-hello/Makefile
@@ -0,0 +1,8 @@
+
+all:
+ gcc program.c -o program
+ #gcc solution.c -o solution
+
+clean:
+ rm -f program
+ rm -f solution
diff --git a/oer/courses/example-course/sections/01-introduction/01-c-hello/content.html b/oer/courses/example-course/sections/01-introduction/01-c-hello/content.html
new file mode 100644
index 0000000..3763da3
--- /dev/null
+++ b/oer/courses/example-course/sections/01-introduction/01-c-hello/content.html
@@ -0,0 +1,2 @@
+Change the following program to print "Hello World!" using the printf() function. You can always try your current
+program by pressing the [Execute]-button. Once you think you have mastered the assignment you submit your solution for automatic grading.
diff --git a/oer/courses/example-course/sections/01-introduction/01-c-hello/meta b/oer/courses/example-course/sections/01-introduction/01-c-hello/meta
new file mode 100644
index 0000000..210a30b
--- /dev/null
+++ b/oer/courses/example-course/sections/01-introduction/01-c-hello/meta
@@ -0,0 +1 @@
+{"title": "Hello World!"}
diff --git a/oer/courses/example-course/sections/01-introduction/01-c-hello/program.c b/oer/courses/example-course/sections/01-introduction/01-c-hello/program.c
new file mode 100644
index 0000000..1e161b8
--- /dev/null
+++ b/oer/courses/example-course/sections/01-introduction/01-c-hello/program.c
@@ -0,0 +1,8 @@
+#include
+
+int main(int argc, const char *argv[])
+{
+ // TODO: use printf() to print "Hello World!" on the display.
+ printf("Hello world!");
+ return 0;
+}
diff --git a/oer/courses/example-course/sections/01-introduction/01-c-hello/regex b/oer/courses/example-course/sections/01-introduction/01-c-hello/regex
new file mode 100644
index 0000000..04bd136
--- /dev/null
+++ b/oer/courses/example-course/sections/01-introduction/01-c-hello/regex
@@ -0,0 +1 @@
+^Hello world!$
diff --git a/oer/courses/example-course/sections/01-introduction/01-c-hello/type b/oer/courses/example-course/sections/01-introduction/01-c-hello/type
new file mode 100644
index 0000000..7d393ec
--- /dev/null
+++ b/oer/courses/example-course/sections/01-introduction/01-c-hello/type
@@ -0,0 +1 @@
+program/match-regex
diff --git a/oer/courses/example-course/sections/01-introduction/02-c-add/Makefile b/oer/courses/example-course/sections/01-introduction/02-c-add/Makefile
new file mode 100644
index 0000000..996955c
--- /dev/null
+++ b/oer/courses/example-course/sections/01-introduction/02-c-add/Makefile
@@ -0,0 +1,13 @@
+all:
+ gcc program.c -o program
+ gcc solution.c -o solution
+
+test:
+ ./test.sh
+
+execute:
+ ./execute.sh
+
+clean:
+ rm -f program
+ rm -f solution
diff --git a/oer/courses/example-course/sections/01-introduction/02-c-add/content.html b/oer/courses/example-course/sections/01-introduction/02-c-add/content.html
new file mode 100644
index 0000000..03ce301
--- /dev/null
+++ b/oer/courses/example-course/sections/01-introduction/02-c-add/content.html
@@ -0,0 +1 @@
+Functions are helpful to organize code into easier to reuse snippets of code. Change the following progrom to return the sum of a and b. The section that requires to be changed is marked with "TODO".
diff --git a/oer/courses/example-course/sections/01-introduction/02-c-add/execute.sh b/oer/courses/example-course/sections/01-introduction/02-c-add/execute.sh
new file mode 100755
index 0000000..2daecdb
--- /dev/null
+++ b/oer/courses/example-course/sections/01-introduction/02-c-add/execute.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+for (( i = 0; i < 1; i++ )); do
+ a=$(( ( RANDOM % 9 ) + 1))
+ b=$(( ( RANDOM % 9 ) + 1))
+
+ ./program $a $b
+done
diff --git a/oer/courses/example-course/sections/01-introduction/02-c-add/meta b/oer/courses/example-course/sections/01-introduction/02-c-add/meta
new file mode 100644
index 0000000..eacef63
--- /dev/null
+++ b/oer/courses/example-course/sections/01-introduction/02-c-add/meta
@@ -0,0 +1 @@
+{"title": "A simple adder"}
diff --git a/oer/courses/example-course/sections/01-introduction/02-c-add/program.c b/oer/courses/example-course/sections/01-introduction/02-c-add/program.c
new file mode 100644
index 0000000..9f9e9c1
--- /dev/null
+++ b/oer/courses/example-course/sections/01-introduction/02-c-add/program.c
@@ -0,0 +1,20 @@
+#include
+#include
+
+int add(int a, int b) {
+ //TODO: change so that the sum of a and b is returned
+ return 0;
+}
+
+
+int main(int argc, const char *argv[])
+{
+ int a, b, result;
+
+ a = atoi(argv[1]);
+ b = atoi(argv[2]);
+ result = add(a, b);
+
+ printf("The sum of a=%d and b=%d is %d\n", a, b, result);
+ return 0;
+}
diff --git a/oer/courses/example-course/sections/01-introduction/02-c-add/solution.c b/oer/courses/example-course/sections/01-introduction/02-c-add/solution.c
new file mode 100644
index 0000000..4266c35
--- /dev/null
+++ b/oer/courses/example-course/sections/01-introduction/02-c-add/solution.c
@@ -0,0 +1,20 @@
+#include
+#include
+
+int add(int a, int b) {
+ //TODO: change so that the sum of a and b is returned
+ return a + b;
+}
+
+
+int main(int argc, const char *argv[])
+{
+ int a, b, result;
+
+ a = atoi(argv[1]);
+ b = atoi(argv[2]);
+ result = add(a, b);
+
+ printf("The sum of a=%d and b=%d is %d\n", a, b, result);
+ return 0;
+}
diff --git a/oer/courses/example-course/sections/01-introduction/02-c-add/test.sh b/oer/courses/example-course/sections/01-introduction/02-c-add/test.sh
new file mode 100755
index 0000000..32e81fd
--- /dev/null
+++ b/oer/courses/example-course/sections/01-introduction/02-c-add/test.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+
+correct=true
+
+for (( i = 0; i < 3; i++ )); do
+ a=$(( ( RANDOM % 9 ) + 1))
+ b=$(( ( RANDOM % 9 ) + 1))
+
+ program_out=$(./program $a $b)
+ solution_out=$(./solution $a $b)
+
+ if [ "$program_out" == "$solution_out" ]
+ then
+ echo "PASS " $program_out " equals " $solution_out
+ else
+ echo "FAIL " $program_out " DOES NOT EQUAL " $solution_out
+ correct=false
+ fi
+done
+
+
+
+if [ "$correct" = true ]
+then
+ echo "PASS";
+else
+ echo "FAIL";
+fi
+
diff --git a/oer/courses/example-course/sections/01-introduction/02-c-add/type b/oer/courses/example-course/sections/01-introduction/02-c-add/type
new file mode 100644
index 0000000..1bb833c
--- /dev/null
+++ b/oer/courses/example-course/sections/01-introduction/02-c-add/type
@@ -0,0 +1 @@
+program/scriptgrade
diff --git a/oer/courses/example-course/sections/01-introduction/03-quiz-choose-one/.choices.swp b/oer/courses/example-course/sections/01-introduction/03-quiz-choose-one/.choices.swp
new file mode 100644
index 0000000..9e8236e
Binary files /dev/null and b/oer/courses/example-course/sections/01-introduction/03-quiz-choose-one/.choices.swp differ
diff --git a/oer/courses/example-course/sections/01-introduction/03-quiz-choose-one/choices b/oer/courses/example-course/sections/01-introduction/03-quiz-choose-one/choices
new file mode 100644
index 0000000..eca2a9d
--- /dev/null
+++ b/oer/courses/example-course/sections/01-introduction/03-quiz-choose-one/choices
@@ -0,0 +1,5 @@
+Homer Simpson and Ned Flanders
+*John Bardeen, Walter Brattein and William Schockley
+Donald Duck, Goofy and Mickey Mouse
+Tony Stark (also the inventor of IronMan)
+Jules Verne
diff --git a/oer/courses/example-course/sections/01-introduction/03-quiz-choose-one/meta b/oer/courses/example-course/sections/01-introduction/03-quiz-choose-one/meta
new file mode 100644
index 0000000..ed06a67
--- /dev/null
+++ b/oer/courses/example-course/sections/01-introduction/03-quiz-choose-one/meta
@@ -0,0 +1 @@
+{"title": "Quiz", "choose": "one"}
diff --git a/oer/courses/example-course/sections/01-introduction/03-quiz-choose-one/question b/oer/courses/example-course/sections/01-introduction/03-quiz-choose-one/question
new file mode 100644
index 0000000..e1f32bb
--- /dev/null
+++ b/oer/courses/example-course/sections/01-introduction/03-quiz-choose-one/question
@@ -0,0 +1 @@
+Who invented the transistor?
diff --git a/oer/courses/example-course/sections/01-introduction/03-quiz-choose-one/type b/oer/courses/example-course/sections/01-introduction/03-quiz-choose-one/type
new file mode 100644
index 0000000..b1552d4
--- /dev/null
+++ b/oer/courses/example-course/sections/01-introduction/03-quiz-choose-one/type
@@ -0,0 +1 @@
+choice/multiple
diff --git a/oer/courses/example-course/sections/01-introduction/04-quiz-check-multiple/choices b/oer/courses/example-course/sections/01-introduction/04-quiz-check-multiple/choices
new file mode 100644
index 0000000..a309b04
--- /dev/null
+++ b/oer/courses/example-course/sections/01-introduction/04-quiz-check-multiple/choices
@@ -0,0 +1,10 @@
+*John Bardeen ;)
+*Walter Brattein ;)
+*William Schockley ;)
+Homer Simpson
+Ned Flanders
+Donald Duck
+Goofy
+Mickey Mouse
+Tony Stark
+Jules Verne
diff --git a/oer/courses/example-course/sections/01-introduction/04-quiz-check-multiple/meta b/oer/courses/example-course/sections/01-introduction/04-quiz-check-multiple/meta
new file mode 100644
index 0000000..15941da
--- /dev/null
+++ b/oer/courses/example-course/sections/01-introduction/04-quiz-check-multiple/meta
@@ -0,0 +1 @@
+{"title": "Quiz", "choose": "many"}
diff --git a/oer/courses/example-course/sections/01-introduction/04-quiz-check-multiple/question b/oer/courses/example-course/sections/01-introduction/04-quiz-check-multiple/question
new file mode 100644
index 0000000..e1f32bb
--- /dev/null
+++ b/oer/courses/example-course/sections/01-introduction/04-quiz-check-multiple/question
@@ -0,0 +1 @@
+Who invented the transistor?
diff --git a/oer/courses/example-course/sections/01-introduction/04-quiz-check-multiple/type b/oer/courses/example-course/sections/01-introduction/04-quiz-check-multiple/type
new file mode 100644
index 0000000..b1552d4
--- /dev/null
+++ b/oer/courses/example-course/sections/01-introduction/04-quiz-check-multiple/type
@@ -0,0 +1 @@
+choice/multiple
diff --git a/oer/courses/example-course/sections/01-introduction/05-quiz-insert-text/meta b/oer/courses/example-course/sections/01-introduction/05-quiz-insert-text/meta
new file mode 100644
index 0000000..15941da
--- /dev/null
+++ b/oer/courses/example-course/sections/01-introduction/05-quiz-insert-text/meta
@@ -0,0 +1 @@
+{"title": "Quiz", "choose": "many"}
diff --git a/oer/courses/example-course/sections/01-introduction/05-quiz-insert-text/question b/oer/courses/example-course/sections/01-introduction/05-quiz-insert-text/question
new file mode 100644
index 0000000..1d80eb6
--- /dev/null
+++ b/oer/courses/example-course/sections/01-introduction/05-quiz-insert-text/question
@@ -0,0 +1 @@
+In which year was the transistor invented?
diff --git a/oer/courses/example-course/sections/01-introduction/05-quiz-insert-text/regex b/oer/courses/example-course/sections/01-introduction/05-quiz-insert-text/regex
new file mode 100644
index 0000000..34ce58d
--- /dev/null
+++ b/oer/courses/example-course/sections/01-introduction/05-quiz-insert-text/regex
@@ -0,0 +1 @@
+1947
diff --git a/oer/courses/example-course/sections/01-introduction/05-quiz-insert-text/type b/oer/courses/example-course/sections/01-introduction/05-quiz-insert-text/type
new file mode 100644
index 0000000..38cbf47
--- /dev/null
+++ b/oer/courses/example-course/sections/01-introduction/05-quiz-insert-text/type
@@ -0,0 +1 @@
+input/text
diff --git a/oer/courses/example-course/sections/01-introduction/section b/oer/courses/example-course/sections/01-introduction/section
new file mode 100644
index 0000000..bab5de8
--- /dev/null
+++ b/oer/courses/example-course/sections/01-introduction/section
@@ -0,0 +1 @@
+{"title": "Introduction", "description": "The very basics."}
diff --git a/oer/courses/example-course/sections/02-parallel-and-multifile/01-parallel-hello/Makefile b/oer/courses/example-course/sections/02-parallel-and-multifile/01-parallel-hello/Makefile
new file mode 100644
index 0000000..d239e82
--- /dev/null
+++ b/oer/courses/example-course/sections/02-parallel-and-multifile/01-parallel-hello/Makefile
@@ -0,0 +1,7 @@
+
+all:
+ mpicc program.c -o program
+
+clean:
+ rm -f program
+ rm -f job.out job.err
diff --git a/oer/courses/example-course/sections/02-parallel-and-multifile/01-parallel-hello/content.html b/oer/courses/example-course/sections/02-parallel-and-multifile/01-parallel-hello/content.html
new file mode 100644
index 0000000..3763da3
--- /dev/null
+++ b/oer/courses/example-course/sections/02-parallel-and-multifile/01-parallel-hello/content.html
@@ -0,0 +1,2 @@
+Change the following program to print "Hello World!" using the printf() function. You can always try your current
+program by pressing the [Execute]-button. Once you think you have mastered the assignment you submit your solution for automatic grading.
diff --git a/oer/courses/example-course/sections/02-parallel-and-multifile/01-parallel-hello/job.slurm b/oer/courses/example-course/sections/02-parallel-and-multifile/01-parallel-hello/job.slurm
new file mode 100644
index 0000000..8c8b7b4
--- /dev/null
+++ b/oer/courses/example-course/sections/02-parallel-and-multifile/01-parallel-hello/job.slurm
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+# Time limit is one minute.
+# See "man sbatch" for other time formats.
+#SBATCH --time=1
+# Run 10 tasks on 2 nodes.
+#SBATCH -N 2 -n 10
+# Output goes to job.out, error messages to job.err.
+#SBATCH --error=job.err --output=job.out
+
+mpiexec ./program
+echo $? >> job.exit
diff --git a/oer/courses/example-course/sections/02-parallel-and-multifile/01-parallel-hello/meta b/oer/courses/example-course/sections/02-parallel-and-multifile/01-parallel-hello/meta
new file mode 100644
index 0000000..00c4b1f
--- /dev/null
+++ b/oer/courses/example-course/sections/02-parallel-and-multifile/01-parallel-hello/meta
@@ -0,0 +1 @@
+{"title": "Hello MPI!"}
diff --git a/oer/courses/example-course/sections/02-parallel-and-multifile/01-parallel-hello/program b/oer/courses/example-course/sections/02-parallel-and-multifile/01-parallel-hello/program
new file mode 100755
index 0000000..8ea9de8
Binary files /dev/null and b/oer/courses/example-course/sections/02-parallel-and-multifile/01-parallel-hello/program differ
diff --git a/oer/courses/example-course/sections/02-parallel-and-multifile/01-parallel-hello/program.c b/oer/courses/example-course/sections/02-parallel-and-multifile/01-parallel-hello/program.c
new file mode 100644
index 0000000..af297b9
--- /dev/null
+++ b/oer/courses/example-course/sections/02-parallel-and-multifile/01-parallel-hello/program.c
@@ -0,0 +1,29 @@
+#include
+#include
+
+int main(int argc, char** argv) {
+ // Initialize the MPI environment
+ MPI_Init(NULL, NULL);
+
+ // Get the number of processes
+ int world_size;
+ MPI_Comm_size(MPI_COMM_WORLD, &world_size);
+
+ // Get the rank of the process
+ int world_rank;
+ MPI_Comm_rank(MPI_COMM_WORLD, &world_rank);
+
+ // Get the name of the processor
+ char processor_name[MPI_MAX_PROCESSOR_NAME];
+ int name_len;
+ MPI_Get_processor_name(processor_name, &name_len);
+
+ // Print off a hello world message
+ printf("Hello world from processor %s, rank %d"
+ " out of %d processors\n",
+ processor_name, world_rank, world_size);
+
+ // Finalize the MPI environment.
+ MPI_Finalize();
+}
+
diff --git a/oer/courses/example-course/sections/02-parallel-and-multifile/01-parallel-hello/regex b/oer/courses/example-course/sections/02-parallel-and-multifile/01-parallel-hello/regex
new file mode 100644
index 0000000..04bd136
--- /dev/null
+++ b/oer/courses/example-course/sections/02-parallel-and-multifile/01-parallel-hello/regex
@@ -0,0 +1 @@
+^Hello world!$
diff --git a/oer/courses/example-course/sections/02-parallel-and-multifile/01-parallel-hello/type b/oer/courses/example-course/sections/02-parallel-and-multifile/01-parallel-hello/type
new file mode 100644
index 0000000..1960383
--- /dev/null
+++ b/oer/courses/example-course/sections/02-parallel-and-multifile/01-parallel-hello/type
@@ -0,0 +1 @@
+program/match-regex-parallel
diff --git a/oer/courses/example-course/sections/02-parallel-and-multifile/section b/oer/courses/example-course/sections/02-parallel-and-multifile/section
new file mode 100644
index 0000000..0ba8315
--- /dev/null
+++ b/oer/courses/example-course/sections/02-parallel-and-multifile/section
@@ -0,0 +1 @@
+{"title": "Parallel and Multifile", "description": ""}
diff --git a/oer/courses/tutorial/meta b/oer/courses/tutorial/meta
new file mode 100644
index 0000000..6eeaabe
--- /dev/null
+++ b/oer/courses/tutorial/meta
@@ -0,0 +1 @@
+{"title": "C-Tutorial", "description": "A set of questions to further strenghten your knowledge."}
diff --git a/oer/courses/tutorial/sections/01-introduction/00-weclome/content.html b/oer/courses/tutorial/sections/01-introduction/00-weclome/content.html
new file mode 100644
index 0000000..869e46e
--- /dev/null
+++ b/oer/courses/tutorial/sections/01-introduction/00-weclome/content.html
@@ -0,0 +1,7 @@
+
+ Welcome to the c-tutorial. This is entirely based on the german tutorial "Tutorien zur Informatik" by Dion Timmermann and Christian H. Kautz for the Hamburg Open Online University (HOOU).
+ This tutorial will provide questions to further strengthen your knowledge of the C-Programming-Language. The original document also provides questions for C++ and Java, but we will concentrate on c.
+
+
+ It is probably a good idea to use this as complementary material for other learning sources such as our c-basic course or c-newcomers course.
+
diff --git a/oer/courses/tutorial/sections/01-introduction/00-weclome/meta b/oer/courses/tutorial/sections/01-introduction/00-weclome/meta
new file mode 100644
index 0000000..b75c1c1
--- /dev/null
+++ b/oer/courses/tutorial/sections/01-introduction/00-weclome/meta
@@ -0,0 +1 @@
+{"title": "Introduction"}
diff --git a/oer/courses/tutorial/sections/01-introduction/00-weclome/type b/oer/courses/tutorial/sections/01-introduction/00-weclome/type
new file mode 100644
index 0000000..be49eeb
--- /dev/null
+++ b/oer/courses/tutorial/sections/01-introduction/00-weclome/type
@@ -0,0 +1 @@
+text/html
diff --git a/oer/courses/tutorial/sections/01-introduction/01-variables/choices b/oer/courses/tutorial/sections/01-introduction/01-variables/choices
new file mode 100644
index 0000000..9bfb230
--- /dev/null
+++ b/oer/courses/tutorial/sections/01-introduction/01-variables/choices
@@ -0,0 +1,4 @@
+*A placeholder, which either stands for a single value or a range of values.
+A placeholder for a single value.
+A name for a constant number, like e for 2.718...
+A name for a location, where you can store values to.
\ No newline at end of file
diff --git a/oer/courses/tutorial/sections/01-introduction/01-variables/meta b/oer/courses/tutorial/sections/01-introduction/01-variables/meta
new file mode 100644
index 0000000..1ff61cd
--- /dev/null
+++ b/oer/courses/tutorial/sections/01-introduction/01-variables/meta
@@ -0,0 +1 @@
+{"title": "Variables in maths", "choose": "one"}
diff --git a/oer/courses/tutorial/sections/01-introduction/01-variables/question b/oer/courses/tutorial/sections/01-introduction/01-variables/question
new file mode 100644
index 0000000..9f9b86a
--- /dev/null
+++ b/oer/courses/tutorial/sections/01-introduction/01-variables/question
@@ -0,0 +1 @@
+What is a variable in maths?
\ No newline at end of file
diff --git a/oer/courses/tutorial/sections/01-introduction/01-variables/type b/oer/courses/tutorial/sections/01-introduction/01-variables/type
new file mode 100644
index 0000000..b1552d4
--- /dev/null
+++ b/oer/courses/tutorial/sections/01-introduction/01-variables/type
@@ -0,0 +1 @@
+choice/multiple
diff --git a/oer/courses/tutorial/sections/01-introduction/02-variables-programming/choices b/oer/courses/tutorial/sections/01-introduction/02-variables-programming/choices
new file mode 100644
index 0000000..0950f91
--- /dev/null
+++ b/oer/courses/tutorial/sections/01-introduction/02-variables-programming/choices
@@ -0,0 +1,5 @@
+A placeholder, which either stands for a single value or a range of values.
+A placeholder for a single value.
+A name for a constant number, like e for 2.718...
+*A name for a location, where you can store values to.
+A random number.
\ No newline at end of file
diff --git a/oer/courses/tutorial/sections/01-introduction/02-variables-programming/meta b/oer/courses/tutorial/sections/01-introduction/02-variables-programming/meta
new file mode 100644
index 0000000..ffa53b6
--- /dev/null
+++ b/oer/courses/tutorial/sections/01-introduction/02-variables-programming/meta
@@ -0,0 +1 @@
+{"title": "Variables in programming", "choose": "one"}
diff --git a/oer/courses/tutorial/sections/01-introduction/02-variables-programming/question b/oer/courses/tutorial/sections/01-introduction/02-variables-programming/question
new file mode 100644
index 0000000..c8e2eea
--- /dev/null
+++ b/oer/courses/tutorial/sections/01-introduction/02-variables-programming/question
@@ -0,0 +1 @@
+What is a variable in programming?
\ No newline at end of file
diff --git a/oer/courses/tutorial/sections/01-introduction/02-variables-programming/type b/oer/courses/tutorial/sections/01-introduction/02-variables-programming/type
new file mode 100644
index 0000000..b1552d4
--- /dev/null
+++ b/oer/courses/tutorial/sections/01-introduction/02-variables-programming/type
@@ -0,0 +1 @@
+choice/multiple
diff --git a/oer/courses/tutorial/sections/01-introduction/03-output/content.md b/oer/courses/tutorial/sections/01-introduction/03-output/content.md
new file mode 100644
index 0000000..1e04f3b
--- /dev/null
+++ b/oer/courses/tutorial/sections/01-introduction/03-output/content.md
@@ -0,0 +1,10 @@
+Read this source code carefully.
+
+ int var;
+
+ var = 5;
+ var = 7;
+
+ printf("%i", var);
+ printf("%i", var);
+ printf("%i", var);
diff --git a/oer/courses/tutorial/sections/01-introduction/03-output/meta b/oer/courses/tutorial/sections/01-introduction/03-output/meta
new file mode 100644
index 0000000..7e47604
--- /dev/null
+++ b/oer/courses/tutorial/sections/01-introduction/03-output/meta
@@ -0,0 +1 @@
+{"title": "Source Code"}
diff --git a/oer/courses/tutorial/sections/01-introduction/03-output/question b/oer/courses/tutorial/sections/01-introduction/03-output/question
new file mode 100644
index 0000000..b8afe91
--- /dev/null
+++ b/oer/courses/tutorial/sections/01-introduction/03-output/question
@@ -0,0 +1 @@
+What does this source code print to the console?
diff --git a/oer/courses/tutorial/sections/01-introduction/03-output/regex b/oer/courses/tutorial/sections/01-introduction/03-output/regex
new file mode 100644
index 0000000..6713fc2
--- /dev/null
+++ b/oer/courses/tutorial/sections/01-introduction/03-output/regex
@@ -0,0 +1 @@
+^777$
diff --git a/oer/courses/tutorial/sections/01-introduction/03-output/type b/oer/courses/tutorial/sections/01-introduction/03-output/type
new file mode 100644
index 0000000..38cbf47
--- /dev/null
+++ b/oer/courses/tutorial/sections/01-introduction/03-output/type
@@ -0,0 +1 @@
+input/text
diff --git a/oer/courses/tutorial/sections/01-introduction/04-value/choices b/oer/courses/tutorial/sections/01-introduction/04-value/choices
new file mode 100644
index 0000000..f40f38c
--- /dev/null
+++ b/oer/courses/tutorial/sections/01-introduction/04-value/choices
@@ -0,0 +1,3 @@
+5.
+*7.
+5 and 7 at the same time.
\ No newline at end of file
diff --git a/oer/courses/tutorial/sections/01-introduction/04-value/content.md b/oer/courses/tutorial/sections/01-introduction/04-value/content.md
new file mode 100644
index 0000000..51eb004
--- /dev/null
+++ b/oer/courses/tutorial/sections/01-introduction/04-value/content.md
@@ -0,0 +1,9 @@
+
+ int var;
+
+ var = 5;
+ var = 7;
+
+ printf("%i", var);
+ printf("%i", var);
+ printf("%i", var);
diff --git a/oer/courses/tutorial/sections/01-introduction/04-value/meta b/oer/courses/tutorial/sections/01-introduction/04-value/meta
new file mode 100644
index 0000000..a85db78
--- /dev/null
+++ b/oer/courses/tutorial/sections/01-introduction/04-value/meta
@@ -0,0 +1 @@
+{"title": "Value", "choose": "one"}
diff --git a/oer/courses/tutorial/sections/01-introduction/04-value/question b/oer/courses/tutorial/sections/01-introduction/04-value/question
new file mode 100644
index 0000000..08d0fec
--- /dev/null
+++ b/oer/courses/tutorial/sections/01-introduction/04-value/question
@@ -0,0 +1 @@
+What value does var hold after executing line 3 and think about why?
\ No newline at end of file
diff --git a/oer/courses/tutorial/sections/01-introduction/04-value/type b/oer/courses/tutorial/sections/01-introduction/04-value/type
new file mode 100644
index 0000000..b1552d4
--- /dev/null
+++ b/oer/courses/tutorial/sections/01-introduction/04-value/type
@@ -0,0 +1 @@
+choice/multiple
diff --git a/oer/courses/tutorial/sections/01-introduction/05-value2/choices b/oer/courses/tutorial/sections/01-introduction/05-value2/choices
new file mode 100644
index 0000000..9dcf9f6
--- /dev/null
+++ b/oer/courses/tutorial/sections/01-introduction/05-value2/choices
@@ -0,0 +1,3 @@
+5, because printf writes the latest value to the console and removes it from the variable.
+*7, because printf only writes the value to the console.
+5 and 7, because printf doesn't change the variable.
\ No newline at end of file
diff --git a/oer/courses/tutorial/sections/01-introduction/05-value2/content.md b/oer/courses/tutorial/sections/01-introduction/05-value2/content.md
new file mode 100644
index 0000000..51eb004
--- /dev/null
+++ b/oer/courses/tutorial/sections/01-introduction/05-value2/content.md
@@ -0,0 +1,9 @@
+
+ int var;
+
+ var = 5;
+ var = 7;
+
+ printf("%i", var);
+ printf("%i", var);
+ printf("%i", var);
diff --git a/oer/courses/tutorial/sections/01-introduction/05-value2/meta b/oer/courses/tutorial/sections/01-introduction/05-value2/meta
new file mode 100644
index 0000000..6af714a
--- /dev/null
+++ b/oer/courses/tutorial/sections/01-introduction/05-value2/meta
@@ -0,0 +1 @@
+{"title": "Value after printf", "choose": "one"}
diff --git a/oer/courses/tutorial/sections/01-introduction/05-value2/question b/oer/courses/tutorial/sections/01-introduction/05-value2/question
new file mode 100644
index 0000000..1c4916b
--- /dev/null
+++ b/oer/courses/tutorial/sections/01-introduction/05-value2/question
@@ -0,0 +1 @@
+What value does var hold after executing line 5 and think about why?
\ No newline at end of file
diff --git a/oer/courses/tutorial/sections/01-introduction/05-value2/type b/oer/courses/tutorial/sections/01-introduction/05-value2/type
new file mode 100644
index 0000000..b1552d4
--- /dev/null
+++ b/oer/courses/tutorial/sections/01-introduction/05-value2/type
@@ -0,0 +1 @@
+choice/multiple
diff --git a/oer/courses/tutorial/sections/01-introduction/06-positiv/content.md b/oer/courses/tutorial/sections/01-introduction/06-positiv/content.md
new file mode 100644
index 0000000..c7b68f5
--- /dev/null
+++ b/oer/courses/tutorial/sections/01-introduction/06-positiv/content.md
@@ -0,0 +1,12 @@
+Read this source code carefully.
+
+ int var = -5;
+ if (var > 0){
+ printf("Variable is positiv.");
+ }
+
+ var = 10;
+ printf("Program ended.");
+ if (var > 0) {
+ printf("Variable is positiv.");
+ }
diff --git a/oer/courses/tutorial/sections/01-introduction/06-positiv/meta b/oer/courses/tutorial/sections/01-introduction/06-positiv/meta
new file mode 100644
index 0000000..74c809f
--- /dev/null
+++ b/oer/courses/tutorial/sections/01-introduction/06-positiv/meta
@@ -0,0 +1 @@
+{"title": "Is Positive?"}
diff --git a/oer/courses/tutorial/sections/01-introduction/06-positiv/question b/oer/courses/tutorial/sections/01-introduction/06-positiv/question
new file mode 100644
index 0000000..b8afe91
--- /dev/null
+++ b/oer/courses/tutorial/sections/01-introduction/06-positiv/question
@@ -0,0 +1 @@
+What does this source code print to the console?
diff --git a/oer/courses/tutorial/sections/01-introduction/06-positiv/regex b/oer/courses/tutorial/sections/01-introduction/06-positiv/regex
new file mode 100644
index 0000000..9a82f83
--- /dev/null
+++ b/oer/courses/tutorial/sections/01-introduction/06-positiv/regex
@@ -0,0 +1 @@
+^Program ended.\s*Variable is positiv.$
diff --git a/oer/courses/tutorial/sections/01-introduction/06-positiv/type b/oer/courses/tutorial/sections/01-introduction/06-positiv/type
new file mode 100644
index 0000000..38cbf47
--- /dev/null
+++ b/oer/courses/tutorial/sections/01-introduction/06-positiv/type
@@ -0,0 +1 @@
+input/text
diff --git a/oer/courses/tutorial/sections/01-introduction/section b/oer/courses/tutorial/sections/01-introduction/section
new file mode 100644
index 0000000..f3717e4
--- /dev/null
+++ b/oer/courses/tutorial/sections/01-introduction/section
@@ -0,0 +1 @@
+{"title": "Variable and Output", "description": "Revision on the topic variables and output."}
diff --git a/oer/exercise-formats/choice/multiple/ExerciseHandler.py b/oer/exercise-formats/choice/multiple/ExerciseHandler.py
new file mode 100644
index 0000000..7f2e216
--- /dev/null
+++ b/oer/exercise-formats/choice/multiple/ExerciseHandler.py
@@ -0,0 +1,66 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+import sys
+import json
+import re
+import crypt
+
+
+print("Handler choice/multiple loaded!")
+
+
+# helper
+
+# analog to value of html input field (checkbox/radio) it feels kinda odd to
+# use this, maybe settle with another hash function than the default this only
+# requires performance not cryptographic security
+def hash(arg):
+ return crypt.crypt(str(arg))
+
+def parse_choice(raw_choice):
+ choice = {"text": "", "is": "incorrect", "value": ""}
+
+ result = re.findall(r"^([*!]?)(.*)$", raw_choice, re.DOTALL)
+
+ value = hash(result[0][1])
+
+ if result[0][0] == '*':
+ choice = {"text": result[0][1], "is": "correct", "value": value}
+ elif result[0][0] == '!':
+ choice = {"text": result[0][1], "is": "required", "value": value}
+ else:
+ choice = {"text": result[0][1], "is": "incorrect", "value": value}
+
+ return choice
+
+
+class ExerciseHandler(object):
+ def __init__(self, parser=None):
+ self.parser = parser
+ self.data = {'choices': [''], 'question': ''}
+ print("ExerciseHandler choice/multiple")
+ print("parser.path", parser.path)
+
+ item = self.parser.item
+ data = self.data
+
+ # enable grading for this exercise type
+ item.grading = True
+
+ item.content = self.parser.get_exercise_content()
+ data['question'] = self.parser.get_file_content('question')
+
+ # import and sanitize choices
+ data['choices'] = self.parser.get_file_content('choices').split('\n')
+ for i,choice in enumerate(data['choices']):
+ data['choices'][i] = parse_choice(choice)
+
+ # determine how to render choices
+ data['input_type'] = "checkbox"
+ if 'choose' in parser.meta:
+ if parser.meta['choose'] == "one":
+ data['input_type'] = "radio"
+
+ item.data = json.dumps(self.data)
+ item.save()
diff --git a/oer/exercise-formats/choice/multiple/controller.py b/oer/exercise-formats/choice/multiple/controller.py
new file mode 100644
index 0000000..9618885
--- /dev/null
+++ b/oer/exercise-formats/choice/multiple/controller.py
@@ -0,0 +1,95 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+# Standardized types do not require authors to specify any control script as
+# it can be generated on import. However when provided it will overwrite the
+# default behaivior.
+
+import sys
+import re
+
+
+def grade(ctx):
+ grade = 'FAIL'
+
+ # counter
+ correct = 0
+ correct_chosen = []
+ min_correct = -1
+
+ incorrect = 0
+ incorrect_chosen = []
+ max_incorrect = 0
+
+ choices = ctx.data['data']['choices']
+ solution = ctx.data['solution']
+
+ print(choices, file=sys.stderr)
+ print(solution, file=sys.stderr)
+
+ if ctx.data['data']['input_type'] in ['radio']:
+ # choose one
+ # a correct selection is found? => return 'PASS'
+ # a incorrect selection is found? => return 'FAIL'
+ for choice in choices:
+ print(choice['value'], file=sys.stderr)
+ print(solution, file=sys.stderr)
+
+ if choice['is'] in ['correct', 'required']:
+ if choice['value'] in solution:
+ correct_chosen.append(choice['value'])
+ grade = 'PASS'
+ break
+ else:
+ if choice['value'] in solution:
+ incorrect_chosen.append(choice['value'])
+ grade = 'FAIL'
+ break
+ else:
+ # choose many/multiple
+ #for choice in ctx.data['choices']:
+ for choice in choices:
+ print(choice['value'], file=sys.stderr)
+ print(solution, file=sys.stderr)
+
+ if choice['is'] in ['correct', 'required']:
+ correct += 1
+ if choice['value'] in solution:
+ correct_chosen.append(choice['value'])
+ else:
+ incorrect += 1
+ if choice['value'] in solution:
+ incorrect_chosen.append(choice['value'])
+
+ if min_correct == -1:
+ min_correct = correct
+
+ print({
+ 'correct': correct,
+ 'correct_chosen': correct_chosen,
+ 'min_correct': min_correct,
+ 'incorrect': incorrect,
+ 'incorrect_chosen': incorrect_chosen,
+ 'max_incorrect': max_incorrect,
+ }, file=sys.stderr)
+
+ ctx.response_data['correct'] = correct_chosen
+ ctx.response_data['incorrect'] = incorrect_chosen
+
+ if len(incorrect_chosen) > max_incorrect:
+ return 'FAIL'
+
+ elif len(correct_chosen) < min_correct:
+ return 'FAIL'
+
+ if len(correct_chosen) == correct:
+ return 'PASS'
+
+ # grading
+ # max_incorrect
+ # min_correct
+
+ ctx.response_data['correct'] = correct_chosen
+ ctx.response_data['incorrect'] = incorrect_chosen
+
+ return grade
diff --git a/oer/exercise-formats/choice/multiple/script.js b/oer/exercise-formats/choice/multiple/script.js
new file mode 100644
index 0000000..8ac0444
--- /dev/null
+++ b/oer/exercise-formats/choice/multiple/script.js
@@ -0,0 +1,152 @@
+$(document).ready(function () {
+
+ response = {};
+
+ response.show = function (type, msg, output) {
+ console.log("show issued" + type + msg);
+
+ html = "";
+
+ if (type == "test") {
+
+ } else {
+ if (msg.data.grade == "PASS") {
+ html = '