Commit 1b86c7bc authored by Jean Meurice's avatar Jean Meurice
Browse files

Version-up clean-up

parent 58bb655e
Pipeline #115836 passed with stage
in 3 minutes and 13 seconds
mvn clean install -DskipTests -s settings.xml
\ No newline at end of file
......@@ -5,11 +5,11 @@ SET CONFIG_FILE=config.properties
SET SQLITE_DB_DIR=docs\DBscripts
SET SQLITE_DB_FILE=world.db
SET SFS_DIR=A:\EmbededMontiArcNew\SFS2X
SET SFS_DIR=C:\SmartFoxServer_2X\SFS2X
SET SFS_EXT_DIR=%SFS_DIR%\extensions\AllInOne
copy %CONFIG_DIR%\%CONFIG_FILE% %SFS_EXT_DIR%\%CONFIG_FILE%
REM copy %SQLITE_DB_DIR%\%SQLITE_DB_FILE% %SFS_EXT_DIR%\%SQLITE_DB_FILE%
copy %SQLITE_DB_DIR%\%SQLITE_DB_FILE% %SFS_EXT_DIR%\%SQLITE_DB_FILE%
copy ..\simulation\lib\InputFilter.fmu %SFS_DIR%\lib\InputFilter.fmu
copy ..\simulation\lib\Chassis.fmu %SFS_DIR%\lib\Chassis.fmu
......
......@@ -27,7 +27,7 @@
<artifactId>server</artifactId>
<groupId>montisim</groupId>
<version>1.0.3</version>
<version>1.0.4</version>
<packaging>jar</packaging>
......@@ -109,7 +109,7 @@
<dependency>
<groupId>montisim</groupId>
<artifactId>commons</artifactId>
<version>1.0.5-SNAPSHOT</version>
<version>1.0.6</version>
</dependency>
<dependency>
<groupId>montisim-controller</groupId>
......@@ -129,33 +129,33 @@
<dependency>
<groupId>montisim-simulation</groupId>
<artifactId>environment</artifactId>
<version>1.0.4</version>
<version>1.0.6</version>
</dependency>
<dependency>
<groupId>montisim-simulation</groupId>
<artifactId>vehicle</artifactId>
<version>1.0.5-SNAPSHOT</version>
<version>1.0.6</version>
</dependency>
<dependency>
<groupId>montisim-simulation</groupId>
<artifactId>sensors</artifactId>
<version>1.0.3</version>
<version>1.0.6</version>
</dependency>
<dependency>
<groupId>montisim-simulation</groupId>
<artifactId>network</artifactId>
<version>1.0.3</version>
<version>1.0.6</version>
</dependency>
<dependency>
<groupId>montisim-simulation</groupId>
<artifactId>simulator</artifactId>
<version>1.0.3</version>
<version>1.0.6</version>
</dependency>
<!-- RMI -->
<dependency>
<groupId>montisim</groupId>
<artifactId>rmi-model-server</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.1.0</version>
</dependency>
<!-- Autopilot -->
<dependency>
......@@ -207,7 +207,7 @@
</activation>
<properties>
<script.extension>.bat</script.extension>
<sfs.directory>A:\EmbededMontiArcNew\SFS2X</sfs.directory>
<sfs.directory>C:\SmartFoxServer_2X\SFS2X</sfs.directory>
<sfs.extensions>${sfs.directory}\extensions\AllInOne</sfs.extensions>
</properties>
</profile>
......
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
<orderEntry type="library" name="Maven: sfs:sfs2x:2.13" level="project" />
<orderEntry type="library" name="Maven: sfs:sfs2x-core:2.13" level="project" />
<orderEntry type="library" name="Maven: montisim:commons:1.0.5-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
<orderEntry type="library" name="Maven: montisim-controller:library:1.0.1" level="project" />
<orderEntry type="library" name="Maven: montisim-controller:control:1.0.1" level="project" />
<orderEntry type="library" name="Maven: montisim-controller:navigation:1.0.1" level="project" />
<orderEntry type="library" name="Maven: montisim-simulation:environment:1.0.4" level="project" />
<orderEntry type="library" name="Maven: montisim-simulation:util:1.0.4" level="project" />
<orderEntry type="library" name="Maven: jfree:jfreechart:1.0.13" level="project" />
<orderEntry type="library" name="Maven: jfree:jcommon:1.0.16" level="project" />
<orderEntry type="library" name="Maven: de.topobyte:osm4j-core:0.0.18" level="project" />
<orderEntry type="library" name="Maven: de.topobyte:adt-multicollections:0.0.3" level="project" />
<orderEntry type="library" name="Maven: net.sf.trove4j:trove4j:3.0.3" level="project" />
<orderEntry type="library" name="Maven: log4j:log4j:1.2.16" level="project" />
<orderEntry type="library" name="Maven: de.topobyte:osm4j-utils:0.0.22" level="project" />
<orderEntry type="library" name="Maven: de.topobyte:large-scale-file-io:0.0.1" level="project" />
<orderEntry type="library" name="Maven: de.topobyte:commons-cli-helper:0.0.3" level="project" />
<orderEntry type="library" name="Maven: commons-cli:commons-cli:1.3.1" level="project" />
<orderEntry type="library" name="Maven: de.topobyte:melon-io:0.0.1" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:19.0" level="project" />
<orderEntry type="library" name="Maven: de.topobyte:osm4j-xml:0.0.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.3.2" level="project" />
<orderEntry type="library" name="Maven: de.topobyte:dynsax:0.0.1" level="project" />
<orderEntry type="library" name="Maven: joda-time:joda-time:2.7" level="project" />
<orderEntry type="library" name="Maven: de.topobyte:osm4j-pbf:0.0.7" level="project" />
<orderEntry type="library" name="Maven: com.google.protobuf:protobuf-java:2.6.1" level="project" />
<orderEntry type="library" name="Maven: net.jpountz.lz4:lz4:1.3.0" level="project" />
<orderEntry type="library" name="Maven: de.topobyte:osm4j-tbo:0.0.9" level="project" />
<orderEntry type="library" name="Maven: de.topobyte:compact-io:0.0.5" level="project" />
<orderEntry type="library" name="Maven: de.topobyte:osm4j-geometry:0.0.14" level="project" />
<orderEntry type="library" name="Maven: de.topobyte:jts-utils:0.0.4" level="project" />
<orderEntry type="library" name="Maven: de.topobyte:jsi:1.1.0" level="project" />
<orderEntry type="library" name="Maven: de.topobyte:adt-graph:0.0.1" level="project" />
<orderEntry type="library" name="Maven: de.topobyte:adt-geo:0.0.2" level="project" />
<orderEntry type="library" name="Maven: com.vividsolutions:jts:1.13" level="project" />
<orderEntry type="library" name="Maven: de.topobyte:jts2awt:0.0.1" level="project" />
<orderEntry type="library" name="Maven: de.topobyte:jgs:0.0.1" level="project" />
<orderEntry type="library" name="Maven: de.topobyte:mercator-image:0.0.1" level="project" />
<orderEntry type="library" name="Maven: de.topobyte:geomath:0.0.1" level="project" />
<orderEntry type="library" name="Maven: org.wololo:jts2geojson:0.6.0" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.6.3" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.6.3" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.6.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.8" level="project" />
<orderEntry type="library" name="Maven: org.tukaani:xz:1.5" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.6.1" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.6.1" level="project" />
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
<orderEntry type="library" name="Maven: net.imagej:ij:1.51j" level="project" />
<orderEntry type="library" name="Maven: montisim-simulation:vehicle:1.0.5-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: org.siani.javafmi:fmu-wrapper:2.24.0" level="project" />
<orderEntry type="library" name="Maven: net.java.dev.jna:jna:4.1.0" level="project" />
<orderEntry type="library" name="Maven: org.simpleframework:simple-xml:2.7.1" level="project" />
<orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
<orderEntry type="library" name="Maven: stax:stax:1.2.0" level="project" />
<orderEntry type="library" name="Maven: xpp3:xpp3:1.1.3.3" level="project" />
<orderEntry type="library" name="Maven: montisim-simulation:sensors:1.0.3" level="project" />
<orderEntry type="library" name="Maven: montisim-simulation:network:1.0.3" level="project" />
<orderEntry type="library" name="Maven: montisim-simulation:simulator:1.0.3" level="project" />
<orderEntry type="library" name="Maven: montisim:rmi-model-server:1.0.1-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: jline:jline:0.9.94" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty:3.7.0.Final" level="project" />
<orderEntry type="library" name="Maven: com.101tec:zkclient:0.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper:3.3.1" level="project" />
<orderEntry type="library" name="Maven: montisim:example-autopilot-ema:0.0.5" level="project" />
<orderEntry type="library" name="Maven: de.monticore.lang.montisim:SimLang:1.0.1" level="project" />
<orderEntry type="library" name="Maven: de.monticore.lang.montisim:Util:1.0.1" level="project" />
<orderEntry type="library" name="Maven: de.monticore.lang.montisim:Weather:1.0.1" level="project" />
<orderEntry type="library" name="Maven: commons-pool:commons-pool:1.5.4" level="project" />
<orderEntry type="library" name="Maven: commons-dbcp:commons-dbcp:1.4" level="project" />
<orderEntry type="library" name="Maven: org.xerial:sqlite-jdbc:3.23.1" level="project" />
</component>
</module>
\ No newline at end of file
......@@ -12,6 +12,7 @@ import com.smartfoxserver.v2.extensions.ExtensionLogLevel;
import rwth.server.bo.util.Logger;
import rwth.server.pojo.MapArea;
import rwth.server.pojo.MapSector;
import simulation.environment.object.House;
import simulation.environment.visualisationadapter.implementation.Bounds2D;
import simulation.environment.visualisationadapter.implementation.EnvironmentContainer2D;
import simulation.environment.visualisationadapter.interfaces.Building;
......@@ -82,9 +83,11 @@ public class WorldBuilder {
//fetch streets and buildings
Collection<EnvStreet> streets = eoBo.getAllStreets(bounds, mapId);
Collection<Building> buildings = (Collection<Building>) eoBo.getAll(bounds, mapId);
return new EnvironmentContainer2D(bounds, streets, buildings);
//TODO handle buildings in EnvironmentContainer2D
//Collection<House> buildings = (Collection<Building>) eoBo.getAll(bounds, mapId);
return new EnvironmentContainer2D(bounds, streets, new ArrayList<House>());
}
private MapArea getWorldMapArea(VisualisationEnvironmentContainer worldMap) {
......
......@@ -63,7 +63,7 @@ public class StreetDao {
return new Street2D(nodes, row.getDouble("speed_limit"), intersections, osmId,
DataConverter.getBool(row.getInt("isoneway")),
StreetTypes.valueOf(row.getUtfString("street_type")));
StreetTypes.valueOf(row.getUtfString("street_type")), EnvStreet.StreetPavements.QUALITY);
}catch (SQLException e){
console.trace(ExtensionLogLevel.ERROR, e);
}
......@@ -122,7 +122,7 @@ public class StreetDao {
//register street, when all the nodes and intersections for it, have been fetched
if(osmId == null || osmId.longValue() != row.getLong("osmid")) {
if(nodes != null && nodes.size() > 1) { //street can not be defined by only one node
result.add(new Street2D(nodes, speedLimit, intersections, osmId, isOneWay, stype));
result.add(new Street2D(nodes, speedLimit, intersections, osmId, isOneWay, stype, EnvStreet.StreetPavements.QUALITY));
}
//prepare new street data
speedLimit = row.getInt("speed_limit");
......@@ -143,7 +143,7 @@ public class StreetDao {
}
//add last street
if(nodes != null && nodes.size() > 1 && osmId != null && intersections != null && stype != null)
result.add(new Street2D(nodes, speedLimit, intersections, osmId, isOneWay, stype));
result.add(new Street2D(nodes, speedLimit, intersections, osmId, isOneWay, stype, EnvStreet.StreetPavements.QUALITY));
return result;
}catch (SQLException e){
......
......@@ -85,8 +85,6 @@ public class RoomExt extends SFSExtension {
addEventListener(SFSEventType.USER_JOIN_ROOM, this);
addEventListener(SFSEventType.USER_LEAVE_ROOM, this);
System.out.println("Im new SERVER");
}
@Override
......
......@@ -93,7 +93,6 @@ public class ZoneExt extends SFSExtension {
* Initialize current extension class
*/
public void init() {
System.out.println("Im new SERVER");
//set up utils
Logger.getInstance().init(this);
ApiManager.getInstance().init(this);
......@@ -123,8 +122,6 @@ public class ZoneExt extends SFSExtension {
//handle custom login
// addEventHandler(SFSEventType.USER_LOGIN, LoginHandler.class);
addEventListener(SFSEventType.FILE_UPLOAD, this);
System.out.println("Im new SERVER 2");
}
@Override
......
......@@ -96,7 +96,7 @@ public class SimulationController implements SimulationLoopNotifiable {
this.RMIhost = RMIhost;
this.RMIport = RMIport;
this.vehicleModel = vehicleModel;
this.useNewPhysics = false;
this.useNewPhysics = true;
this.tracks = new LinkedList<SimVehicle>();
this.simBuffers = new HashMap<Long, SimulationBuffer>();
......@@ -322,8 +322,7 @@ public class SimulationController implements SimulationLoopNotifiable {
* @return PhysicalVehicle
*/
private PhysicalVehicle setupVehicle() {
String autopilot_configuration =
"autopilot="+ this.vehicleModel;
String autopilot_configuration = "autopilot="+ this.vehicleModel;
RMIClient rmiClient = new RMIClient(this.RMIhost, this.RMIport, autopilot_configuration);
AutopilotAdapterAsFunctionBlock mainBlockAdapter = new AutopilotAdapterAsFunctionBlock(rmiClient);
......
......@@ -49,7 +49,14 @@ public class RMIClient {
this.console.trace(ExtensionLogLevel.ERROR, "No RMI object associated with [" + RMIServer.MODEL_MANAGER + "]: " + e);
}
}
/*
This function can eventually be replaced with the distributed start_tick()/end_tick() method for updating all
HardwareEmulators in parallel.
This method first calls updateBus() on all the emulators with the BUS updates.
Then the simulation starts all the emulators with start_tick() on all the RMIModelServers.
Then the simulation resyncronizes the emulators with end_tick() on all the RMI servers.
Finally the individual BUS updates can be pulled with getOutputs().
*/
public HashMap<String, Serializable> oldExecute(HashMap<String, Serializable> inputs, double timeDelta){
if (this.modelId >= 0) {
try {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment