uJ conversion factor now as static in battery interface

src/de/tud/kom/p2psim/api/energy/Battery.java

@@ -31,6 +31,8 @@ package de.tud.kom.p2psim.api.energy;
  */
 public interface Battery extends Cloneable {
 
+	public static double uJconverison = 1000000;
+	
 	/**
 	 * Returns the maximum energy level in uJ.
 	 * 

src/de/tud/kom/p2psim/impl/topology/movement/aerial/SimpleMulticopterMovement.java

@@ -390,14 +390,14 @@ public class SimpleMulticopterMovement implements UAVMovementModel  {
 			return -1;
 		}
 		else {
-			System.out.println("===========================");
+		//	System.out.println("===========================");
 			double estimateAngle = estimatePitchAngleForVelocity(velocity);
 			double estimatedDrag = forwardDrag(velocity, estimateAngle);			
 			
 			double requiredThrust = Math.sqrt(hoverThrustRequired() * hoverThrustRequired() + estimatedDrag * estimatedDrag);			
 			double wattage = motor.estimatePowerConsumptionWatt(requiredThrust);
 			
-			System.out.println("Motor requires " + wattage + " J/s at velocity " + velocity + " (Thrust: " + requiredThrust + " N, angle = " + Math.toDegrees(estimateAngle)  + ", drag = "+ estimatedDrag+" N )");
+		//	System.out.println("Motor requires " + wattage + " J/s at velocity " + velocity + " (Thrust: " + requiredThrust + " N, angle = " + Math.toDegrees(estimateAngle)  + ", drag = "+ estimatedDrag+" N )");
 			
 			
 			return wattage;