rm sysout

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

@@ -53,8 +53,6 @@ public class SimpleMulticopterMovement implements UAVMovementModel  {
 		
 	private StatelessMotorComponent motor;
 	
-	
-	
 	private double mass = 1.465; // kg
 	private final double airdensity = 1.2255; // kg/m^3
 	private final double gravity = 9.807; // m/s^2
@@ -66,9 +64,6 @@ public class SimpleMulticopterMovement implements UAVMovementModel  {
 	private double maxTurnAngle = Math.toRadians(90); // 90° per second turn angle
 	
 	
-	// FIXME remove only for testing
-	private static boolean first = true;	
-	
 	public SimpleMulticopterMovement(UAVTopologyComponent topologyComponent) {
 		this.topologyComponent = topologyComponent;	
 		
@@ -78,38 +73,7 @@ public class SimpleMulticopterMovement implements UAVMovementModel  {
 	
 	@Override
 	public void move(long timeBetweenMovementOperations) {
-		
-		if(first) {
-			
-			System.out.println("***MOVEMENT MODEL****");
-			
-			System.out.println("Hover thrust: " + hoverThrustRequired() + "N");
-			
-			System.out.println("Maximum thrust: " + motor.getMaxThrust() + "N");
-			
-			System.out.println("Vertical ascension: " + verticalAscentMaxAcceleration() + " m/s^2 >> max velocity" + verticalAscentMaxVelocity() + " m/s at maximum thrust");
-			
-			System.out.println("Horizontal Flight: " + horizontalMaxVelocityRequiredTotalThrust() + " N >> max velocity" + horizontalMaxVelocity() + " m/s @ 45° pitch angle, minimum velocity " + this.minimumHorizontalVelocity() + " m/s @ 0.25° pitch angle");
-					
-			System.out.println("************");
 			
-			
-			
-			
-			for (int i = (int) Math.ceil(minimumHorizontalVelocity()); i <= horizontalMaxVelocity(); i++) {
-				double est = estimatePowerConsumption(i);
-				
-				System.out.println(" v = " + i + " m/s ==> estimated power consumption = " + est + " J/s");
-				System.out.println("=== === === === === ===");
-			}
-			
-			System.out.println(" v = " + horizontalMaxVelocity() + " m/s ==> estimated power consumption = " + estimatePowerConsumption(horizontalMaxVelocity()) + " J/s");
-			System.out.println("=== === === === === ===");
-			
-			first = false;
-		}
-		
-		
 		if(motor.isOn() && !route.isEmpty()) {
 			PositionVector position = new PositionVector(topologyComponent.getRealPosition());			
 						
@@ -477,7 +441,7 @@ public class SimpleMulticopterMovement implements UAVMovementModel  {
 				}			
 			}
 			
-			double n = Math.sqrt(2 * hoverThrustRequired() * Math.tan(Math.toRadians(nearest)) / bodyDrag(Math.toRadians(nearest), new PositionVector(1,0,0)));
+		//	double n = Math.sqrt(2 * hoverThrustRequired() * Math.tan(Math.toRadians(nearest)) / bodyDrag(Math.toRadians(nearest), new PositionVector(1,0,0)));
 			
 			//System.out.println("target velocity = " + velocity + " m/s ==> AoA = " + nearest + "° // v_max = " + n + " m/s");