From a3409c1e73038a36d1de057ac42741dac88a5330 Mon Sep 17 00:00:00 2001
From: Mattis <mattis.hoppe@rwth-aachen.de>
Date: Wed, 2 Feb 2022 18:17:01 +0100
Subject: [PATCH 1/2] collision log and trajectory marker

---
 .gitignore                                    |  4 ++-
 pom.xml                                       |  4 +--
 settings.xml                                  | 25 +++++++++++--------
 .../de/rwth/montisim/basic_simulator/App.java |  5 +---
 .../basic_simulator/gui/ScenarioVis.java      | 12 ++++++++-
 5 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index 872a0c9..ca21cd6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,8 @@
 install/hardware_emulator_lib.dll
 install/hardware_emulator_lib.so
 install/basic-simulator.jar
+install/results/*
 dependency-reduced-pom.xml
 .vscode/
-.factorypath
\ No newline at end of file
+.factorypath
+*.log
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index beec20b..9bb90d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,12 +9,12 @@
 
     <groupId>montisim</groupId>
     <artifactId>basic-simulator</artifactId>
-    <version>2.2.1</version>
+    <version>2.2.2</version>
 
     <name>basic-simulator</name>
 
     <properties>
-        <montisim.hardware_emulator.version>2.0.14</montisim.hardware_emulator.version>
+        <montisim.hardware_emulator.version>2.1.2-SNAPSHOT</montisim.hardware_emulator.version>
 
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/settings.xml b/settings.xml
index 4369f88..f9666cd 100644
--- a/settings.xml
+++ b/settings.xml
@@ -37,10 +37,10 @@
       <mirrorOf>rosjava_mvn</mirrorOf>
       <url>https://github.com/rosjava/rosjava_mvn_repo/raw/master/</url>
     </mirror>
-    <mirror> 
-      <id>jfrog_repo</id>
-      <mirrorOf>jfrog</mirrorOf>
-      <url>https://repo.jfrog.org/artifactory/libs-releases</url>
+    <mirror>
+        <id>central</id>
+        <mirrorOf>central</mirrorOf>
+        <url>http://maven.icm.edu.pl/artifactory/repo/</url>
     </mirror>
   </mirrors>
   
@@ -50,20 +50,25 @@
       <repositories>
         <repository>
           <id>central</id>
-          <url>http://central</url>
+          <url>https://repo1.maven.org/maven2/</url>
           <releases><enabled /></releases>
           <snapshots><enabled /></snapshots>
         </repository>
+        <repository>
+            <id>spring</id>
+            <url>https://repo.spring.io/libs-release/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
         <repository>
           <id>rosjava_mvn</id>
           <name>Public Rosjava repository</name>
           <url>https://github.com/rosjava/rosjava_mvn_repo/raw/master</url>
         </repository>
-        <repository>
-          <id>jfrog</id>
-          <name>JFrog repository</name>
-          <url>https://repo.jfrog.org/artifactory/libs-releases</url>
-        </repository>
       </repositories>
       <pluginRepositories>
         <pluginRepository>
diff --git a/src/main/java/de/rwth/montisim/basic_simulator/App.java b/src/main/java/de/rwth/montisim/basic_simulator/App.java
index 30fca37..6c05448 100644
--- a/src/main/java/de/rwth/montisim/basic_simulator/App.java
+++ b/src/main/java/de/rwth/montisim/basic_simulator/App.java
@@ -156,12 +156,9 @@ public class App
             SimulationConfig config = SimulationConfig.fromFile(scenarioFile);
             File mapPath = new File(config.map_name + ".osm");
             OsmMap map = new OsmMap(config.map_name, mapPath);
-            World world = new OsmToWorldLoader(map).getWorld();
-            Pathfinding pathfinding = new PathfindingImpl(world);
-            Simulator simulator = config.build(world, pathfinding, map);
 
             //Run Simulation
-            RLSimulationInit simInit = new RLSimulationInit(config, world, pathfinding, map);
+            RLSimulationInit simInit = new RLSimulationInit(config, map);
             simInit.setRLSettings(distributed, randomize, play);
             simInit.init();
         } catch (Exception e1) {
diff --git a/src/main/java/de/rwth/montisim/basic_simulator/gui/ScenarioVis.java b/src/main/java/de/rwth/montisim/basic_simulator/gui/ScenarioVis.java
index ffcc5c1..556ee62 100644
--- a/src/main/java/de/rwth/montisim/basic_simulator/gui/ScenarioVis.java
+++ b/src/main/java/de/rwth/montisim/basic_simulator/gui/ScenarioVis.java
@@ -104,7 +104,7 @@ public class ScenarioVis extends SimVis implements SimulationRunner {
         }
         if(current_scenario.charAt(0) == 'r' && current_scenario.charAt(1) == 'l'){
             topPanel.remove(control);
-            RLVisualizer viz = new RLVisualizer(world, map, pathfinding, simConfig, viewer, simConfig.start_time);
+            RLVisualizer viz = new RLVisualizer(map, simConfig, viewer, simConfig.start_time);
             viz.init(distributed, randomize, play);
             return;
         }
@@ -263,6 +263,16 @@ public class ScenarioVis extends SimVis implements SimulationRunner {
         });
         interm.add(checkBox4);
 
+        JCheckBox checkBox5 = new JCheckBox("Show driven Trajectory", UIInfo.drawDrivenTrajectory);
+        checkBox5.addItemListener(new ItemListener() {
+            public void itemStateChanged(ItemEvent e) {
+                UIInfo.drawDrivenTrajectory = e.getStateChange() == 1;
+                viewer.setDirty();
+                viewer.repaint();
+            }
+        });
+        interm.add(checkBox5);
+        
         JPanel bottomPanel = new JPanel();
         bottomPanel.setLayout(new BoxLayout(bottomPanel, BoxLayout.Y_AXIS));
         bottomPanel.setBorder(Browser.paneBorder);
-- 
GitLab


From 5e094868871f8ce4c7c180540d2bd8881cd7410d Mon Sep 17 00:00:00 2001
From: Mattis <mattis.hoppe@rwth-aachen.de>
Date: Thu, 3 Feb 2022 19:05:57 +0100
Subject: [PATCH 2/2] pom and settings cleanup

---
 settings.xml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/settings.xml b/settings.xml
index f9666cd..413d016 100644
--- a/settings.xml
+++ b/settings.xml
@@ -37,11 +37,6 @@
       <mirrorOf>rosjava_mvn</mirrorOf>
       <url>https://github.com/rosjava/rosjava_mvn_repo/raw/master/</url>
     </mirror>
-    <mirror>
-        <id>central</id>
-        <mirrorOf>central</mirrorOf>
-        <url>http://maven.icm.edu.pl/artifactory/repo/</url>
-    </mirror>
   </mirrors>
   
   <profiles>
@@ -54,7 +49,7 @@
           <releases><enabled /></releases>
           <snapshots><enabled /></snapshots>
         </repository>
-        <repository>
+<!--        <repository>
             <id>spring</id>
             <url>https://repo.spring.io/libs-release/</url>
             <releases>
@@ -63,7 +58,7 @@
             <snapshots>
                 <enabled>true</enabled>
             </snapshots>
-        </repository>
+        </repository>-->
         <repository>
           <id>rosjava_mvn</id>
           <name>Public Rosjava repository</name>
-- 
GitLab