adaptions for bastian's optimizer to work

src/de/tud/kom/p2psim/api/topology/component/ControllableLocationActuator.java

@@ -56,7 +56,9 @@ public interface ControllableLocationActuator extends Actuator {
 	public double getCurrentBatteryLevel();
 	
 	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

@@ -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

@@ -367,7 +367,7 @@ public class SimpleMulticopterMovement implements UAVMovementModel  {
 
 	@Override
 	public double minimumVelocity() {
-		return 0;
+		return minimumHorizontalVelocity();
 	}