merge finished

_posts/teaching/2018-02-15-computer_achitecture.md

@@ -1,6 +1,5 @@
 ---
 layout: single
-<<<<<<< HEAD
 title: "Computer Architecture TA"
 categories: teaching
 excerpt: "TA & Coordinator, LMU Computer Architecture course."
@@ -50,37 +49,3 @@ The course provided students with a comprehensive introduction to the fundamenta
   </div>
   <div style="clear: both;"></div>
 </div>
-=======
-title:  "Lecture: Computer Architectures"
-categories: teaching
-excerpt: "Assisting to manage a lecture about the technical foundations of computer science."
-header:
-  teaser: assets/images/teaching/computer_gear.png
----
-
-![logo](\assets\images\teaching\computer_gear.png){: .align-left style="padding:0.1em; width:5em"}In the semesters listed below, my job was to assist in organiszing this bachelors lecture of about 600 students.
-We had a team of 10-12 tutors that were employed to balance the workload.
-Also, we created each weeks graded exercise sheets as well as the written exam and organized it.
-
-### Contents
-<div class="table-right">
-
-| [Summer semester 2019](https://www.mobile.ifi.lmu.de/lehrveranstaltungen/rechnerarchitektur-sose19/)| [Summer semester 2018](https://www.mobile.ifi.lmu.de/lehrveranstaltungen/rechnerarchitektur-sose18/)|
-
-</div>This lecture provided an introduction to the technical foundations of computer science and the architecture of computers.
-Topics introduced in the lecture include representation of information in computers, classical components of a computer, arithmetic in computers, logical design of computers, switching circuits, representation of memory contents, primary and secondary memories, input and output, and pipelining.
-More concrete:
-
-- Representation as bits: (numbers, text, images, audio, video, programs).
-- Storage and Transfer of data, error detection and correction
-- Boolean algebra
-- Processing of data: circuit design, switching networks
-- Number representation and arithmetic
-- Switching functions, switching networks, switching plants
-- Von Neumann model
-- Machine model
-- Machine and assembly language programming
-- Introduction to Quantum Computing
-
-This lecture was held by Prof. Dr. Linnhoff-Popien titled "Rechnerarchitektur" at [https://www.mobile.ifi.lmu.de/](LMU).
->>>>>>> d0fa738f (rebase from mnml mistakes source)

_posts/teaching/2018-10-15-IOT.md

@@ -1,6 +1,5 @@
 ---
 layout: single
-<<<<<<< HEAD
 title: "IoT Practical Exercise"
 categories: teaching
 tags: teaching iot mqtt python influxdb distributed-systems practical-course
@@ -60,22 +59,3 @@ The exercise aimed to solidify theoretical concepts discussed in the main lectur
   </div>
   <div style="clear: both;"></div>
 </div>
-=======
-title:  "IOT: Devices & Connectivity"
-categories: teaching
-tags: teaching iot
-excerpt: "Teaching to plan and develope distributed mobile apps for Android as a team."
-header:
-  teaser: assets/images/teaching/server.png
----
-
-![logo](\assets\images\teaching\server.png){: .align-left style="padding:0.1em; width:5em"}
-In the context of the lecture [Internet of Things (IoT)](https://www.mobile.ifi.lmu.de/lehrveranstaltungen/iot-ws1819/), my task was to come up with a practical exercise which could be implemented in the scope of 1-2 classes. We went with a typical [MQQT](https://mqtt.org/) based communication approach, which incooperated an [InfluxDB](https://www.influxdata.com/) backend, while simulating some high frequency sensors.
-The task was to implement this all from scratch in [Python](https://www.python.org/), which was tought in seperate [lecture](/teaching/python).
-![IOT Influx Pipeline](\assets\figures\iot_inflex_pipeline.png){:style="display:block; margin-left:auto; margin-right:auto; padding: 2em;"}
-This practical course was held in front of about 200 students in winter 2018.
-
-### Contents
-
-The general topics of the lecture included: **1)** Arduino and Raspberry Pi, **2)** Wearables and ubiquitous computing, **3)** Metaheuristics for optimization problems, **4)** Edge/fog/cloud computing and storage, **5)** Scalable algorithms and approaches, **6)** Spatial data mining, **7)** Information retrieval and mining, **8)** Blockchain and digital consensus, **9)** Combinatorial optimization in practice, **10)** Predictive maintenance systems, **11)** Smart IoT applications, **12)** Cyber security & **13)** Web of Things
->>>>>>> d0fa738f (rebase from mnml mistakes source)

