Anders3

Cars.java

@@ -7,18 +7,20 @@ public abstract class Cars implements Movable{
     protected double currentSpeed; // The current speed of the car
     private Color color; // Color of the car
     private final String modelName; // The car model name
+    private int loadSize;
 
-    protected double x;
-    protected double y;
+    private double x;
+    private double y;
     private int direction;
 
-    protected Cars(int carNrDoors, double carEnginePower, Color carColor, String carModelName){
+    protected Cars(int carNrDoors, double carEnginePower, Color carColor, String carModelName, int carLoadSize){
         nrDoors = carNrDoors;
         enginePower = carEnginePower;
         color = carColor;
         modelName = carModelName;
-
-
+        loadSize=carLoadSize;
+        x=0;
+        y=0;
         stopEngine();
     }
 
@@ -52,6 +54,10 @@ protected void stopEngine(){
         currentSpeed = 0;
     }
 
+    public int getLoadSize(){
+        return loadSize;
+    }
+
     abstract protected void incrementSpeed(double amount);
     abstract protected void decrementSpeed(double amount);
 
@@ -79,23 +85,21 @@ protected void brake(double amount){
 
     @Override
     public void move() {
-        if (direction%2==0) {
-            if (direction==0){
-                y=y+currentSpeed;
-            }
-            else {
-                y=y-currentSpeed;
-            }
+        if (direction==0){
+            y=y+currentSpeed;
+        }
+        else if(direction==2) {
+            y=y-currentSpeed;
         }
-        else {
-            if (direction==1){
-                x=x+currentSpeed;
-            }
-            else {
-                x=x-currentSpeed;
-            }
+
+        else if (direction==1){
+            x=x+currentSpeed;
+        }
+        else if(direction==3) {
+            x=x-currentSpeed;
         }
 
+
         System.out.println("X: "+x);
         System.out.println("Y: "+y);
     }
@@ -116,4 +120,10 @@ public void turnRight() {
             direction=direction-4;
         }
     }
+    public double getX(){
+        return x;
+    }
+    public double getY(){
+        return y;
+    }
 }

GenericGarage.java

@@ -0,0 +1,6 @@
+public interface GenericGarage {
+    //Ta imot bilar tills parkeringen är full
+    //fixa bilar?
+    //hämta bilar
+    default void test(){}
+}

HelperGarage.java

@@ -0,0 +1,7 @@
+public class HelperGarage implements GenericGarage{
+
+    @Override
+    public void test() {
+
+    }
+}

LosSantosCustoms.java

@@ -0,0 +1,11 @@
+public class LosSantosCustoms implements GenericGarage{//uppgift 3
+    // Detta är vår bilverkstads fil
+
+    // Det behövs skapa en gemensam fil som olika verkstäder kan "ärva" från genom composition, det går inte att ärva normalt.
+    private final HelperGarage parent = new HelperGarage();  // Composition
+
+    @Override
+    public void test() {
+        parent.test();        // Delegation
+    }
+}

Saab95.java

@@ -3,7 +3,7 @@
 public class Saab95 extends Cars{
     private boolean turboOn;
     public Saab95(){
-        super(2, 125, Color.red, "Saab95");
+        super(2, 125, Color.red, "Saab95", 1);
 	    turboOn = false;
     }
     public void setTurboOn(){

Scania.java

@@ -1,3 +1,38 @@
-public class Scania {
-    //Kolla vad duktig Anders har varit
+import java.awt.*;
+
+public class Scania extends Cars{
+
+    private double gradiant;
+
+
+    public Scania(){
+        super(2,100, Color.BLUE, "Scania", 2);
+        gradiant=0;
+    }
+
+    @Override
+    protected void incrementSpeed(double amount){
+        if(gradiant == 0){
+            currentSpeed = Math.min(getCurrentSpeed() + amount, getEnginePower());
+        }
+    }
+    @Override
+    protected void decrementSpeed(double amount){
+        if(currentSpeed <= amount){
+            currentSpeed = 0;
+        }else{
+            currentSpeed = getCurrentSpeed() - amount;
+        }
+    }
+
+
+    protected void changeGradiant(double newGradiant){
+        if (this.getCurrentSpeed() == 0 && newGradiant<=70 && newGradiant>=0){
+            gradiant=newGradiant;
+        }
+    }
+    public double getGradiant(){
+        return gradiant;
+    }
 }
+

Transport.java

@@ -0,0 +1,62 @@
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.lang.Math.*;
+
+public class Transport extends Cars{
+    private boolean ramp;
+    private List<Cars> carLoad;
+
+    private int maxLoad;
+
+    public Transport(int maximunLoad){
+        super(2,100, Color.yellow, "Jumper EH35L HDI", 2);
+        ramp=false;
+        maxLoad=maximunLoad;
+        carLoad = new ArrayList<Cars>();
+    }
+
+    @Override
+    protected void incrementSpeed(double amount){
+        if(!ramp){
+            currentSpeed = Math.min(getCurrentSpeed() + amount, getEnginePower());
+        }
+    }
+    @Override
+    protected void decrementSpeed(double amount){
+        if(currentSpeed <= amount){
+            currentSpeed = 0;
+        }else{
+            currentSpeed = getCurrentSpeed() - amount;
+        }
+    }
+
+
+    protected void changeRamp(){
+        if (this.getCurrentSpeed() == 0 && !ramp){
+            ramp = true;
+        }else {
+            ramp = false;
+        }
+    }
+    public boolean getRamp(){
+        return ramp;
+    }
+
+    public List<Cars> getCarLoad(){
+        return carLoad;
+    }
+
+    protected void addCarToLoad(Cars Car){ //antag att Transporten bara kan lasta personbilar
+        int loadSize = Car.getLoadSize();
+        double diffX = this.getX()-Car.getX();
+        double diffY = this.getY()-Car.getY();
+        if ((Math.abs(diffX)<=5) && (Math.abs(diffY)<=5) ) {
+            if (loadSize < 2 && this.getCurrentSpeed() == 0 && maxLoad > carLoad.size() && ramp) {
+                carLoad.add(Car);
+            }
+        }
+    }
+
+
+}

Volvo240.java

@@ -6,7 +6,7 @@ public class Volvo240 extends Cars {
 
 
     public Volvo240() {
-        super(4, 100, Color.black, "Volvo240");
+        super(4, 100, Color.black, "Volvo240", 1);
     }
 
     private double speedFactor() {

test/TestSaab.java

@@ -88,17 +88,18 @@ public void testSetColor(){
 
     @Test
     public void testMovable(){//testar även turn funtionerna
+        saab.gas(1);
         saab.move();
         saab.turnLeft();
         saab.move();
         saab.turnLeft();
         saab.move();
-        System.out.println("x "+saab.x +" y "+saab.y);
+        System.out.println("x "+saab.getX() +" y "+saab.getY());
         saab.turnRight();
         saab.turnRight();
         saab.turnRight();
         saab.move();
-        assertTrue(saab.y==0 && saab.x==0);
+        assertTrue(saab.getY()==0 && saab.getX()==0);
 
     }
 

test/TestScania.java

@@ -1,3 +1,4 @@
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -34,7 +35,7 @@ public void testGasAndBrake(){
 
         @Test
         public void testGetModelName(){
-            String name = "Scania";
+            String name = "ScaniaTruck";
             assertEquals(scan.getModelName(), name);
         }
 
@@ -68,20 +69,28 @@ public void testSetColor(){
 
         @Test
         public void testMovable(){//testar även turn funtionerna
+            scan.gas(1);
             scan.move();
             scan.turnLeft();
             scan.move();
             scan.turnLeft();
             scan.move();
-            System.out.println("x "+scan.x +" y "+scan.y);
+            System.out.println("x "+scan.getX() +" y "+scan.getY());
             scan.turnRight();
             scan.turnRight();
             scan.turnRight();
             scan.move();
-            assertTrue(scan.y==0 && scan.x==0);
+            assertTrue(scan.getY()==0 && scan.getX()==0);
 
         }
 
-    }
+        @Test
+        public void testChangeGradient(){
+            scan.changeGradiant(67);
+            scan.changeGradiant(0);
+            scan.gas(1);
+            scan.changeGradiant(10);
+            assertTrue(scan.getGradiant() == 0);
+        }
 
 }

test/TestTransport.java

@@ -0,0 +1,33 @@
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.junit.Assert.assertTrue;
+
+public class TestTransport {
+    private Transport transport;
+    private Saab95 saab;
+    private Volvo240 volvo;
+    @Before
+    public void init(){
+        transport = new Transport(2);
+        saab = new Saab95();
+        volvo = new Volvo240();
+    }
+
+    @Test
+    public void testAddCardToLoad(){
+
+
+        transport.addCarToLoad(saab);
+        List<Cars> carLoad = transport.getCarLoad();
+        transport.changeRamp();
+        transport.addCarToLoad(volvo);
+        transport.addCarToLoad(saab);
+        transport.addCarToLoad(saab);
+
+        assertTrue(carLoad.size()==2);
+    }
+
+}

test/TestVolvo.java

@@ -34,17 +34,18 @@ public void testDecrementSpeed(){
 
     @Test
     public void testMovable(){//testar även turn funtionerna
+        volvo.gas(1);
         volvo.move();
         volvo.turnLeft();
         volvo.move();
         volvo.turnLeft();
         volvo.move();
-        System.out.println("x "+volvo.x +" y "+volvo.y);
+        System.out.println("x "+volvo.getX() +" y "+volvo.getY());
         volvo.turnRight();
         volvo.turnRight();
         volvo.turnRight();
         volvo.move();
-        assertTrue(volvo.y==0 && volvo.x==0);
+        assertTrue(volvo.getY()==0 && volvo.getX()==0);
 
     }