diff --git a/.classpath b/.classpath index af1430b..98370b4 100644 --- a/.classpath +++ b/.classpath @@ -12,11 +12,7 @@ - - - - - + diff --git a/.travis.yml b/.travis.yml index dff5f3a..9bcf999 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1 +1,3 @@ language: java +jdk: + - oraclejdk8 diff --git a/README.md b/README.md new file mode 100644 index 0000000..ae53c61 --- /dev/null +++ b/README.md @@ -0,0 +1,4 @@ +jax-ftd-day-4-java-assignment-2 +=== + +[![Build Status](https://travis-ci.org/AldenSharp/jax-ftd-day-4-java-assignment-2.svg?branch=AldenSharp)](https://travis-ci.org/AldenSharp/jax-ftd-day-4-java-assignment-2) diff --git a/src/main/java/com/cooksys/butterpillar/model/Butterpillar.java b/src/main/java/com/cooksys/butterpillar/model/Butterpillar.java index 1060573..8a0f7b0 100644 --- a/src/main/java/com/cooksys/butterpillar/model/Butterpillar.java +++ b/src/main/java/com/cooksys/butterpillar/model/Butterpillar.java @@ -1,34 +1,35 @@ package com.cooksys.butterpillar.model; public class Butterpillar { - - // any instance fields should be private + + private double length; + private double leavesEaten; public double getLength() { - return 0; // TODO: to be implemented + return length; } public void setLength(double length) { - // TODO: to be implemented + this.length = length; } public double getLeavesEaten() { - return 0; // TODO: to be implemented + return leavesEaten; } public void setLeavesEaten(double leavesEaten) { - // TODO: to be implemented + this.leavesEaten = leavesEaten; } - + public boolean equals(Butterpillar b) { - return false; // TODO: to be implemented + return b.getLength() == length && b.getLeavesEaten() == leavesEaten; } - + @Override public String toString() { - return null; // TODO: to be implemented + return "Butterpillar: {length=" + length + "; leavesEaten=" + leavesEaten + "}"; } - + @Override public boolean equals(Object o) { if (o instanceof Butterpillar) { @@ -37,7 +38,5 @@ public boolean equals(Object o) { return false; } } - - } diff --git a/src/main/java/com/cooksys/butterpillar/model/Catterfly.java b/src/main/java/com/cooksys/butterpillar/model/Catterfly.java index 81ff09a..02845a0 100644 --- a/src/main/java/com/cooksys/butterpillar/model/Catterfly.java +++ b/src/main/java/com/cooksys/butterpillar/model/Catterfly.java @@ -1,34 +1,35 @@ package com.cooksys.butterpillar.model; public class Catterfly { - - // any instance fields should be private + + private double wingspan; + private double weight; public double getWingspan() { - return 0; // to be implemented + return wingspan; } public void setWingspan(double wingspan) { - // to be implemented + this.wingspan = wingspan; } public double getWeight() { - return 0; // TODO: to be implemented + return weight; } public void setWeight(double weight) { - // TODO: to be implemented + this.weight = weight; } - + public boolean equals(Catterfly c) { - return false; // TODO: to be implemented + return c.getWingspan() == wingspan && c.getWeight() == weight; } - + @Override public String toString() { - return null; // TODO: to be implemented + return "Catterfly: {wingspan=" + wingspan + "; weight=" + weight + "}"; } - + @Override public boolean equals(Object o) { if (o instanceof Catterfly) { diff --git a/src/main/java/com/cooksys/butterpillar/model/GrowthModel.java b/src/main/java/com/cooksys/butterpillar/model/GrowthModel.java index 3f034fd..e62e214 100644 --- a/src/main/java/com/cooksys/butterpillar/model/GrowthModel.java +++ b/src/main/java/com/cooksys/butterpillar/model/GrowthModel.java @@ -2,41 +2,49 @@ public class GrowthModel { - // any instance fields should be private + private double lengthToWingspan; + private double leavesEatenToWeight; public double getLengthToWingspan() { - return 0; // to be implemented + return lengthToWingspan; } public void setLengthToWingspan(double lengthToWingspan) { - // to be implemented + this.lengthToWingspan = lengthToWingspan; } public double getLeavesEatenToWeight() { - return 0; // to be implemented + return leavesEatenToWeight; } public void setLeavesEatenToWeight(double leavesEatenToWeight) { - // to be implemented + this.leavesEatenToWeight = leavesEatenToWeight; } public Catterfly butterpillarToCatterfly(Butterpillar butterpillar) { - return null; // to be implemented + Catterfly catterfly = new Catterfly(); + catterfly.setWingspan(butterpillar.getLength() * lengthToWingspan); + catterfly.setWeight(butterpillar.getLeavesEaten() * leavesEatenToWeight); + return catterfly; // to be implemented } public Butterpillar catterflyToButterpillar(Catterfly catterfly) { - return null; // to be implemented + Butterpillar butterpillar = new Butterpillar(); + butterpillar.setLength(catterfly.getWingspan() / lengthToWingspan); + butterpillar.setLeavesEaten(catterfly.getWeight() / leavesEatenToWeight); + return butterpillar; // to be implemented } - + public boolean equals(GrowthModel g) { - return false; // TODO: to be implemented + return g.getLengthToWingspan() == lengthToWingspan && g.getLeavesEatenToWeight() == leavesEatenToWeight; } - + @Override public String toString() { - return null; // TODO: to be implemented + return "GrowthModel: {lengthToWingspan=" + lengthToWingspan + "; leavesEatenToWeight=" + leavesEatenToWeight + + "}"; } - + @Override public boolean equals(Object o) { if (o instanceof GrowthModel) {