Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Simonstrator
PeerfactSim.KOM
Commits
68fb363a
Commit
68fb363a
authored
Apr 10, 2019
by
Julian Zobel
Browse files
adaptions for bastian's optimizer to work
parent
4fdd9eba
Changes
3
Show whitespace changes
Inline
Side-by-side
src/de/tud/kom/p2psim/api/topology/component/ControllableLocationActuator.java
View file @
68fb363a
...
...
@@ -57,6 +57,8 @@ public interface ControllableLocationActuator extends Actuator {
public
double
getCurrentBatteryEnergy
();
public
double
getMaximumBatteryCapacity
();
public
LinkedList
<
PositionVector
>
getTargetLocations
();
public
void
setTargetLocation
(
PositionVector
targetLocation
,
ReachedLocationCallback
cb
);
...
...
@@ -82,4 +84,6 @@ public interface ControllableLocationActuator extends Actuator {
public
double
getMaxMovementSpeed
();
public
double
getMovementSpeed
();
public
double
estimatePowerConsumption
(
double
velocity
);
}
src/de/tud/kom/p2psim/impl/topology/component/UAVTopologyComponent.java
View file @
68fb363a
...
...
@@ -22,9 +22,6 @@ package de.tud.kom.p2psim.impl.topology.component;
import
java.util.LinkedList
;
import
java.util.Set
;
import
org.apache.batik.bridge.AbstractSVGGradientElementBridge.Stop
;
import
de.tud.kom.p2psim.api.common.SimHost
;
import
de.tud.kom.p2psim.api.energy.ComponentType
;
import
de.tud.kom.p2psim.api.energy.EnergyModel
;
...
...
@@ -35,7 +32,6 @@ import de.tud.kom.p2psim.api.topology.movement.SimUAVLocationActuator;
import
de.tud.kom.p2psim.api.topology.movement.UAVMovementModel
;
import
de.tud.kom.p2psim.api.topology.placement.PlacementModel
;
import
de.tud.kom.p2psim.impl.energy.RechargeableBattery
;
import
de.tud.kom.p2psim.impl.energy.components.StateActuatorEnergyComponent
;
import
de.tud.kom.p2psim.impl.energy.components.StatelessMotorComponent
;
import
de.tud.kom.p2psim.impl.energy.models.AbstractEnergyModel
;
import
de.tud.kom.p2psim.impl.topology.placement.UAVBasePlacement
;
...
...
@@ -340,6 +336,16 @@ public class UAVTopologyComponent extends AbstractTopologyComponent implements S
this
.
direction
.
set
(
direction
);
}
@Override
public
double
getMaximumBatteryCapacity
()
{
return
battery
.
getMaximumEnergyLevel
();
}
@Override
public
double
estimatePowerConsumption
(
double
velocity
)
{
return
movement
.
estimatePowerConsumption
(
velocity
);
}
}
src/de/tud/kom/p2psim/impl/topology/movement/aerial/SimpleMulticopterMovement.java
View file @
68fb363a
...
...
@@ -367,7 +367,7 @@ public class SimpleMulticopterMovement implements UAVMovementModel {
@Override
public
double
minimumVelocity
()
{
return
0
;
return
minimumHorizontalVelocity
()
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment