Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:movsim/movsim into develop
Browse files Browse the repository at this point in the history 
essary,
  • Loading branch information
@akegermany
akegermany committed Aug 29, 2018
2 parents b6e16bf + 37d8767 commit 4439735
Show file tree
Hide file tree
Showing 12 changed files with 2,854 additions and 2,104 deletions.
6 changes: 6 additions & 0 deletions .gitignore
View file
Expand Up @@ -11,6 +11,9 @@ csv/
# git merge files
*.orig

# java misson control
*.jfr

########
# IDEs #

Expand Down Expand Up @@ -48,6 +51,9 @@ out/
logs/
classes/

# maven
dependency-reduced-pom.xml

# Log file
*.log

Expand Down
24 changes: 1 addition & 23 deletions common/pom.xml
View file
Expand Up @@ -26,28 +26,6 @@
<version>2.3</version>
</dependency>
</dependencies>
<build>
<plugins>
<!-- build executable jar with all dependencies -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<!--<version></version>-->
<configuration>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

</project>

60 changes: 33 additions & 27 deletions consumption/pom.xml
View file
Expand Up @@ -25,33 +25,39 @@
<version>${project.version}</version>
</dependency>
</dependencies>

<build>
<plugins>
<!-- build executable jar with all dependencies -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<!-- <version> </version> -->
<configuration>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
<archive>
<manifest>
<mainClass>org.movsim.consumption.ConsumptionMain</mainClass>
</manifest>
</archive>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>2.4.3</version>
<configuration>
<shadedArtifactAttached>true</shadedArtifactAttached>
<shadedClassifierName>jar-with-dependencies</shadedClassifierName>
<transformers>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer">
</transformer>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<manifestEntries>
<Main-Class>org.movsim.MovsimCoreMain</Main-Class>
</manifestEntries>
</transformer>
</transformers>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

</project>

62 changes: 34 additions & 28 deletions core/pom.xml
View file
Expand Up @@ -32,33 +32,39 @@
<version>0.8.3</version>
</dependency>
</dependencies>
<build>
<plugins>
<!-- build executable jar with all dependencies -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<!-- <version> </version> -->
<configuration>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
<archive>
<manifest>
<mainClass>org.movsim.MovsimCoreMain</mainClass>
</manifest>
</archive>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>2.4.3</version>
<configuration>
<shadedArtifactAttached>true</shadedArtifactAttached>
<shadedClassifierName>jar-with-dependencies</shadedClassifierName>
<transformers>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer">
</transformer>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<manifestEntries>
<Main-Class>org.movsim.MovsimCoreMain</Main-Class>
</manifestEntries>
</transformer>
</transformers>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

</project>

11 changes: 6 additions & 5 deletions core/src/main/java/org/movsim/input/network/OpenDriveHandler.java
View file
Expand Up @@ -483,11 +483,12 @@ private static void joinByLanes(RoadNetwork roadNetwork, Road road, List<Lane> l
roadSegment);
}
}
if (lane.getLink().isSetSuccessor()) {
if (!hasRoadSuccessor(road)) {
throw new IllegalArgumentException(
"successor lane link but no road link defined for road=" + road.getId());
}
if (lane.getLink().isSetSuccessor() && !road.isSetJunction()) {
if (!hasRoadSuccessor(road)) {
throw new IllegalArgumentException(
"successor lane link but no road link defined for road=" + road.getId() + " name="
+ road.getName() + " junction=" + road.getJunction() + " lane=" + lane.getId());
}
int fromLane = lane.getId();
RoadSegment roadSegment = getRoadSegment(roadNetwork, road.getId(), fromLane);
int toLane = lane.getLink().getSuccessor().getId();
Expand Down
18 changes: 1 addition & 17 deletions pom.xml
View file
Expand Up @@ -16,8 +16,8 @@
<projectVersion>${project.version}</projectVersion>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven-javadoc-plugin.version>3.0.1</maven-javadoc-plugin.version>
<findbugs-maven-plugin.version>3.0.1</findbugs-maven-plugin.version>
<maven-javadoc-plugin.version>3.0.1</maven-javadoc-plugin.version>
<!-- dependency version -->
<jdom.version>2.0.2</jdom.version>
<jaxb2-basics.version>1.11.1</jaxb2-basics.version>
Expand Down Expand Up @@ -145,12 +145,6 @@
<artifactId>log4j-core</artifactId>
<version>2.11.0</version>
</dependency>
<!--<dependency>-->
<!--<groupId>log4j</groupId>-->
<!--<artifactId>log4j</artifactId>-->
<!--<version>1.2.16</version>-->
<!--<type>jar</type>-->
<!--</dependency>-->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
Expand Down Expand Up @@ -210,15 +204,5 @@
<scope>test</scope>
</dependency>
</dependencies>
<reporting>
<!-- mvn site -->
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.7</version>
</plugin>
</plugins>
</reporting>
</project>

0 comments on commit 4439735

Please sign in to comment.