Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
sunava authored Feb 27, 2024
2 parents 8196aab + 5e1e7b7 commit 7d0c390
Show file tree
Hide file tree
Showing 11 changed files with 21 additions and 10 deletions.
3 changes: 3 additions & 0 deletions config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@ pygmentsCodefencesGuessSyntax = true
[[Params.bigimg]]
src = "img/Neujahrskarte_2023_ViB_layer_11.jpg"

[[Params.bigredimg]]
src = "img/ViB_banner_Uni_Rot.png"


[Author]
# Set only your "username" for default hosts and full URLs otherwise (e.g., "https://MyGitLab.org/username")
Expand Down
3 changes: 2 additions & 1 deletion content/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<p>In our innovative Virtual Research and Training Building (ViB) we aim at providing convenient open access to our research infrastructure for cooperative and cognition-enabled robotics and AI through our ViB.</br></br>Researchers worldwide can access the ViB to conduct research in virtual labs with digital twin robots and their control software, and household and retail experimental environments, as well as virtual knowledge labs and everyday activity labs.</p>
</div>
<div class="right-main-well-flex">
<img class="timer-change-image" data-wait="5000" data-imgs='[{"src":"img/popcorn_making.jpg"},{"src":"img/pot_grasping.jpg"},{"src":"img/learning_from_videos.jpg"},{"src":"img/picking_up_actions.jpg"}]'>
<!-- <img class="timer-change-image" data-wait="5000" data-imgs='[{"src":"img/popcorn_making.jpg"},{"src":"img/pot_grasping.jpg"},{"src":"img/learning_from_videos.jpg"},{"src":"img/picking_up_actions.jpg"}]'> -->
<img class="timer-change-image" data-wait="5000" data-imgs='[{"src":"img/pr2_holding_pot.png"},{"src":"img/pr2_image_sequence.png"},{"src":"img/pr2_learning_human.png"}]'>
</div>
</div>
11 changes: 6 additions & 5 deletions content/page/labs/Food Cutting Robots/index.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: "Food Cutting Robots"
date: 2023-11-30T14:33:42-04:00
title: "Using Web Knowledge For Flexible Meal Preparation"
date: 2024-02-27T14:33:42-04:00
subtitle: ""
tags: ["Research"]
dropCap: false
Expand All @@ -12,17 +12,18 @@ resources:
src: "buttons.json"
---

In this research lab you can join our research activity targeting robots learning abstract knowledge into comprehensive knowledge graphs, and making the knowledge "activable" in robot agents.
This project deals with the problem of teaching robots how to execute a wide range of meal preparation tasks. For this, we first focus on the task of <b>Cutting Food</b>. We propose to access Web knowledge to teach robots how to perform a variety of cutting actions on a range ob objects.
<a href="https://food-ninja.github.io/FoodCutting/">On this website</a> you can get more information and an idea on how a robot would parameterise action plans to execute meal preparation tasks.

<param class="hidde-after-preview">
{{<action_forms data="ActionButtons">}}
{{<action_form data="ActionButtons">}}

<!--more-->


Interactive Actions and/or Examples
---

{{<action_forms data="ActionButtons">}}
{{<action_form data="ActionButtons">}}

</br>
3 changes: 2 additions & 1 deletion layouts/_default/baseof.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<div class="flex-item-left">
<div class="sidebar-image-container">
<img class="sidebar-image-sticky" src="{{ .Site.Params.rightsideimg | absURL }}" width="1000px" height="1000px">
<img class="sidebar-image-sticky" src="{{ .Site.Params.rightsideimg | absURL }}" width="100%" height="1200px">
</div>
</div>

Expand All @@ -28,6 +28,7 @@

<!-- item on the right side with all the logos-->
<div class="flex-item-right">

<!-- <div style="position: relative; left: 85%; top: 20%; overflow: hidden; margin-right: 2%;"></div> -->
<div style="position: relative;">
<div style="top: 45px; overflow-y: scroll;">
Expand Down
1 change: 0 additions & 1 deletion layouts/_default/single.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<div class="col-lg-10 col-lg-offset-1 col-md-10 col-md-offset-1">
<article role="main" class="blog-post">
{{ .Content }}

{{ if .Params.tags }}
<div class="blog-tags">
{{ range .Params.tags }}
Expand Down
4 changes: 2 additions & 2 deletions layouts/partials/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<div class="container">
<div class="row">
<div class="col-lg-10 col-lg-offset-1 col-md-10 col-md-offset-1">
<div class="{{ .Type }}-heading">
<!-- <div class="{{ .Type }}-heading">
<h1>{{ with $.Scratch.Get "title" }}{{.}}{{ else }}<br/>{{ end }}</h1>
{{ if $subtitle }}
{{ if eq .Type "page" }}
Expand All @@ -47,7 +47,7 @@ <h2 class="{{ .Type }}-subheading">{{ $subtitle }}</h2>
{{ if eq .Type "post" }}
{{ partial "post_meta.html" . }}
{{ end }}
</div>
</div> -->
</div>
</div>
</div>
Expand Down
6 changes: 6 additions & 0 deletions static/css/override.css
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,12 @@ div.post-entry param.hidde-after-preview + *, div.post-entry div.hidde-after-pre
}
}
@media only screen and (max-width: 1280px) { /* remove left side image when screen to small */
.flex-item-right {
display: none;
}
}

/* homepage main content about block */
div.main-well-flex-container {
display: flex;
Expand Down
Binary file added static/img/ViB_banner_Uni_Rot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added static/img/pr2_holding_pot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added static/img/pr2_image_sequence.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added static/img/pr2_learning_human.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 7d0c390

Please sign in to comment.