_posts/teaching/2018-10-30-Python.md

@@ -1,6 +1,5 @@
 ---
 layout: single
-<<<<<<< HEAD
 title: "Python 101 Course"
 categories: teaching
 tags: teaching python programming introductory-course curriculum-development
@@ -43,19 +42,3 @@ The course structure balanced theoretical instruction with hands-on practical co
   </div>
   <div style="clear: both;"></div>
 </div>
-=======
-title:  "Lecture: Python 101"
-categories: teaching
-tags: teaching coding 
-excerpt: "Teaching the basics of python."
-header:
-  teaser: assets/images/teaching/py.png
----
-
-![logo](\assets\images\teaching\py.png){: .align-left style="padding:0.1em; width:5em"}
-The "Python 101"-Lecture was held within the context of the [IOT](/teaching/IOT/) lecture, held in winter semester 2018.
-Over the course of four classes, we tought an extensive introduction to the [`Python`](https://www.python.org/) programming language.
-Not only was the cource slides developed by me and my collegue, we also shared the lectures in front of about 200 students.
-
-There was also a practical part of the course, which allowed students to the practical acquisition of programming skills in the `Python` programming language.
->>>>>>> d0fa738f (rebase from mnml mistakes source)

_posts/teaching/2019-10-15-operating_systems.md

@@ -1,6 +1,5 @@
 ---
 layout: single
-<<<<<<< HEAD
 title: "Operating Systems TA"
 categories: teaching
 excerpt: "TA & Coordinator, Operating Systems lecture (~350 students), system programming."
@@ -48,31 +47,3 @@ The lecture built upon the foundations laid in [Computer Architecture](/teaching
 </div>
 
   Practical exercises emphasized concurrent programming using Java Threads.
-=======
-title:  "Lecture: Operating Systems"
-categories: teaching 
-excerpt: "Teaching the inner working of bits and bytes."
-header:
-  teaser: assets/images/teaching/computer_os.png
----
-
-![logo](\assets\images\teaching\computer_os.png){: .align-left style="padding:0.1em; width:5em"}In the semesters listed below, my job was to assist in organiszing this bachelors lecture of about 300-400 students.
-We had a team of 10-12 tutors that were employed to balance the workload.
-Also, we created each weeks graded exercise sheets as well as the written exam and organized it.
-
-### Content
-
-<div class="table-right">
-
-| [Winter semester 2019](https://www.mobile.ifi.lmu.de/lehrveranstaltungen/bs-ws1920/)|
-| [Summer semester 2018](https://www.mobile.ifi.lmu.de/lehrveranstaltungen/bs-ws1819/)|
-
-</div>The lecture `Operating Systems` was a continuation of the lecture [`Computer Architecture`](teaching/computer_achitecture/) held in the summer semester.
-The focus of the lecture lay on presenting the concepts of system programming.
-This included the programming of the operating system and of service programs such as editors, compilers and interpreters.
-The lecture provided an overview of the main tasks and problem around operating system, with particular emphasis on the areas of synchronization, process communication, kernel and memory management.
-Java (in particular the Thread API) was used to teach the practical implementation of the concepts introduced in the lecture in the practical exercises.
-At the end of the lecture, the architecture of distributed systems, cross-computer communication and remote procedure calls was discussed, also.
-
-This lecture was held by Prof. Dr. Linnhoff-Popien titled `Betriebssysteme` at [LMU](https://www.mobile.ifi.lmu.de/).
->>>>>>> d0fa738f (rebase from mnml mistakes source)