From df4ab1b8ab631de5f6d47fef1f29fa06cd8e1419 Mon Sep 17 00:00:00 2001 From: Peter Zastoupil Date: Fri, 17 Jun 2016 10:41:57 -0400 Subject: [PATCH 1/3] added readme file and travis ci badge :see_no_evil: --- 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..4ae1305 --- /dev/null +++ b/README.md @@ -0,0 +1,4 @@ +jax-ftd-day-4-java-assignment +=== + +[![Build Status](https://travis-ci.org/resisttheurge/jax-ftd-day-4-java-assignment.svg?branch=resisttheurge)](https://travis-ci.org/resisttheurge/jax-ftd-day-4-java-assignment) From 48a43aa07827df629aad674b6d759ce1b03bd919 Mon Sep 17 00:00:00 2001 From: Peter Zastoupil Date: Fri, 17 Jun 2016 10:49:51 -0400 Subject: [PATCH 2/3] specified java 8 in travis config --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) 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 From 92a19cc151d46fffda81fba5a977401fb1824f49 Mon Sep 17 00:00:00 2001 From: Peter Zastoupil Date: Fri, 17 Jun 2016 12:16:45 -0400 Subject: [PATCH 3/3] implemented assignment requirements --- .../butterpillar/model/Butterpillar.java | 64 +++++++++++----- .../cooksys/butterpillar/model/Catterfly.java | 62 ++++++++++----- .../butterpillar/model/GrowthModel.java | 75 +++++++++++++------ 3 files changed, 140 insertions(+), 61 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..c72776d 100644 --- a/src/main/java/com/cooksys/butterpillar/model/Butterpillar.java +++ b/src/main/java/com/cooksys/butterpillar/model/Butterpillar.java @@ -1,43 +1,67 @@ package com.cooksys.butterpillar.model; public class Butterpillar { - - // any instance fields should be private + + private double length; + private double leavesEaten; + + public Butterpillar() { + super(); + } + + 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 - } - - public boolean equals(Butterpillar b) { - return false; // TODO: to be implemented + this.leavesEaten = leavesEaten; } - + @Override public String toString() { - return null; // TODO: to be implemented + return "Butterpillar [length=" + length + ", leavesEaten=" + leavesEaten + "]"; } - + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + long temp; + temp = Double.doubleToLongBits(leavesEaten); + result = prime * result + (int) (temp ^ (temp >>> 32)); + temp = Double.doubleToLongBits(length); + result = prime * result + (int) (temp ^ (temp >>> 32)); + return result; + } + @Override - public boolean equals(Object o) { - if (o instanceof Butterpillar) { - return this.equals((Butterpillar) o); - } else { + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + Butterpillar other = (Butterpillar) obj; + if (Double.doubleToLongBits(leavesEaten) != Double.doubleToLongBits(other.leavesEaten)) + return false; + if (Double.doubleToLongBits(length) != Double.doubleToLongBits(other.length)) return false; - } + return true; } - - } diff --git a/src/main/java/com/cooksys/butterpillar/model/Catterfly.java b/src/main/java/com/cooksys/butterpillar/model/Catterfly.java index 81ff09a..f722736 100644 --- a/src/main/java/com/cooksys/butterpillar/model/Catterfly.java +++ b/src/main/java/com/cooksys/butterpillar/model/Catterfly.java @@ -1,41 +1,67 @@ package com.cooksys.butterpillar.model; public class Catterfly { - - // any instance fields should be private + + private double wingspan; + private double weight; + + public Catterfly() { + super(); + } + + 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 - } - + @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) { - return this.equals((Catterfly) o); - } else { + public int hashCode() { + final int prime = 31; + int result = 1; + long temp; + temp = Double.doubleToLongBits(weight); + result = prime * result + (int) (temp ^ (temp >>> 32)); + temp = Double.doubleToLongBits(wingspan); + result = prime * result + (int) (temp ^ (temp >>> 32)); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + Catterfly other = (Catterfly) obj; + if (Double.doubleToLongBits(weight) != Double.doubleToLongBits(other.weight)) + return false; + if (Double.doubleToLongBits(wingspan) != Double.doubleToLongBits(other.wingspan)) return false; - } + return true; } } diff --git a/src/main/java/com/cooksys/butterpillar/model/GrowthModel.java b/src/main/java/com/cooksys/butterpillar/model/GrowthModel.java index 3f034fd..5832d43 100644 --- a/src/main/java/com/cooksys/butterpillar/model/GrowthModel.java +++ b/src/main/java/com/cooksys/butterpillar/model/GrowthModel.java @@ -2,48 +2,77 @@ public class GrowthModel { - // any instance fields should be private + private double lengthToWingspan; + private double leavesEatenToWeight; + + public GrowthModel() { + super(); + } + + public GrowthModel(double lengthToWingspan, double leavesEatenToWeight) { + super(); + this.lengthToWingspan = lengthToWingspan; + this.leavesEatenToWeight = leavesEatenToWeight; + } + + public Catterfly butterpillarToCatterfly(Butterpillar butterpillar) { + return new Catterfly(butterpillar.getLength() * this.getLengthToWingspan(), + butterpillar.getLeavesEaten() * this.getLeavesEatenToWeight()); + } + + public Butterpillar catterflyToButterpillar(Catterfly catterfly) { + return new Butterpillar(catterfly.getWingspan() / this.getLengthToWingspan(), + catterfly.getWeight() / this.getLeavesEatenToWeight()); + } 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 + @Override + public String toString() { + return "GrowthModel [lengthToWingspan=" + lengthToWingspan + ", leavesEatenToWeight=" + leavesEatenToWeight + + "]"; } - public Butterpillar catterflyToButterpillar(Catterfly catterfly) { - return null; // to be implemented - } - - public boolean equals(GrowthModel g) { - return false; // TODO: to be implemented - } - @Override - public String toString() { - return null; // TODO: to be implemented + public int hashCode() { + final int prime = 31; + int result = 1; + long temp; + temp = Double.doubleToLongBits(leavesEatenToWeight); + result = prime * result + (int) (temp ^ (temp >>> 32)); + temp = Double.doubleToLongBits(lengthToWingspan); + result = prime * result + (int) (temp ^ (temp >>> 32)); + return result; } - + @Override - public boolean equals(Object o) { - if (o instanceof GrowthModel) { - return this.equals((GrowthModel) o); - } else { + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + GrowthModel other = (GrowthModel) obj; + if (Double.doubleToLongBits(leavesEatenToWeight) != Double.doubleToLongBits(other.leavesEatenToWeight)) + return false; + if (Double.doubleToLongBits(lengthToWingspan) != Double.doubleToLongBits(other.lengthToWingspan)) return false; - } + return true; } }