From bd1de1f71ae8ff044f656f604e4a9a418070625a Mon Sep 17 00:00:00 2001 From: Abiyaruth joseph Date: Fri, 17 Jun 2016 10:41:49 -0400 Subject: [PATCH 1/3] added readme file and travis ci badge :see_no_evil: --- README.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..181a5ea --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +jax-ftd-day-4-java-assignment +=== +[![Build Status](https://travis-ci.org/Abiyaruth/jax-ftd-day-4-java-assignment.svg?branch=Abiyaruth)](https://travis-ci.org/Abiyaruth/jax-ftd-day-4-java-assignment) From 08659d2196bfe70d24177709b0bbe98b9d394b97 Mon Sep 17 00:00:00 2001 From: Abiyaruth joseph Date: Fri, 17 Jun 2016 10:49:44 -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..998044a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1 +1,3 @@ language: java +jdk : + - oraclejdk8 From 450e5e4da5502ec678777180fc5cff8e677ebda5 Mon Sep 17 00:00:00 2001 From: Abiyaruth joseph Date: Fri, 17 Jun 2016 11:45:04 -0400 Subject: [PATCH 3/3] reimplemented --- .../butterpillar/model/Butterpillar.java | 47 ++++++++++------- .../cooksys/butterpillar/model/Catterfly.java | 52 ++++++++++++------- .../butterpillar/model/GrowthModel.java | 36 ++++++++++--- .../test/model/GrowthModelTest.java | 2 +- 4 files changed, 88 insertions(+), 49 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..c96e357 100644 --- a/src/main/java/com/cooksys/butterpillar/model/Butterpillar.java +++ b/src/main/java/com/cooksys/butterpillar/model/Butterpillar.java @@ -1,34 +1,41 @@ package com.cooksys.butterpillar.model; -public class Butterpillar { - - // any instance fields should be private - public double getLength() { - return 0; // TODO: to be implemented +public class Butterpillar { + double Length; + double LeavesEaten; + public Butterpillar() + { } - - public void setLength(double length) { - // TODO: to be implemented + public Butterpillar(double Length,double LeavesEaten) + { + this.Length=Length; + this.LeavesEaten=LeavesEaten; } - - public double getLeavesEaten() { - return 0; // TODO: to be implemented + public double getLength() { + return Length; } - - public void setLeavesEaten(double leavesEaten) { - // TODO: to be implemented + public void setLength(double Length) { + this.Length = Length; } - - public boolean equals(Butterpillar b) { - return false; // TODO: to be implemented + public double getLeavesEaten() { + return LeavesEaten; + } + public void setLeavesEaten(double LeavesEaten) { + this.LeavesEaten = LeavesEaten; } - @Override public String toString() { - return null; // TODO: to be implemented + return "Butterpillar [length:" +Length+ ",leavesEaten: "+LeavesEaten+ "]"; + } + public boolean equals(Butterpillar b){ + if(b.Length!=Length) + { + return false; + }else { + return true; + } } - @Override public boolean equals(Object o) { if (o instanceof Butterpillar) { diff --git a/src/main/java/com/cooksys/butterpillar/model/Catterfly.java b/src/main/java/com/cooksys/butterpillar/model/Catterfly.java index 81ff09a..e846cb6 100644 --- a/src/main/java/com/cooksys/butterpillar/model/Catterfly.java +++ b/src/main/java/com/cooksys/butterpillar/model/Catterfly.java @@ -1,34 +1,46 @@ package com.cooksys.butterpillar.model; -public class Catterfly { - - // any instance fields should be private - public double getWingspan() { - return 0; // to be implemented +public class Catterfly { + double Wingspan; + double Weight; + public Catterfly() + { + } - - public void setWingspan(double wingspan) { - // to be implemented + public Catterfly(double Wingspan,double Weight) + { + this.Wingspan = Wingspan; + this.Weight=Weight; } - - public double getWeight() { - return 0; // TODO: to be implemented + + + public double getWingspan() { + return Wingspan; } - - public void setWeight(double weight) { - // TODO: to be implemented + public void setWingspan(double Wingspan) { + this.Wingspan = Wingspan; } - - public boolean equals(Catterfly c) { - return false; // TODO: to be implemented + public double getWeight() { + return Weight; } - + public void setWeight(double Weight) { + this.Weight = Weight; + } + + @Override public String toString() { - return null; // TODO: to be implemented + return "Catterfly [wingspan: " + Wingspan + ", weight: " +Weight + "]"; } - + public boolean equals(Catterfly c){ + if(c.Wingspan!=Wingspan) + { + return false; + }else { + return true; + } + } @Override public boolean equals(Object o) { if (o instanceof Catterfly) { diff --git a/src/main/java/com/cooksys/butterpillar/model/GrowthModel.java b/src/main/java/com/cooksys/butterpillar/model/GrowthModel.java index 3f034fd..dd68b86 100644 --- a/src/main/java/com/cooksys/butterpillar/model/GrowthModel.java +++ b/src/main/java/com/cooksys/butterpillar/model/GrowthModel.java @@ -1,10 +1,11 @@ package com.cooksys.butterpillar.model; public class GrowthModel { - +double LengthToWingspan; +double LeavesEatenToWeight; // any instance fields should be private - public double getLengthToWingspan() { + /*public double getLengthToWingspan() { return 0; // to be implemented } @@ -19,18 +20,37 @@ public double getLeavesEatenToWeight() { public void setLeavesEatenToWeight(double leavesEatenToWeight) { // to be implemented } - +*/ public Catterfly butterpillarToCatterfly(Butterpillar butterpillar) { - return null; // to be implemented + return new Catterfly(butterpillar.Length*LengthToWingspan,butterpillar.LeavesEaten*LeavesEatenToWeight); + } + + public double getLengthToWingspan() { + return LengthToWingspan; + } + + public void setLengthToWingspan(double lengthToWingspan) { + LengthToWingspan = lengthToWingspan; + } + + public double getLeavesEatenToWeight() { + return LeavesEatenToWeight; + } + + public void setLeavesEatenToWeight(double leavesEatenToWeight) { + LeavesEatenToWeight = leavesEatenToWeight; } public Butterpillar catterflyToButterpillar(Catterfly catterfly) { - return null; // to be implemented + return new Butterpillar(catterfly.Wingspan/LengthToWingspan, catterfly.Weight/LeavesEatenToWeight); } - public boolean equals(GrowthModel g) { - return false; // TODO: to be implemented - } + if(g.LengthToWingspan==LengthToWingspan){ + + return false;}else + // TODO: to be implemented + return false; + } @Override public String toString() { diff --git a/src/test/java/com/cooksys/butterpillar/test/model/GrowthModelTest.java b/src/test/java/com/cooksys/butterpillar/test/model/GrowthModelTest.java index 327f535..a6daec2 100644 --- a/src/test/java/com/cooksys/butterpillar/test/model/GrowthModelTest.java +++ b/src/test/java/com/cooksys/butterpillar/test/model/GrowthModelTest.java @@ -1,6 +1,6 @@ package com.cooksys.butterpillar.test.model; -import static org.junit.Assert.fail; +//import static org.junit.Assert.fail; import java.util.ArrayList; import java.util.List;