From 6b6b19c758db2bf34096d69fd800bb2d66950ebf Mon Sep 17 00:00:00 2001 From: Sean O'Brien Date: Fri, 17 Jun 2016 10:42:00 -0400 Subject: [PATCH 1/3] Added README file and travis-ci badge --- README.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..6f25b3b --- /dev/null +++ b/README.md @@ -0,0 +1,4 @@ +jax-ftd-day-4-java-assignment +=== + +[![Build Status](https://travis-ci.org/Tylhandras/jax-ftd-day-4-java-assignment.svg?branch=master)](https://travis-ci.org/Tylhandras/jax-ftd-day-4-java-assignment) From b38f169e6f5089f5279ae592502b78e060d9cde3 Mon Sep 17 00:00:00 2001 From: Sean O'Brien Date: Fri, 17 Jun 2016 10:49:55 -0400 Subject: [PATCH 2/3] Updated travis-ci config to use JDK 8 --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index dff5f3a..45e9d6b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1 +1,4 @@ language: java + +jdk: + - oraclejdk8 From 837d8321dc3a0ed24ed1913a1744a20a683bbf0f Mon Sep 17 00:00:00 2001 From: Sean O'Brien Date: Fri, 17 Jun 2016 11:43:57 -0400 Subject: [PATCH 3/3] Worked on Assignment --- .../butterpillar/model/Butterpillar.java | 20 +++++++---- .../cooksys/butterpillar/model/Catterfly.java | 20 +++++++---- .../butterpillar/model/GrowthModel.java | 34 ++++++++++++++----- 3 files changed, 51 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/cooksys/butterpillar/model/Butterpillar.java b/src/main/java/com/cooksys/butterpillar/model/Butterpillar.java index 1060573..7183b47 100644 --- a/src/main/java/com/cooksys/butterpillar/model/Butterpillar.java +++ b/src/main/java/com/cooksys/butterpillar/model/Butterpillar.java @@ -2,31 +2,37 @@ 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 + if (this.length == b.getLength() && this.leavesEaten == b.getLeavesEaten()) + return true; + + return false; } @Override public String toString() { - return null; // TODO: to be implemented + String output = String.format("Butterpillar: Length: %d Leaves Eaten: %d", this.length, this.leavesEaten); + + return output; } @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..eb714a1 100644 --- a/src/main/java/com/cooksys/butterpillar/model/Catterfly.java +++ b/src/main/java/com/cooksys/butterpillar/model/Catterfly.java @@ -2,31 +2,37 @@ 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 + if (this.wingspan == c.getWingspan() && this.weight == c.getWeight()) + return true; + + return false; } @Override public String toString() { - return null; // TODO: to be implemented + String output = String.format("Catterfly: Wingspan: %d Weight: %d", this.wingspan, this.weight); + + return output; } @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..bd4077f 100644 --- a/src/main/java/com/cooksys/butterpillar/model/GrowthModel.java +++ b/src/main/java/com/cooksys/butterpillar/model/GrowthModel.java @@ -2,39 +2,55 @@ 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 temp = new Catterfly(); + + temp.setWeight(butterpillar.getLeavesEaten() * leavesEatenToWeight); + temp.setWingspan(butterpillar.getLength() * lengthToWingspan); + + return temp; } public Butterpillar catterflyToButterpillar(Catterfly catterfly) { - return null; // to be implemented + Butterpillar temp = new Butterpillar(); + + temp.setLeavesEaten(catterfly.getWeight() / leavesEatenToWeight); + temp.setLength(catterfly.getWingspan() / lengthToWingspan); + + return temp; } public boolean equals(GrowthModel g) { - return false; // TODO: to be implemented + if (this.lengthToWingspan == g.getLengthToWingspan() && this.leavesEatenToWeight == g.getLeavesEatenToWeight()) + return true; + + return false; } @Override public String toString() { - return null; // TODO: to be implemented + String output = String.format("Growth Model: Length Ratio: %d Weight Ratio: %d", this.lengthToWingspan, this.leavesEatenToWeight); + + return output; } @Override