From 9db609c8e38792000b6b339f254f30bc11ff5691 Mon Sep 17 00:00:00 2001 From: mv Date: Fri, 17 Jun 2016 10:41:59 -0400 Subject: [PATCH 1/3] added readme file --- 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..6380eff --- /dev/null +++ b/README.md @@ -0,0 +1,4 @@ +jax-ftd-day-4-java-assignment +=== + +[![Build Status](https://travis-ci.org/mvaidya1/jax-ftd-day-4-java-assignment.svg?branch=mvaidya1)](https://travis-ci.org/mvaidya1/jax-ftd-day-4-java-assignment) From 7ffd534af62ad31952f3d461336bb3371aee8a13 Mon Sep 17 00:00:00 2001 From: mv Date: Fri, 17 Jun 2016 10:49:55 -0400 Subject: [PATCH 2/3] changed jdk to update --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index dff5f3a..4c9775e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1 +1,4 @@ language: java +jdk: + - oraclejdk8 + From b97cd554fe380e63d4f5be28de4c588ecd50cd02 Mon Sep 17 00:00:00 2001 From: mv Date: Fri, 17 Jun 2016 13:02:55 -0400 Subject: [PATCH 3/3] fixed code --- .../butterpillar/model/Butterpillar.java | 15 ++++++--- .../cooksys/butterpillar/model/Catterfly.java | 17 +++++++--- .../butterpillar/model/GrowthModel.java | 33 ++++++++++++++----- 3 files changed, 48 insertions(+), 17 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..e10810a 100644 --- a/src/main/java/com/cooksys/butterpillar/model/Butterpillar.java +++ b/src/main/java/com/cooksys/butterpillar/model/Butterpillar.java @@ -1,32 +1,39 @@ package com.cooksys.butterpillar.model; public class Butterpillar { - + private double length; + private double leavesEaten; + // any instance fields should be private public double getLength() { - return 0; // TODO: to be implemented + return length; // TODO: to be implemented } public void setLength(double length) { // TODO: to be implemented + this.length = length; } public double getLeavesEaten() { - return 0; // TODO: to be implemented + return leavesEaten; // TODO: to be implemented } public void setLeavesEaten(double leavesEaten) { // TODO: to be implemented + this.leavesEaten =leavesEaten; } public boolean equals(Butterpillar b) { + if(b.leavesEaten == this.leavesEaten && b.length ==this.length){ + return true; + } return false; // TODO: to be implemented } @Override public String toString() { - return null; // TODO: to be implemented + return "Butterpillar [length=" + length + ", leavesEaten=" + leavesEaten + "]"; } @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..e6140db 100644 --- a/src/main/java/com/cooksys/butterpillar/model/Catterfly.java +++ b/src/main/java/com/cooksys/butterpillar/model/Catterfly.java @@ -1,32 +1,41 @@ package com.cooksys.butterpillar.model; public class Catterfly { - + private double wingspan; + private double weight; + // any instance fields should be private + + 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) { + if(c.weight == this.weight && c.wingspan == this.wingspan){ + return true; + } return false; // TODO: to be implemented } @Override public String toString() { - return null; // TODO: to be implemented + return "Catterfly [wingspan=" + wingspan + ", weight=" + weight + "]"; } @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..4a810c4 100644 --- a/src/main/java/com/cooksys/butterpillar/model/GrowthModel.java +++ b/src/main/java/com/cooksys/butterpillar/model/GrowthModel.java @@ -2,39 +2,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 + Catterfly c = new Catterfly(); + c.setWeight((butterpillar.getLeavesEaten() * this.leavesEatenToWeight)); + c.setWingspan((butterpillar.getLength() * this.lengthToWingspan)); + return c; } public Butterpillar catterflyToButterpillar(Catterfly catterfly) { - return null; // to be implemented + Butterpillar b = new Butterpillar(); + b.setLength((catterfly.getWingspan() / this.lengthToWingspan)); + b.setLeavesEaten((catterfly.getWeight() / this.leavesEatenToWeight)); + return b; } public boolean equals(GrowthModel g) { - return false; // TODO: to be implemented + if((g.lengthToWingspan == this.lengthToWingspan) && (g.leavesEatenToWeight == this.leavesEatenToWeight)){ + return true; + }else + return false; } @Override public String toString() { - return null; // TODO: to be implemented + return "(" + String.valueOf(this.lengthToWingspan) + ", " + (String.valueOf(this.leavesEatenToWeight)) + ")"; } @Override