Removed remaining println statements

main
Connor Taylor-Brown 8 years ago
parent 01a304efb9
commit c94e0af69c

@ -75,9 +75,6 @@ public class Event {
* @throws EventConstructionException Thrown if we cannot create an Event for any reason. * @throws EventConstructionException Thrown if we cannot create an Event for any reason.
*/ */
public Event(boolean singlePlayer, int mapIndex) throws EventConstructionException { public Event(boolean singlePlayer, int mapIndex) throws EventConstructionException {
// System.out.println(XMLUtilities.validateXML(this.getClass().getClassLoader().getResource("mock/mockXML/iMapLayout.xml").toString()
// , this.getClass().getClassLoader().getResource("mock/mockXML/schema/raceSchema.xsd")));
this.mapIndex = mapIndex; this.mapIndex = mapIndex;
String raceXMLFile; String raceXMLFile;
String boatsXMLFile = "mock/mockXML/boatTest.xml"; String boatsXMLFile = "mock/mockXML/boatTest.xml";

@ -145,8 +145,6 @@ public class NewPolars {
* @return the best vmg that the boat can change to * @return the best vmg that the boat can change to
*/ */
public static VMG setBestVMG(Bearing trueWindAngle, double trueWindSpeed, Bearing boatAngle){ public static VMG setBestVMG(Bearing trueWindAngle, double trueWindSpeed, Bearing boatAngle){
//System.out.println("VMG AUTO CALLED");
//speed
double closestSpeed = getClosest(trueWindSpeed, polars.keySet()); double closestSpeed = getClosest(trueWindSpeed, polars.keySet());
double angle = modulateAngle(boatAngle.degrees() - trueWindAngle.degrees()); double angle = modulateAngle(boatAngle.degrees() - trueWindAngle.degrees());
@ -184,21 +182,4 @@ public class NewPolars {
public static double modulateAngle(double angle){ public static double modulateAngle(double angle){
return (angle % 360 + 360) % 360; return (angle % 360 + 360) % 360;
} }
private Map<Double, TreeMap<Double, Double>> getPolars(){
//this function is just for testing so therefore it is private
return polars;
}
private void printOutLinearInterpolated(){
for (double tws: polars.keySet()){
System.out.println("==================================================");
System.out.println("Speed: " + tws);
System.out.println("==================================================");
for (double twa: polars.get(tws).keySet()){
System.out.println("TWA: " + twa + ", Boat Speed: " + polars.get(tws).get(twa));
}
}
}
} }

@ -43,8 +43,6 @@ public class SailsCommand extends ObserverCommand {
// Apply deceleration to strictly 0 speed // Apply deceleration to strictly 0 speed
boat.setCurrentSpeed(Math.max(0, boat.getCurrentSpeed() - acceleration)); boat.setCurrentSpeed(Math.max(0, boat.getCurrentSpeed() - acceleration));
} else { } else {
System.out.println(goalVelocity + " " + boat.getCurrentSpeed());
// Release boat from SailsCommand control // Release boat from SailsCommand control
if(sailsOut) boat.setVelocityDefault(true); if(sailsOut) boat.setVelocityDefault(true);
race.deleteObserver(this); race.deleteObserver(this);

@ -68,7 +68,6 @@ public class TackGybeCommand extends ObserverCommand {
boat.setBearing(Bearing.fromDegrees(boat.getBearing().degrees() + offset * direction)); boat.setBearing(Bearing.fromDegrees(boat.getBearing().degrees() + offset * direction));
totalRotation += offset; totalRotation += offset;
} else { } else {
System.out.println(goalAngle + " " + boat.getBearing().degrees());
boat.setBearing(Bearing.fromDegrees(goalAngle)); boat.setBearing(Bearing.fromDegrees(goalAngle));
race.deleteObserver(this); race.deleteObserver(this);
} }

@ -63,7 +63,6 @@ public class VMGCommand extends ObserverCommand {
boat.setBearing(Bearing.fromDegrees(boat.getBearing().degrees() + offset * direction)); boat.setBearing(Bearing.fromDegrees(boat.getBearing().degrees() + offset * direction));
totalRotation += offset; totalRotation += offset;
} else { } else {
System.out.println(goalAngle + " " + boat.getBearing().degrees());
boat.setBearing(Bearing.fromDegrees(goalAngle)); boat.setBearing(Bearing.fromDegrees(goalAngle));
race.deleteObserver(this); race.deleteObserver(this);
} }

@ -105,7 +105,6 @@ public class ShiftingWindGenerator implements WindGenerator {
if (shiftedSoFar >= 180){ if (shiftedSoFar >= 180){
shiftAnticlockwise = Math.random() > 0.5; shiftAnticlockwise = Math.random() > 0.5;
shiftedSoFar = 0; shiftedSoFar = 0;
// System.out.println("Swapping");
} }
timeOfLastShift = System.currentTimeMillis(); timeOfLastShift = System.currentTimeMillis();

@ -41,7 +41,6 @@ public class AC35DumpReader {
messLen[1] = dump[pointer + 13]; messLen[1] = dump[pointer + 13];
messLen[0] = dump[pointer + 14]; messLen[0] = dump[pointer + 14];
int messageLength = ByteBuffer.wrap(messLen).getShort(); int messageLength = ByteBuffer.wrap(messLen).getShort();
//System.out.println(messageLength);
packets.add(new AC35Packet(Arrays.copyOfRange(dump, pointer, pointer + messageLength + 19))); packets.add(new AC35Packet(Arrays.copyOfRange(dump, pointer, pointer + messageLength + 19)));

@ -27,7 +27,6 @@ public class InputChecker {
ControlKey controlKey = keyFactory.getKey(codeString); ControlKey controlKey = keyFactory.getKey(codeString);
if (controlKey != null) { if (controlKey != null) {
controlKey.onAction(); controlKey.onAction();
// System.out.println(controlKey.toString() + " is Pressed.");
} }
currentlyActiveKeys.put(codeString, true); currentlyActiveKeys.put(codeString, true);
} }
@ -38,7 +37,6 @@ public class InputChecker {
ControlKey controlKey = keyFactory.getKey(codeString); ControlKey controlKey = keyFactory.getKey(codeString);
if (controlKey != null) { if (controlKey != null) {
controlKey.onRelease(); controlKey.onRelease();
// System.out.println(controlKey.toString() + " is Released.");
} }
currentlyActiveKeys.remove(event.getCode().toString()); currentlyActiveKeys.remove(event.getCode().toString());
}); });
@ -50,15 +48,8 @@ public class InputChecker {
ControlKey controlKey = keyFactory.getKey(key); ControlKey controlKey = keyFactory.getKey(key);
if (controlKey != null){ if (controlKey != null){
controlKey.onHold(); controlKey.onHold();
// System.out.println(controlKey.toString() + " is Held.");
} }
} }
// for (String key : InputKeys.stringKeysMap.keySet()){
// if (removeActiveKey(key)) {
// System.out.println(key);
// }
// }
} }
}.start(); }.start();
} }

Loading…
Cancel
Save