From 36a4389a067dcec7fbbb6de5ef2f500e32edffd6 Mon Sep 17 00:00:00 2001 From: megacz Date: Fri, 16 Jan 2009 11:44:51 -0800 Subject: [PATCH] fix bug in Alu.ship --- ships/Alu.ship | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ships/Alu.ship b/ships/Alu.ship index 29293e4..177592b 100644 --- a/ships/Alu.ship +++ b/ships/Alu.ship @@ -88,25 +88,27 @@ public void service() { b = box_in2.removeDataForShip(); box_out.addDataFromShip(a-b); // SUB break; - case 9: + + case 9: // MAXMERGE if (box_in1.peekDataForShip()<0 && box_in2.peekDataForShip()<0) { a = box_in1.removeDataForShip(); b = box_in2.removeDataForShip(); box_out.addDataFromShip(a, false); break; } - // fall through + // fall through to MAX case 4: a = box_in1.peekDataForShip(); b = box_in2.peekDataForShip(); box_out.addDataFromShip(Math.max(a,b), !(a>b)); // MAX - if (ab) box_in1.removeDataForShip(); else box_in2.removeDataForShip(); break; + case 5: a = box_in1.peekDataForShip(); b = box_in2.peekDataForShip(); box_out.addDataFromShip(Math.min(a,b), a>b); // MIN - if (a>b) box_in1.removeDataForShip(); else box_in2.removeDataForShip(); + if (a