From 6a3a164b0b330e728ed03e0198b46cc8151b7ea9 Mon Sep 17 00:00:00 2001 From: Artur Lan Date: Fri, 17 Jun 2016 10:41:56 -0400 Subject: [PATCH 1/7] added readme file and travis ci badge --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..17aa213 --- /dev/null +++ b/README.md @@ -0,0 +1,6 @@ +jax-ftd-day-4-java-assignment +=== + + + +[![Build Status](https://travis-ci.org/arturlan/jax-ftd-day-4-java-assignment.svg?branch=arturlan)](https://travis-ci.org/arturlan/jax-ftd-day-4-java-assignment) From 35142a830f194331130d8648e1bc91f9599c6dbf Mon Sep 17 00:00:00 2001 From: Artur Lan Date: Fri, 17 Jun 2016 10:48:24 -0400 Subject: [PATCH 2/7] added jdk java 1.8 --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index dff5f3a..935589d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1 +1,4 @@ language: java + +jdk: + -oraclejdk8 From 2268d014e908465ef633889d8decc44d55a99d33 Mon Sep 17 00:00:00 2001 From: Artur Lan Date: Fri, 17 Jun 2016 11:36:23 -0400 Subject: [PATCH 3/7] working JUnit test --- .../butterpillar/model/Butterpillar.java | 35 +++++++++++++++---- .../cooksys/butterpillar/model/Catterfly.java | 33 +++++++++++++---- .../butterpillar/model/GrowthModel.java | 21 ++++++----- 3 files changed, 67 insertions(+), 22 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..998cfdf 100644 --- a/src/main/java/com/cooksys/butterpillar/model/Butterpillar.java +++ b/src/main/java/com/cooksys/butterpillar/model/Butterpillar.java @@ -3,32 +3,53 @@ public class Butterpillar { // any instance fields should be private + private double length; + private double leavesEaten; + + public Butterpillar() { + + } + + + + 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 + this.leavesEaten = leavesEaten; } - + public boolean equals(Butterpillar b) { + if(b.length == length && b.leavesEaten == leavesEaten) { + 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 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..ab8d4f8 100644 --- a/src/main/java/com/cooksys/butterpillar/model/Catterfly.java +++ b/src/main/java/com/cooksys/butterpillar/model/Catterfly.java @@ -3,32 +3,53 @@ public class Catterfly { // any instance fields should be private + private double wingspan; + private double weight; + + public Catterfly() { + + } + + + + 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) { + if (c.wingspan == wingspan && c.weight == weight) { + 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 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..2e07675 100644 --- a/src/main/java/com/cooksys/butterpillar/model/GrowthModel.java +++ b/src/main/java/com/cooksys/butterpillar/model/GrowthModel.java @@ -3,40 +3,43 @@ 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 + return new Catterfly(butterpillar.getLength() * lengthToWingspan, + butterpillar.getLeavesEaten() * leavesEatenToWeight); } public Butterpillar catterflyToButterpillar(Catterfly catterfly) { - return null; // to be implemented + return new Butterpillar(catterfly.getWingspan() / lengthToWingspan, catterfly.getWeight() / leavesEatenToWeight); } - + public boolean equals(GrowthModel g) { return false; // TODO: to be implemented } - + @Override public String toString() { return null; // TODO: to be implemented } - + @Override public boolean equals(Object o) { if (o instanceof GrowthModel) { From 7b50d73d176cb3ff46bf08ef8c83417930cd4a76 Mon Sep 17 00:00:00 2001 From: Artur Lan Date: Fri, 17 Jun 2016 11:43:28 -0400 Subject: [PATCH 4/7] changed oracle jdk --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 935589d..45e9d6b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ language: java jdk: - -oraclejdk8 + - oraclejdk8 From 978d190209c07db060418d677c2c3c0a22f198b0 Mon Sep 17 00:00:00 2001 From: Artur Lan Date: Fri, 17 Jun 2016 11:45:15 -0400 Subject: [PATCH 5/7] fixed jdk --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 45e9d6b..9bcf999 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,3 @@ language: java - jdk: - oraclejdk8 From 0e992ae05340672b17cd6fcaaabed1008b8f74a9 Mon Sep 17 00:00:00 2001 From: Artur Lan Date: Fri, 17 Jun 2016 11:46:46 -0400 Subject: [PATCH 6/7] last fixed jdk --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9bcf999..a5475ed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,3 @@ language: java jdk: - - oraclejdk8 + -oraclejdk8 From 5cb9ae330036100212b1ac2bed7582f4e5ccaf40 Mon Sep 17 00:00:00 2001 From: Artur Lan Date: Fri, 17 Jun 2016 11:49:37 -0400 Subject: [PATCH 7/7] jdk8 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a5475ed..9bcf999 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,3 @@ language: java jdk: - -oraclejdk8 + - oraclejdk8