Merge remote-tracking branch 'origin/jz/movementmodel-testbed' into jz/dev-metrics (de0604d3) · Commits · Simonstrator / PeerfactSim.KOM · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

PeerfactSim.KOM
- Activity
- Members
- Releases
- Model registry

Snippets Groups Projects

de0604d3

Commit de0604d3 authored 6 years ago by Julian Zobel

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/jz/movementmodel-testbed' into jz/dev-metrics

parents 82c106d1 4b1d6a8b

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

src/de/tud/kom/p2psim/api/topology/movement/SimUAVLocationActuator.java 3 additions, 2 deletions

.../p2psim/api/topology/movement/SimUAVLocationActuator.java
src/de/tud/kom/p2psim/api/topology/movement/UAVMovementModel.java 8 additions, 3 deletions

...ud/kom/p2psim/api/topology/movement/UAVMovementModel.java
src/de/tud/kom/p2psim/impl/energy/components/MotorCharacteristic.java 48 additions, 0 deletions

...om/p2psim/impl/energy/components/MotorCharacteristic.java
src/de/tud/kom/p2psim/impl/energy/components/StateActuatorEnergyComponent.java 2 additions, 2 deletions

.../impl/energy/components/StateActuatorEnergyComponent.java
src/de/tud/kom/p2psim/impl/energy/components/StatelessMotorComponent.java 279 additions, 0 deletions

...2psim/impl/energy/components/StatelessMotorComponent.java
src/de/tud/kom/p2psim/impl/energy/configs/ActuatorConfiguration.java 80 additions, 0 deletions

...kom/p2psim/impl/energy/configs/ActuatorConfiguration.java
src/de/tud/kom/p2psim/impl/energy/configs/ActuatorEnergyConsumptionConfig.java 5 additions, 5 deletions

.../impl/energy/configs/ActuatorEnergyConsumptionConfig.java
src/de/tud/kom/p2psim/impl/energy/models/ComponentBasedEnergyModel.java 3 additions, 3 deletions

.../p2psim/impl/energy/models/ComponentBasedEnergyModel.java
src/de/tud/kom/p2psim/impl/topology/component/UAVTopologyComponent.java 8 additions, 11 deletions

.../p2psim/impl/topology/component/UAVTopologyComponent.java
src/de/tud/kom/p2psim/impl/topology/movement/aerial/MulticopterMovement.java 315 additions, 0 deletions

...im/impl/topology/movement/aerial/MulticopterMovement.java
src/de/tud/kom/p2psim/impl/topology/movement/aerial/SimpleMutlicopterMovement.java 25 additions, 13 deletions

...l/topology/movement/aerial/SimpleMutlicopterMovement.java

with 776 additions and 39 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment