Commit e5d67938 authored by Julian Zobel's avatar Julian Zobel
Browse files

Started metrics for energy and UAV Net forwarding

parent a886bf18
...@@ -50,6 +50,8 @@ public interface ControllableLocationActuator extends Actuator { ...@@ -50,6 +50,8 @@ public interface ControllableLocationActuator extends Actuator {
public PositionVector getCurrentLocation(); public PositionVector getCurrentLocation();
public double getCurrentBatteryLevel(); public double getCurrentBatteryLevel();
public double getCurrentBatteryEnergy();
public LinkedList<PositionVector> getTargetLocations(); public LinkedList<PositionVector> getTargetLocations();
......
...@@ -190,6 +190,11 @@ public class UAVTopologyComponent extends AbstractTopologyComponent implements S ...@@ -190,6 +190,11 @@ public class UAVTopologyComponent extends AbstractTopologyComponent implements S
public double getCurrentBatteryLevel() { public double getCurrentBatteryLevel() {
return battery.getCurrentPercentage(); return battery.getCurrentPercentage();
} }
@Override
public double getCurrentBatteryEnergy() {
return battery.getCurrentEnergyLevel();
}
public RechargeableBattery getBattery() { public RechargeableBattery getBattery() {
return battery; return battery;
...@@ -326,4 +331,6 @@ public class UAVTopologyComponent extends AbstractTopologyComponent implements S ...@@ -326,4 +331,6 @@ public class UAVTopologyComponent extends AbstractTopologyComponent implements S
net.goOnline(); net.goOnline();
} }
} }
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