diff --git a/.gitignore b/.gitignore
index 7617b79d..b6a35227 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,15 +30,5 @@ codekit-config.json
.sass-cache
_asset_bundler_cache
_site
-<<<<<<< HEAD
docs
CHANGELOG.MD
-=======
-docs/Rakefile
-docs/_data/theme.yml
-docs/_docs/22-faq.md
-docs/_includes/after-content.html
-docs/_includes/before-related.html
-docs/_includes/comments-providers/scripts.html
-docs/_posts/2009-10-06-edge-case-broken-highlighting.md
->>>>>>> d0fa738f (rebase from mnml mistakes source)
diff --git a/Gemfile b/Gemfile
index 3671b16e..b98f72f5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,10 +7,7 @@ source "https://rubygems.org"
#
# This will help ensure the proper Jekyll version is running.
# Happy Jekylling!
-<<<<<<< HEAD
gem "json"
-=======
->>>>>>> d0fa738f (rebase from mnml mistakes source)
gem "jekyll"
gem "minimal-mistakes-jekyll"
@@ -35,8 +32,5 @@ group :jekyll_plugins do
gem 'jemoji'
gem 'jekyll-archives'
gem 'jekyll-include-cache'
-<<<<<<< HEAD
gem 'jekyll-webp'
-=======
->>>>>>> d0fa738f (rebase from mnml mistakes source)
end
diff --git a/_bibliography.bib b/_bibliography.bib
index 5a2ff133..ec6290c2 100644
--- a/_bibliography.bib
+++ b/_bibliography.bib
@@ -100,18 +100,11 @@ organization={Conference on Artificial Life - Alife 2023},
publisher={Copernicus Publications Göttingen, Germany}
}
-<<<<<<< HEAD
@inproceedings{illium2020surgical,
title={Surgical Mask Detection with Convolutional Neural Networks and Data Augmentations on Spectrograms},
author={Illium, Steffen and M{\"u}ller, Robert and Sedlmeier, Andreas and Linnhoff-Popien, Claudia},
booktitle={Proc. Interspeech 2020},
pages={2052--2056},
-=======
-@article{illium2020surgical,
- title={Surgical mask detection with convolutional neural networks and data augmentations on spectrograms},
- author={Illium, Steffen and Müller, Robert and Sedlmeier, Andreas and Linnhoff-Popien, Claudia},
- journal={arXiv preprint arXiv:2008.04590},
->>>>>>> d0fa738f (rebase from mnml mistakes source)
year={2020}
}
@@ -201,7 +194,6 @@ organization={Conference on Artificial Life - Alife 2023},
organization={Springer International Publishing Cham}
}
-<<<<<<< HEAD
@inproceedings{illium2022constructing,
title={Constructing organism networks from collaborative self-replicators},
author={Illium, Steffen and Zorn, Maximilian and Lenta, Cristian and K{\"o}lle, Michael and Linnhoff-Popien, Claudia and Gabor, Thomas},
@@ -219,20 +211,6 @@ organization={Conference on Artificial Life - Alife 2023},
number={Volume 3},
pages={350--357},
year={2023}
-=======
-@article{illium2022constructing,
- title={Constructing Organism Networks from Collaborative Self-Replicators},
- author={Illium, Steffen and Zorn, Maximilian and Kölle, Michael and Linnhoff-Popien, Claudia and Gabor, Thomas},
- journal={arXiv preprint arXiv:2212.10078},
- year={2022}
-}
-
-@article{illium2022voronoipatches,
- title={VoronoiPatches: Evaluating A New Data Augmentation Method},
- author={Illium, Steffen and Griffin, Gretchen and Kölle, Michael and Zorn, Maximilian and Nü{\ss}lein, Jonas and Linnhoff-Popien, Claudia},
- journal={arXiv preprint arXiv:2212.10054},
- year={2022}
->>>>>>> d0fa738f (rebase from mnml mistakes source)
}
@article{kolle2023compression,
@@ -240,7 +218,7 @@ organization={Conference on Artificial Life - Alife 2023},
author={Kölle, Michael and Illium, Steffen and Hahn, Carsten and Schauer, Lorenz and Hutter, Johannes and Linnhoff-Popien, Claudia},
journal={arXiv preprint arXiv:2301.07420},
year={2023}
-<<<<<<< HEAD
+
}
@inproceedings{altmann2024emergence,
@@ -257,6 +235,5 @@ organization={Conference on Artificial Life - Alife 2023},
author={Kölle, Michael and Erpelding, Yannick and Ritz, Fabian and Phan, Thomy and Illium, Steffen and Linnhoff-Popien, Claudia},
journal={arXiv preprint arXiv:2401.07056},
year={2024}
-=======
->>>>>>> d0fa738f (rebase from mnml mistakes source)
+
}
\ No newline at end of file
diff --git a/_config.yml b/_config.yml
index 42f7d4cf..17dcad67 100644
--- a/_config.yml
+++ b/_config.yml
@@ -26,17 +26,10 @@ description : "Personal Website"
url : "https://steffenillium.de" # the base hostname & protocol for your site e.g. "https://mmistakes.github.io"
baseurl : "" # the subpath of your site, e.g. "/blog"
repository : "illiumst" # GitHub username/repo-name e.g. "mmistakes/minimal-mistakes"
-<<<<<<< HEAD
teaser : "/assets/images/newshot_2.jpg" # path of fallback teaser image, e.g. "/assets/images/500x300.png"
logo : # path of logo image to display in the masthead, e.g. "/assets/images/88x88.png"
masthead_title : "portfolio" # overrides the website title displayed in the masthead, use " " for no title
breadcrumbs : false # true, false (default)
-=======
-teaser : "/assets/images/headshot.jpg" # path of fallback teaser image, e.g. "/assets/images/500x300.png"
-logo : # path of logo image to display in the masthead, e.g. "/assets/images/88x88.png"
-masthead_title : "portfolio" # overrides the website title displayed in the masthead, use " " for no title
-breadcrumbs : true # true, false (default)
->>>>>>> d0fa738f (rebase from mnml mistakes source)
words_per_minute : 200
reCaptcha:
siteKey :
@@ -57,28 +50,18 @@ analytics:
provider: "custom"
# Social Sharing
-<<<<<<< HEAD
og_image : "/assets/images/newshot_2.jpg" # Open Graph/Twitter default site image
# For specifying social profiles
# - https://developers.google.com/structured-data/customize/social-profiles
social:
type : Person
name : Steffen Illium
-=======
-og_image : "/assets/images/headshot.jpg" # Open Graph/Twitter default site image
-# For specifying social profiles
-# - https://developers.google.com/structured-data/customize/social-profiles
-social:
- type : # Person or Organization (defaults to Person)
- name : # If the user or organization name differs from the site's name
->>>>>>> d0fa738f (rebase from mnml mistakes source)
links : # An array of links to social media profiles
- https://www.linkedin.com/in/steffen-illium/
# Site Author
author:
name : "Steffen Illium"
-<<<<<<< HEAD
avatar : "/assets/images/newshot_2.jpg" # path of avatar image, e.g. "/assets/images/bio-photo.jpg"
bio : "[PhD. in Comp. Science](https://www.mobile.ifi.lmu.de/team/steffen-illium/)
[AI Consultant & Researcher](/research/)"
location : "Augsburg"
@@ -88,33 +71,15 @@ author:
url: "https://www.mobile.ifi.lmu.de/team/steffen-illium/"
- label: "Scholar"
icon: "fab fa-google-scholar"
-=======
- avatar : "/assets/images/headshot.jpg" # path of avatar image, e.g. "/assets/images/bio-photo.jpg"
- bio : "[AI Research](/research/) and [Lecturer](/teaching/) as [PHD Student](https://www.mobile.ifi.lmu.de/team/steffen-illium/) @ [LMU Munich](https://www.lmu.de/en/index.html)"
- location : "Augsburg"
- links:
- - label: "LMU-Munich"
- icon: "fas fa-link"
- url: "https://www.mobile.ifi.lmu.de/team/steffen-illium/"
- - label: "Scholar"
- icon: "ai ai-google-scholar"
->>>>>>> d0fa738f (rebase from mnml mistakes source)
url: "https://scholar.google.de/citations?hl=en&pli=1&user=NODAd94AAAAJ"
- label: "Arxive"
icon: "ai ai-arxiv"
url: "https://arxiv.org/a/illium_s_1.html"
- label: "Researchgate"
-<<<<<<< HEAD
icon: "fab fa-researchgate"
url: "https://www.researchgate.net/profile/Steffen-Illium"
-=======
- icon: "ai ai-researchgate"
- url: "https://www.researchgate.net/profile/Steffen-Illium"
-
-
->>>>>>> d0fa738f (rebase from mnml mistakes source)
# Site Footer
footer:
@@ -125,15 +90,9 @@ footer:
- label: "LinkedIn"
icon: "fab fa-fw fa-linkedin"
url: "https://www.linkedin.com/in/steffen-illium/"
-<<<<<<< HEAD
- label: "Gitea"
icon: "fab fa-git-alt"
url: "https://gitea.steffenillium.de/steffen"
-=======
- - label: "GitHub"
- icon: "fab fa-fw fa-github"
- url: "https://github.com/illiumst"
->>>>>>> d0fa738f (rebase from mnml mistakes source)
# Reading Files
@@ -245,10 +204,7 @@ plugins:
- jekyll-scholar
- jekyll-data
- jekyll-archives
-<<<<<<< HEAD
- jekyll-webp
-=======
->>>>>>> d0fa738f (rebase from mnml mistakes source)
- jemoji
# mimic GitHub Pages with --safe
@@ -310,7 +266,6 @@ defaults:
comments: false
share: false
related: true
-<<<<<<< HEAD
related: true
show_date: false
@@ -326,28 +281,12 @@ scholar:
bibliography: _bibliography.bib
repository: "./assets/publications"
bibliography_template: bibtemplate
-=======
- related: false
- show_date: true
-
-
-# Footer
-footer_scripts:
- - /assets/js/main.min.js
- - /assets/js/custom-bibtex.js
-
-
-scholar:
- style: acm-siggraph
- bibliography: _bibliography.bib
->>>>>>> d0fa738f (rebase from mnml mistakes source)
source: ""
sort_by: year,month
order: descending
group_by: year
group_order: descending
relative: "/publications"
-<<<<<<< HEAD
############################################################
# Site configuration for the WebP Generator Plugin
@@ -387,5 +326,3 @@ webp:
# Default transforms `image.png` to `image.webp`, while changing to true transforms `image.png` to `image.png.webp`
append_ext: true
############################################################
-=======
->>>>>>> d0fa738f (rebase from mnml mistakes source)
diff --git a/_posts/projects/2018-02-01-innomi.md b/_posts/projects/2018-02-01-innomi.md
index 3920d60e..011b117e 100644
--- a/_posts/projects/2018-02-01-innomi.md
+++ b/_posts/projects/2018-02-01-innomi.md
@@ -1,6 +1,5 @@
---
layout: single
-<<<<<<< HEAD
title: "InnoMi Project"
categories: projects
excerpt: "Early-stage mobile/distributed tech transfer between academia and industry (Bavaria)."
@@ -30,16 +29,3 @@ header:
* **Dissemination & Editorial Leadership:** To further bridge the gap between cutting-edge digitalization trends and industry practitioners, I served as the Head of the Online Editorial Team for the associated [Digitale Welt Magazin (DW)](https://digitaleweltmagazin.de/) from 2018 to 2023, a role supported by the InnoMi initiative.
This project provided a platform not only for advancing research but also for developing crucial skills in project communication, event management, and editorial leadership, directly contributing to the technology transfer goals of the Bavarian region.
-=======
-title: "Mobile Internet Innovations"
-categories: projects
-excerpt: "Aiming to make Bavaria more economically strong by transferring innovations from the university to industry at an early stage."
-header:
- teaser: assets/images/projects/innomi.png
-
----
-
-{: .align-left style="padding:0.1em; width:5em"}
-
-
->>>>>>> d0fa738f (rebase from mnml mistakes source)
diff --git a/_posts/projects/2019-02-24-dw.md b/_posts/projects/2019-02-24-dw.md
index f932f50d..c0b0d66a 100644
--- a/_posts/projects/2019-02-24-dw.md
+++ b/_posts/projects/2019-02-24-dw.md
@@ -1,6 +1,5 @@
---
layout: single
-<<<<<<< HEAD
title: "DW Editorial Lead"
categories: projects
excerpt: "Led online editorial team for DIGITALE WELT Magazin (2018-2023)."
@@ -41,14 +40,3 @@ Prior to leading the online team, I contributed to the print editions of the mag
-=======
-title: "Leading an editorial office."
-categories: projects
-excerpt: "A unique line of text to describe this post that will display in an archive listing and meta description with SEO benefits."
-header:
- teaser: assets/images/projects/dw.png
-
----
-
-{: .align-left style="padding:0.1em; width:5em"}
->>>>>>> d0fa738f (rebase from mnml mistakes source)
diff --git a/_posts/projects/2019-02-24-water-networks.md b/_posts/projects/2019-02-24-water-networks.md
index 8e7d8f26..cf99a440 100644
--- a/_posts/projects/2019-02-24-water-networks.md
+++ b/_posts/projects/2019-02-24-water-networks.md
@@ -1,6 +1,5 @@
---
layout: single
-<<<<<<< HEAD
title: "ErLoWa Leak Detection"
categories: projects
excerpt: "Deep learning detects acoustic water leaks with SWM."
@@ -60,15 +59,3 @@ In collaboration with Munich's municipal utility provider, Stadtwerke München (
This applied research project provided valuable experience in handling real-world sensor data, adapting machine learning models for specific industrial challenges, and collaborating effectively with industry partners.
{% include reference.html %}
-=======
-title: "Detection and localization of leakages in water networks."
-categories: projects
-excerpt: "A u"
-tags: acoustic anomaly-detection
-header:
- teaser: assets/images/projects/pipe_leak.png
-
----
-
-{: .align-left style="padding:0.1em; width:5em"}
->>>>>>> d0fa738f (rebase from mnml mistakes source)
diff --git a/_posts/projects/2019-10-15-OpenMunich.md b/_posts/projects/2019-10-15-OpenMunich.md
index 1ec44135..f6732910 100644
--- a/_posts/projects/2019-10-15-OpenMunich.md
+++ b/_posts/projects/2019-10-15-OpenMunich.md
@@ -1,6 +1,5 @@
---
layout: single
-<<<<<<< HEAD
title: "OpenMunich Conference Organization"
categories: projects
tags: community-engagement
@@ -35,14 +34,3 @@ The OpenMunich conference series during 2016 until 2019 offered a platform to sh
* **Sponsorship Liaison:** Coordinated with Accenture and Red Hat regarding their sponsorship contributions and participation requirements.
This role required organizational skills, effective communication across diverse stakeholder groups, and project management to ensure the successful delivery of the conference.
-=======
-title: "OpenMunich.eu - Conference Organisation"
-categories: acoustic anomaly-detection projects
-excerpt: "Organization a Munich based open-souce conference with Red Hat and Accenture"
-header:
- teaser: assets/images/projects/openmunich.png
-
----
-
-{: .align-left style="padding:0.1em; width:5em"}
->>>>>>> d0fa738f (rebase from mnml mistakes source)
diff --git a/_posts/projects/2020-05-01-FIKS.md b/_posts/projects/2020-05-01-FIKS.md
index 90b05e76..912f57af 100644
--- a/_posts/projects/2020-05-01-FIKS.md
+++ b/_posts/projects/2020-05-01-FIKS.md
@@ -1,6 +1,5 @@
---
layout: single
-<<<<<<< HEAD
title: "AI-Fusion Safety"
categories: projects
tags: multi-agent-systems reinforcement-learning safety emergence simulation
@@ -68,14 +67,3 @@ To facilitate research into these phenomena, key contributions included the deve
This project involved close collaboration with industry-focused researchers, software development adhering to modern standards, and deep investigation into the theoretical underpinnings of emergence and safety in MARL systems. The developed tools provide a valuable platform for continued research in this critical area.
{% include reference.html %}
-=======
-title: "AI-Fusion: Emergence Detection for mixed MARL systems."
-categories: acoustic anomaly-detection projects
-excerpt: "Bringing together agents can be an inherent safety problem. Building the basis to mix and match."
-header:
- teaser: assets/images/projects/robot.png
-
----
-
-{: .align-left style="padding:0.1em; width:5em"}
->>>>>>> d0fa738f (rebase from mnml mistakes source)
diff --git a/_posts/projects/2023-10-15-server-administration.md b/_posts/projects/2023-10-15-server-administration.md
index 710a009c..c28baf37 100644
--- a/_posts/projects/2023-10-15-server-administration.md
+++ b/_posts/projects/2023-10-15-server-administration.md
@@ -1,6 +1,5 @@
---
layout: single
-<<<<<<< HEAD
title: "LMU DevOps Admin"
categories: projects
tags: devops kubernetes server-administration infrastructure
@@ -52,12 +51,3 @@ During my tenure at the LMU Chair for Mobile and Distributed Systems, alongside
This hands-on role provided deep practical experience in modern system administration, networking, Infrastructure as Code (IaC), and cloud-native technologies within an academic research setting. It fostered my preference for minimalist, reproducible, and microservice-oriented architectures. These principles and skills are actively applied in my personal projects, including the self-hosting and management of this website and various other containerized services.
A more comprehensive list of the technologies I work with can be found on the [About Me](/about/) page.
-=======
-title: "Linux Server Administration"
-categories: projects server_admin unix
-excerpt: "Linux Server Administration (Workstations and Web)"
-header:
- teaser: assets/images/projects/arch.png
----
-{: .align-left style="padding:0.1em; width:5em"}
->>>>>>> d0fa738f (rebase from mnml mistakes source)
diff --git a/_posts/research/2020-03-01-soccer-team-vectors.md b/_posts/research/2020-03-01-soccer-team-vectors.md
index 5e0e31dc..2e3e293d 100644
--- a/_posts/research/2020-03-01-soccer-team-vectors.md
+++ b/_posts/research/2020-03-01-soccer-team-vectors.md
@@ -1,6 +1,5 @@
---
layout: single
-<<<<<<< HEAD
title: "Soccer Team Vectors"
categories: research
tags: machine-learning representation-learning sports-analytics similarity-search
@@ -22,16 +21,3 @@ The utility of these learned representations is demonstrated through several dow
* **Team Ranking:** The embeddings provide a basis for generating data-driven team rankings.
Across these application domains, STEVE demonstrated superior performance compared to competing approaches evaluated in the study. This work provides a valuable tool for quantitative analysis in sports analytics, enabling various machine learning tasks related to team comparison and prediction. For a comprehensive description of the methodology and results, please refer to the publication by {% cite muller2020soccer %}.
-=======
-title: "Learning Soccer-Team Vecors"
-categories: research
-excerpt: "Team market value estimation, similarity search and rankings."
-header:
- teaser: assets/figures/2_steve_algo.jpg
----
-
-In this work we present STEVE - Soccer TEam VEctors, a principled approach for learning real valued vectors for soccer teams where similar teams are close to each other in the resulting vector space. STEVE only relies on freely available information about the matches teams played in the past. These vectors can serve as input to various machine learning tasks. Evaluating on the task of team market value estimation, STEVE outperforms all its competitors. Moreover, we use STEVE for similarity search and to rank soccer teams.
-{% cite muller2020soccer %}
-
-{:style="display:block; margin-left:auto; margin-right:auto;"}
->>>>>>> d0fa738f (rebase from mnml mistakes source)
diff --git a/_posts/teaching/2018-02-15-computer_achitecture.md b/_posts/teaching/2018-02-15-computer_achitecture.md
index a6c94b21..128a5e93 100644
--- a/_posts/teaching/2018-02-15-computer_achitecture.md
+++ b/_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