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..2e92b9c --- /dev/null +++ b/README.md @@ -0,0 +1,4 @@ +jax-ftd-day-4-java-assignment +=== + +[![Build Status](https://travis-ci.org/dmurphy326/jax-ftd-day-4-java-assignment.svg?branch=dmurphy326)](https://travis-ci.org/dmurphy326/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..751a38b 100644 --- a/src/main/java/com/cooksys/butterpillar/model/Butterpillar.java +++ b/src/main/java/com/cooksys/butterpillar/model/Butterpillar.java @@ -1,34 +1,47 @@ package com.cooksys.butterpillar.model; public class Butterpillar { - - // any instance fields should be private + + private double length, leavesEaten; + + public Butterpillar() { + + } + + public Butterpillar(double length, double leavesEaten) { + setLength(length); + setLeavesEaten(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 (this.length == b.length && this.leavesEaten == b.leavesEaten) { + return true; + } else { + return false; + } } - + @Override public String toString() { - return null; // TODO: to be implemented + return "Butterpillar: " + this.length + ", " + this.leavesEaten; } - + @Override public boolean equals(Object o) { if (o instanceof Butterpillar) { @@ -37,7 +50,5 @@ public boolean equals(Object o) { return false; } } - - -} +} \ No newline at end of file diff --git a/src/main/java/com/cooksys/butterpillar/model/Catterfly.java b/src/main/java/com/cooksys/butterpillar/model/Catterfly.java index 81ff09a..048bc16 100644 --- a/src/main/java/com/cooksys/butterpillar/model/Catterfly.java +++ b/src/main/java/com/cooksys/butterpillar/model/Catterfly.java @@ -2,31 +2,48 @@ public class Catterfly { - // any instance fields should be private + private double wingspan, weight; + + public Catterfly() + { + + } + + public Catterfly(double wingspan, double weight) + { + setWingspan(wingspan); + setWeight(weight); + } public double getWingspan() { - return 0; // to be implemented + return wingspan; // to be implemented } public void setWingspan(double wingspan) { - // to be implemented + this.wingspan = wingspan; } public double getWeight() { - return 0; // TODO: to be implemented + return weight; // TODO: to be implemented } 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.wingspan == c.wingspan && this.weight == c.weight) + { + return true; + }else + { + return false; + } } @Override public String toString() { - return null; // TODO: to be implemented + return "Catterfly: " + this.wingspan + ", " + this.weight; } @Override @@ -38,4 +55,4 @@ public boolean equals(Object o) { } } -} +} \ No newline at end of file diff --git a/src/main/java/com/cooksys/butterpillar/model/GrowthModel.java b/src/main/java/com/cooksys/butterpillar/model/GrowthModel.java index 3f034fd..e0aba70 100644 --- a/src/main/java/com/cooksys/butterpillar/model/GrowthModel.java +++ b/src/main/java/com/cooksys/butterpillar/model/GrowthModel.java @@ -2,41 +2,51 @@ public class GrowthModel { - // any instance fields should be private + private double lengthToWingspan, leavesEatenToWeight; public double getLengthToWingspan() { - return 0; // to be implemented + return lengthToWingspan; // to be implemented } public void setLengthToWingspan(double lengthToWingspan) { - // to be implemented + this.lengthToWingspan = lengthToWingspan; } public double getLeavesEatenToWeight() { - return 0; // to be implemented + return leavesEatenToWeight; // to be implemented } public void setLeavesEatenToWeight(double leavesEatenToWeight) { - // to be implemented + this.leavesEatenToWeight = leavesEatenToWeight; } public Catterfly butterpillarToCatterfly(Butterpillar butterpillar) { - return null; // to be implemented + double wingspan = butterpillar.getLength() * this.lengthToWingspan; + double weight = butterpillar.getLeavesEaten() * this.leavesEatenToWeight; + + return new Catterfly(wingspan, weight); } public Butterpillar catterflyToButterpillar(Catterfly catterfly) { - return null; // to be implemented + double length = catterfly.getWingspan() / this.lengthToWingspan; + double leavesEaten = catterfly.getWeight() / this.leavesEatenToWeight; + + return new Butterpillar(length, leavesEaten); } - + public boolean equals(GrowthModel g) { - return false; // TODO: to be implemented + if (g.leavesEatenToWeight == this.leavesEatenToWeight && g.lengthToWingspan == this.lengthToWingspan) { + return true; + } else { + return false; + } } - + @Override public String toString() { return null; // TODO: to be implemented } - + @Override public boolean equals(Object o) { if (o instanceof GrowthModel) { @@ -46,4 +56,4 @@ public boolean equals(Object o) { } } -} +} \ No newline at end of file