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..a0c1f01 --- /dev/null +++ b/README.md @@ -0,0 +1,4 @@ +jax-ftd-day-4-java-assignment +=== + +[![Build Status](https://travis-ci.org/njvsvalhalla/jax-ftd-day-4-java-assignment.svg?branch=njvsvalhalla)](https://travis-ci.org/njvsvalhalla/jax-ftd-day-4-java-assignment) diff --git a/src/main/java/com/cooksys/butterpillar/model/Butterpillar.java b/src/main/java/com/cooksys/butterpillar/model/Butterpillar.java index 1060573..6b4cefb 100644 --- a/src/main/java/com/cooksys/butterpillar/model/Butterpillar.java +++ b/src/main/java/com/cooksys/butterpillar/model/Butterpillar.java @@ -3,30 +3,42 @@ public class Butterpillar { // any instance fields should be private + private double length; + private double leavesEaten; + public Butterpillar() { + } + + public Butterpillar(double length, double leavesEaten) { + super(); + this.length = length; + this.leavesEaten = 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 + if (b.leavesEaten == this.leavesEaten && b.length == this.length) { return true; } + else { return false; } } @Override public String toString() { - return null; // TODO: to be implemented + String s = "Butterpillar leavesEaten = " + leavesEaten + ", Length: " + length; + return s; } @Override diff --git a/src/main/java/com/cooksys/butterpillar/model/Catterfly.java b/src/main/java/com/cooksys/butterpillar/model/Catterfly.java index 81ff09a..19d746b 100644 --- a/src/main/java/com/cooksys/butterpillar/model/Catterfly.java +++ b/src/main/java/com/cooksys/butterpillar/model/Catterfly.java @@ -3,30 +3,43 @@ public class Catterfly { // any instance fields should be private + private double wingspan; + private double weight; + + public Catterfly() { + } + + public Catterfly(double wingspan, double weight) { + super(); + this.wingspan = wingspan; + this.weight = 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 + if (this.weight == c.weight && this.wingspan == c.wingspan) { return true; } + else return false; } @Override public String toString() { - return null; // TODO: to be implemented + String s = "Catterfly wingspan = " + wingspan + ", Weight: " + weight; + return s; } @Override diff --git a/src/main/java/com/cooksys/butterpillar/model/GrowthModel.java b/src/main/java/com/cooksys/butterpillar/model/GrowthModel.java index 3f034fd..504c2a9 100644 --- a/src/main/java/com/cooksys/butterpillar/model/GrowthModel.java +++ b/src/main/java/com/cooksys/butterpillar/model/GrowthModel.java @@ -3,40 +3,54 @@ public class GrowthModel { // any instance fields should be private + private double lengthToWingspan; + private double leavesEatenToWeight; + + public GrowthModel() { + + } 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 + return new Catterfly(this.lengthToWingspan * butterpillar.getLength(), + this.leavesEatenToWeight * butterpillar.getLeavesEaten()); } public Butterpillar catterflyToButterpillar(Catterfly catterfly) { - return null; // to be implemented + return new Butterpillar(catterfly.getWingspan() / this.getLengthToWingspan(), + catterfly.getWeight() / this.getLeavesEatenToWeight()); } - + public boolean equals(GrowthModel g) { - return false; // TODO: to be implemented + if (this.leavesEatenToWeight == g.leavesEatenToWeight && this.lengthToWingspan == g.lengthToWingspan) { + return true; + } else { + return false; + } } - + @Override public String toString() { - return null; // TODO: to be implemented + String s = "GrowthModel lengthToWingspan = " + lengthToWingspan + ", leavesEatenToWeight: " + + leavesEatenToWeight; + return s; } - + @Override public boolean equals(Object o) { if (o instanceof GrowthModel) {