Merge remote-tracking branch 'origin/jz/int-dmaa' into jz/lab-cpp
# Conflicts: # pom.xml # src/de/tud/kom/p2psim/impl/util/db/relational/RelationalDB.java
No related branches found
No related tags found
Showing
- pom.xml 11 additions, 26 deletionspom.xml
- src/de/tud/kom/p2psim/api/topology/component/ControllableLocationActuator.java 7 additions, 0 deletions.../api/topology/component/ControllableLocationActuator.java
- src/de/tud/kom/p2psim/api/topology/movement/SimUAVLocationActuator.java 0 additions, 2 deletions.../p2psim/api/topology/movement/SimUAVLocationActuator.java
- src/de/tud/kom/p2psim/api/topology/movement/UAVMovementModel.java 8 additions, 17 deletions...ud/kom/p2psim/api/topology/movement/UAVMovementModel.java
- src/de/tud/kom/p2psim/api/uav/MulticopterModel.java 215 additions, 0 deletionssrc/de/tud/kom/p2psim/api/uav/MulticopterModel.java
- src/de/tud/kom/p2psim/impl/common/DefaultMonitor.java 2 additions, 4 deletionssrc/de/tud/kom/p2psim/impl/common/DefaultMonitor.java
- src/de/tud/kom/p2psim/impl/energy/components/StatefulActuatorComponent.java 42 additions, 14 deletions...sim/impl/energy/components/StatefulActuatorComponent.java
- src/de/tud/kom/p2psim/impl/energy/components/StatelessActuatorComponent.java 32 additions, 13 deletions...im/impl/energy/components/StatelessActuatorComponent.java
- src/de/tud/kom/p2psim/impl/energy/configs/StatefulActuatorConfiguration.java 10 additions, 5 deletions...im/impl/energy/configs/StatefulActuatorConfiguration.java
- src/de/tud/kom/p2psim/impl/linklayer/mac/AbstractMacLayer.java 6 additions, 5 deletions...e/tud/kom/p2psim/impl/linklayer/mac/AbstractMacLayer.java
- src/de/tud/kom/p2psim/impl/simengine/Simulator.java 1 addition, 1 deletionsrc/de/tud/kom/p2psim/impl/simengine/Simulator.java
- src/de/tud/kom/p2psim/impl/topology/component/DefaultTopologyComponent.java 6 additions, 11 deletions...sim/impl/topology/component/DefaultTopologyComponent.java
- src/de/tud/kom/p2psim/impl/topology/component/UAVTopologyComponent.java 29 additions, 18 deletions.../p2psim/impl/topology/component/UAVTopologyComponent.java
- src/de/tud/kom/p2psim/impl/topology/movement/aerial/MulticopterMovement.java 49 additions, 296 deletions...im/impl/topology/movement/aerial/MulticopterMovement.java
- src/de/tud/kom/p2psim/impl/topology/movement/aerial/SimpleMulticopterMovement.java 40 additions, 23 deletions...l/topology/movement/aerial/SimpleMulticopterMovement.java
- src/de/tud/kom/p2psim/impl/topology/movement/aerial/StateMulticopterMovement.java 1210 additions, 0 deletions...pl/topology/movement/aerial/StateMulticopterMovement.java
- src/de/tud/kom/p2psim/impl/topology/movement/distributions/GaussianSpeedDistribution.java 4 additions, 2 deletions...ogy/movement/distributions/GaussianSpeedDistribution.java
- src/de/tud/kom/p2psim/impl/topology/movement/distributions/StaticSpeedDistribution.java 1 addition, 0 deletions...ology/movement/distributions/StaticSpeedDistribution.java
- src/de/tud/kom/p2psim/impl/topology/movement/distributions/UniformSpeedDistribution.java 3 additions, 2 deletions...logy/movement/distributions/UniformSpeedDistribution.java
- src/de/tud/kom/p2psim/impl/topology/movement/local/AbstractLocalMovementStrategy.java 0 additions, 3 deletions...opology/movement/local/AbstractLocalMovementStrategy.java
Loading
Please register or sign in to comment