Commit d015c12f authored by Mattis Hoppe's avatar Mattis Hoppe
Browse files

rl commit

parent f6bdfd5a
Pipeline #561430 passed with stage
in 1 minute and 49 seconds
{
"name": "rl_autopilot",
"map_name": "maps/aachen",
"max_duration": [60,0],
"tick_duration": [0,10000000],
"cars": [
{
"start_pos": [ -123.09, 21.64 ],
"start_orientation": -25.0,
"task": {
"goals": [
{
"type": "path",
"ltl_operator": "eventually",
"path": [ [-20.0, -13.0] ],
"range": 5
}
]
},
"components": [
{
"type": "constant_bus",
"connected_to": [
"SteeringActuator",
"BrakingActuator",
"GasActuator",
"TrueVelocitySensor",
"TruePositionSensor",
"TrueCompassSensor",
"Navigation",
"RLAutopilot"
]
},
{
"type": "actuator",
"name": "SteeringActuator",
"physical_value_name": "steering",
"change_rate": 60.0,
"sensor": { "type": "sensor" }
},
{
"type": "actuator",
"name": "BrakingActuator",
"physical_value_name": "braking",
"change_rate": 10.0,
"sensor": { "type": "sensor" }
},
{
"type": "actuator",
"name": "GasActuator",
"physical_value_name": "gas",
"sensor": { "type": "sensor" }
},
{
"type": "sensor",
"name": "TrueVelocitySensor",
"physical_value_name": "true_velocity"
},
{
"type": "sensor",
"name": "TruePositionSensor",
"physical_value_name": "true_position"
},
{
"type": "sensor",
"name": "TrueCompassSensor",
"physical_value_name": "true_compass"
},
{ "type": "navigation" },
{
"type": "rl_autopilot",
"name": "RLAutopilot",
"maxVehicleAccel": 7.460690450979396
}
]
}
]
}
{
"name": "rl_autopilot",
"map_name": "maps/aachen",
"max_duration": [60,0],
"tick_duration": [0,10000000],
"cars": [
{
"name": "Car1",
"start_pos": [ -123.09, 21.64 ],
"start_orientation": -30.0,
"task": {
"goals": [
{
"type": "path",
"ltl_operator": "eventually",
"path": [ [-63.83, -171.96] ],
"range": 5
}
]
},
"components": [
{
"type": "constant_bus",
"connected_to": [
"SteeringActuator",
"BrakingActuator",
"GasActuator",
"TrueVelocitySensor",
"TruePositionSensor",
"TrueCompassSensor",
"Navigation",
"RLAutopilot"
]
},
{
"type": "actuator",
"name": "SteeringActuator",
"physical_value_name": "steering",
"change_rate": 60.0,
"sensor": { "type": "sensor" }
},
{
"type": "actuator",
"name": "BrakingActuator",
"physical_value_name": "braking",
"change_rate": 10.0,
"sensor": { "type": "sensor" }
},
{
"type": "actuator",
"name": "GasActuator",
"physical_value_name": "gas",
"sensor": { "type": "sensor" }
},
{
"type": "sensor",
"name": "TrueVelocitySensor",
"physical_value_name": "true_velocity"
},
{
"type": "sensor",
"name": "TruePositionSensor",
"physical_value_name": "true_position"
},
{
"type": "sensor",
"name": "TrueCompassSensor",
"physical_value_name": "true_compass"
},
{ "type": "navigation" },
{
"type": "rl_autopilot",
"name": "RLAutopilot",
"maxVehicleAccel": 7.460690450979396
}
]
},
{
"name": "Car2",
"start_pos": [ -123.09, 21.64 ],
"start_orientation": -30.0,
"task": {
"goals": [
{
"type": "path",
"ltl_operator": "eventually",
"path": [ [-63.83, -171.96] ],
"range": 5
}
]
},
"components": [
{
"type": "constant_bus",
"connected_to": [
"SteeringActuator",
"BrakingActuator",
"GasActuator",
"TrueVelocitySensor",
"TruePositionSensor",
"TrueCompassSensor",
"Navigation",
"RLAutopilot"
]
},
{
"type": "actuator",
"name": "SteeringActuator",
"physical_value_name": "steering",
"change_rate": 60.0,
"sensor": { "type": "sensor" }
},
{
"type": "actuator",
"name": "BrakingActuator",
"physical_value_name": "braking",
"change_rate": 10.0,
"sensor": { "type": "sensor" }
},
{
"type": "actuator",
"name": "GasActuator",
"physical_value_name": "gas",
"sensor": { "type": "sensor" }
},
{
"type": "sensor",
"name": "TrueVelocitySensor",
"physical_value_name": "true_velocity"
},
{
"type": "sensor",
"name": "TruePositionSensor",
"physical_value_name": "true_position"
},
{
"type": "sensor",
"name": "TrueCompassSensor",
"physical_value_name": "true_compass"
},
{ "type": "navigation" },
{
"type": "rl_autopilot",
"name": "RLAutopilot",
"maxVehicleAccel": 7.460690450979396
}
]
}
]
}
{
"name": "rl_autopilot",
"map_name": "aachen",
"max_duration": [60,0],
"tick_duration": [0,10000000],
"cars": [
{
"name": "Car1",
"start_pos": [ -123.09, 21.64 ],
"start_orientation": -30.0,
"task": {
"goals": [
{
"type": "path",
"ltl_operator": "eventually",
"path": [ [-63.83, -171.96] ],
"range": 5
}
]
},
"components": [
{
"type": "constant_bus",
"connected_to": [
"SteeringActuator",
"BrakingActuator",
"GasActuator",
"TrueVelocitySensor",
"TruePositionSensor",
"TrueCompassSensor",
"Navigation",
"RLAutopilot"
]
},
{
"type": "actuator",
"name": "SteeringActuator",
"physical_value_name": "steering",
"change_rate": 60.0,
"sensor": { "type": "sensor" }
},
{
"type": "actuator",
"name": "BrakingActuator",
"physical_value_name": "braking",
"change_rate": 10.0,
"sensor": { "type": "sensor" }
},
{
"type": "actuator",
"name": "GasActuator",
"physical_value_name": "gas",
"sensor": { "type": "sensor" }
},
{
"type": "sensor",
"name": "TrueVelocitySensor",
"physical_value_name": "true_velocity"
},
{
"type": "sensor",
"name": "TruePositionSensor",
"physical_value_name": "true_position"
},
{
"type": "sensor",
"name": "TrueCompassSensor",
"physical_value_name": "true_compass"
},
{ "type": "navigation" },
{
"type": "rl_autopilot",
"name": "RLAutopilot",
"maxVehicleAccel": 7.460690450979396
}
]
},
{
"name": "Car2",
"start_pos": [ -123.09, 21.64 ],
"start_orientation": -30.0,
"task": {
"goals": [
{
"type": "path",
"ltl_operator": "eventually",
"path": [ [-63.83, -171.96] ],
"range": 5
}
]
},
"components": [
{
"type": "constant_bus",
"connected_to": [
"SteeringActuator",
"BrakingActuator",
"GasActuator",
"TrueVelocitySensor",
"TruePositionSensor",
"TrueCompassSensor",
"Navigation",
"RLAutopilot"
]
},
{
"type": "actuator",
"name": "SteeringActuator",
"physical_value_name": "steering",
"change_rate": 60.0,
"sensor": { "type": "sensor" }
},
{
"type": "actuator",
"name": "BrakingActuator",
"physical_value_name": "braking",
"change_rate": 10.0,
"sensor": { "type": "sensor" }
},
{
"type": "actuator",
"name": "GasActuator",
"physical_value_name": "gas",
"sensor": { "type": "sensor" }
},
{
"type": "sensor",
"name": "TrueVelocitySensor",
"physical_value_name": "true_velocity"
},
{
"type": "sensor",
"name": "TruePositionSensor",
"physical_value_name": "true_position"
},
{
"type": "sensor",
"name": "TrueCompassSensor",
"physical_value_name": "true_compass"
},
{ "type": "navigation" },
{
"type": "rl_autopilot",
"name": "RLAutopilot",
"maxVehicleAccel": 7.460690450979396
}
]
}
]
}
{
"name": "rl_autopilot",
"map_name": "aachen",
"max_duration": [60,0],
"tick_duration": [0,10000000],
"cars": [
{
"start_pos": [ -123.09, 21.64 ],
"start_orientation": -30.0,
"task": {
"goals": [
{
"type": "path",
"ltl_operator": "eventually",
"path": [ [-63.83, -171.96] ],
"range": 5
}
]
},
"components": [
{
"type": "constant_bus",
"connected_to": [
"SteeringActuator",
"BrakingActuator",
"GasActuator",
"TrueVelocitySensor",
"TruePositionSensor",
"TrueCompassSensor",
"Navigation",
"RLAutopilot"
]
},
{
"type": "actuator",
"name": "SteeringActuator",
"physical_value_name": "steering",
"change_rate": 60.0,
"sensor": { "type": "sensor" }
},
{
"type": "actuator",
"name": "BrakingActuator",
"physical_value_name": "braking",
"change_rate": 10.0,
"sensor": { "type": "sensor" }
},
{
"type": "actuator",
"name": "GasActuator",
"physical_value_name": "gas",
"sensor": { "type": "sensor" }
},
{
"type": "sensor",
"name": "TrueVelocitySensor",
"physical_value_name": "true_velocity"
},
{
"type": "sensor",
"name": "TruePositionSensor",
"physical_value_name": "true_position"
},
{
"type": "sensor",
"name": "TrueCompassSensor",
"physical_value_name": "true_compass"
},
{ "type": "navigation" },
{
"type": "rl_autopilot",
"name": "RLAutopilot",
"maxVehicleAccel": 7.460690450979396
}
]
}
]
}
......@@ -9,13 +9,13 @@
<groupId>montisim</groupId>
<artifactId>basic-simulator</artifactId>
<version>2.1.10</version>
<version>2.1.11</version>
<name>basic-simulator</name>
<properties>
<!-- USE THESE TO SET THE VERSIONS OF THE DEPENDENCIES FOR ALL THE SUB-PROJECTS -->
<montisim.hardware_emulator.version>2.0.11</montisim.hardware_emulator.version>
<montisim.hardware_emulator.version>2.0.12</montisim.hardware_emulator.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
......@@ -43,35 +43,6 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.1.1</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<filters>
</filters>
<minimizeJar>true</minimizeJar>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>de.rwth.montisim.basic_simulator.App</mainClass>
</transformer>
</transformers>
<outputFile>${project.basedir}/install/${project.name}.jar</outputFile>
<descriptors>
<descriptor>src/main/assembly/application.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
......@@ -120,7 +91,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.3.2</version>
<version>1.4.0</version>
<executions>
<execution>
<goals>
......@@ -132,12 +103,37 @@
<executable>java</executable>
<arguments>
<argument>-classpath</argument>
<classpath />
<classpath/>
<argument>de.rwth.montisim.basic_simulator.App</argument>
</arguments>
<workingDirectory>${project.basedir}/install</workingDirectory>
</configuration>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
<configuration>
<archive>
<manifest>
<mainClass>de.rwth.montisim.basic_simulator.App</mainClass>
</manifest>
</archive>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
<appendAssemblyId>false</appendAssemblyId>
<useProjectArtifact>false</useProjectArtifact>
<outputDirectory>${project.basedir}/install</outputDirectory>
<finalName>${project.name}</finalName>
</configuration>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
......
......@@ -26,12 +26,58 @@
</server>
</servers>
<mirrors>
<mirrors>
<mirror>
<id>se-nexus</id>
<mirrorOf>external:*</mirrorOf>
<url>https://nexus.se.rwth-aachen.de/content/groups/public</url>
</mirror>
</mirror>
<mirror>
<id>rosjava_mvn_repo</id>
<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>
</mirrors>
<profiles>
<profile>
<id>se-nexus</id>
<repositories>
<repository>
<id>central</id>
<url>http://central</url>
<releases><enabled /></releases>
<snapshots><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>