From 0f80007e0610f4b73dee4c6a6b9e5b994026d16b Mon Sep 17 00:00:00 2001 From: NoahSchultz Date: Fri, 17 Jun 2016 10:41:57 -0400 Subject: [PATCH 1/5] =?UTF-8?q?added=20README=20and=20badge=20=F0=9F=94=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 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..30bbadf --- /dev/null +++ b/README.md @@ -0,0 +1,4 @@ +jax-ftd-day-4-java-assignment +=== + +[![Build Status](https://travis-ci.org/retrograzer/jax-ftd-day-4-java-assignment.svg?branch=retrograzer)](https://travis-ci.org/retrograzer/jax-ftd-day-4-java-assignment) From 9eff04031fd0d85b626140d3e80abde879a2cfc4 Mon Sep 17 00:00:00 2001 From: NoahSchultz Date: Fri, 17 Jun 2016 10:49:53 -0400 Subject: [PATCH 2/5] added jdk 1.8 to travis config --- .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 bdc20b2290d6577a482d20989dcef6d8614e8080 Mon Sep 17 00:00:00 2001 From: NoahSchultz Date: Fri, 17 Jun 2016 12:05:17 -0400 Subject: [PATCH 3/5] Implemented new features, still unknown bugs --- .classpath | 6 +---- .project | 2 +- .../butterpillar/model/Butterpillar.java | 24 +++++++++++++------ .../cooksys/butterpillar/model/Catterfly.java | 24 +++++++++++++------ .../butterpillar/model/GrowthModel.java | 20 ++++++++++------ .../test/model/GrowthModelTest.java | 5 ++-- 6 files changed, 52 insertions(+), 29 deletions(-) diff --git a/.classpath b/.classpath index af1430b..98370b4 100644 --- a/.classpath +++ b/.classpath @@ -12,11 +12,7 @@ - - - - - + diff --git a/.project b/.project index 37c0ac2..4cf6f19 100644 --- a/.project +++ b/.project @@ -1,6 +1,6 @@ - butterpillar-conversions + butterpillar-conversions1 diff --git a/src/main/java/com/cooksys/butterpillar/model/Butterpillar.java b/src/main/java/com/cooksys/butterpillar/model/Butterpillar.java index 1060573..4aed5d9 100644 --- a/src/main/java/com/cooksys/butterpillar/model/Butterpillar.java +++ b/src/main/java/com/cooksys/butterpillar/model/Butterpillar.java @@ -2,31 +2,41 @@ public class Butterpillar { - // any instance fields should be private + private double length; + private double leavesEaten; + + public Butterpillar(double d, double e) { + length = d; + leavesEaten = e; + } + + public Butterpillar() { + // TODO Auto-generated constructor stub + } 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) { - return false; // TODO: to be implemented + return length == b.length && leavesEaten == b.leavesEaten; } @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..32e60c5 100644 --- a/src/main/java/com/cooksys/butterpillar/model/Catterfly.java +++ b/src/main/java/com/cooksys/butterpillar/model/Catterfly.java @@ -2,31 +2,41 @@ public class Catterfly { - // any instance fields should be private + private double wingspan; + private double weight; + + public Catterfly(double d, double e) { + wingspan = d; + weight = e; + } + + public Catterfly() { + // TODO Auto-generated constructor stub + } 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) { - return false; // TODO: to be implemented + return wingspan == c.wingspan && weight == c.weight; } @Override public String toString() { - return null; // TODO: to be implemented + return "Catterpillar [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..bfbd8ae 100644 --- a/src/main/java/com/cooksys/butterpillar/model/GrowthModel.java +++ b/src/main/java/com/cooksys/butterpillar/model/GrowthModel.java @@ -2,34 +2,40 @@ 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; // to be implemented } public void setLengthToWingspan(double lengthToWingspan) { - // to be implemented + this.lengthToWingspan = lengthToWingspan; } public double getLeavesEatenToWeight() { - return 0; // to be implemented + return leavesEatenToWeight; // to be implemented } public void setLeavesEatenToWeight(double leavesEatenToWeight) { // to be implemented + this.leavesEatenToWeight = leavesEatenToWeight; } public Catterfly butterpillarToCatterfly(Butterpillar butterpillar) { - return null; // to be implemented + double le = butterpillar.getLeavesEaten(); + double len = butterpillar.getLength(); + return new Catterfly(le * leavesEatenToWeight, len * lengthToWingspan); // to be implemented } public Butterpillar catterflyToButterpillar(Catterfly catterfly) { - return null; // to be implemented + double le = catterfly.getWingspan(); + double len = catterfly.getWeight(); + return new Butterpillar(le / leavesEatenToWeight, len / lengthToWingspan); } public boolean equals(GrowthModel g) { - return false; // TODO: to be implemented + return leavesEatenToWeight == g.leavesEatenToWeight && lengthToWingspan == g.lengthToWingspan; } @Override 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..6793480 100644 --- a/src/test/java/com/cooksys/butterpillar/test/model/GrowthModelTest.java +++ b/src/test/java/com/cooksys/butterpillar/test/model/GrowthModelTest.java @@ -1,7 +1,5 @@ package com.cooksys.butterpillar.test.model; -import static org.junit.Assert.fail; - import java.util.ArrayList; import java.util.List; @@ -9,6 +7,8 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.cooksys.butterpillar.model.Butterpillar; import com.cooksys.butterpillar.model.Catterfly; @@ -19,6 +19,7 @@ public class GrowthModelTest { private GrowthModel model; private List butterpillars; private List catterflies; + public Logger log = LoggerFactory.getLogger(GrowthModelTest.class); @Before public void before() { From 7bc4dea3ceb0408823caa2bbab6cced2f92a054a Mon Sep 17 00:00:00 2001 From: NoahSchultz Date: Fri, 17 Jun 2016 12:05:42 -0400 Subject: [PATCH 4/5] changed Butterpillar and Catterfly classes --- .../com/cooksys/butterpillar/model/Butterpillar.java | 4 ++-- .../com/cooksys/butterpillar/model/Catterfly.java | 4 ++-- .../com/cooksys/butterpillar/model/GrowthModel.java | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/cooksys/butterpillar/model/Butterpillar.java b/src/main/java/com/cooksys/butterpillar/model/Butterpillar.java index 4aed5d9..b7e9209 100644 --- a/src/main/java/com/cooksys/butterpillar/model/Butterpillar.java +++ b/src/main/java/com/cooksys/butterpillar/model/Butterpillar.java @@ -2,8 +2,8 @@ public class Butterpillar { - private double length; - private double leavesEaten; + double length; + double leavesEaten; public Butterpillar(double d, double e) { length = d; diff --git a/src/main/java/com/cooksys/butterpillar/model/Catterfly.java b/src/main/java/com/cooksys/butterpillar/model/Catterfly.java index 32e60c5..578889a 100644 --- a/src/main/java/com/cooksys/butterpillar/model/Catterfly.java +++ b/src/main/java/com/cooksys/butterpillar/model/Catterfly.java @@ -2,8 +2,8 @@ public class Catterfly { - private double wingspan; - private double weight; + double wingspan; + double weight; public Catterfly(double d, double e) { wingspan = d; diff --git a/src/main/java/com/cooksys/butterpillar/model/GrowthModel.java b/src/main/java/com/cooksys/butterpillar/model/GrowthModel.java index bfbd8ae..1b695a0 100644 --- a/src/main/java/com/cooksys/butterpillar/model/GrowthModel.java +++ b/src/main/java/com/cooksys/butterpillar/model/GrowthModel.java @@ -23,15 +23,15 @@ public void setLeavesEatenToWeight(double leavesEatenToWeight) { } public Catterfly butterpillarToCatterfly(Butterpillar butterpillar) { - double le = butterpillar.getLeavesEaten(); - double len = butterpillar.getLength(); - return new Catterfly(le * leavesEatenToWeight, len * lengthToWingspan); // to be implemented + //double le = butterpillar.getLeavesEaten(); + //double len = butterpillar.getLength(); + return new Catterfly(butterpillar.leavesEaten * leavesEatenToWeight, butterpillar.length * lengthToWingspan); // to be implemented } public Butterpillar catterflyToButterpillar(Catterfly catterfly) { - double le = catterfly.getWingspan(); - double len = catterfly.getWeight(); - return new Butterpillar(le / leavesEatenToWeight, len / lengthToWingspan); + //double le = catterfly.getWingspan(); + //double len = catterfly.getWeight(); + return new Butterpillar(catterfly.wingspan / leavesEatenToWeight, catterfly.weight / lengthToWingspan); } public boolean equals(GrowthModel g) { From bf0feb55c3caba51f13319b652cdd14988462a9b Mon Sep 17 00:00:00 2001 From: NoahSchultz Date: Fri, 17 Jun 2016 12:29:06 -0400 Subject: [PATCH 5/5] fixed all bugs/successful build --- .../java/com/cooksys/butterpillar/model/Butterpillar.java | 4 ++-- src/main/java/com/cooksys/butterpillar/model/Catterfly.java | 4 ++-- src/main/java/com/cooksys/butterpillar/model/GrowthModel.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/cooksys/butterpillar/model/Butterpillar.java b/src/main/java/com/cooksys/butterpillar/model/Butterpillar.java index b7e9209..79aab1d 100644 --- a/src/main/java/com/cooksys/butterpillar/model/Butterpillar.java +++ b/src/main/java/com/cooksys/butterpillar/model/Butterpillar.java @@ -6,8 +6,8 @@ public class Butterpillar { double leavesEaten; public Butterpillar(double d, double e) { - length = d; - leavesEaten = e; + leavesEaten = d; + length = e; } public Butterpillar() { diff --git a/src/main/java/com/cooksys/butterpillar/model/Catterfly.java b/src/main/java/com/cooksys/butterpillar/model/Catterfly.java index 578889a..3779d17 100644 --- a/src/main/java/com/cooksys/butterpillar/model/Catterfly.java +++ b/src/main/java/com/cooksys/butterpillar/model/Catterfly.java @@ -6,8 +6,8 @@ public class Catterfly { double weight; public Catterfly(double d, double e) { - wingspan = d; - weight = e; + weight = d; + wingspan = e; } public Catterfly() { diff --git a/src/main/java/com/cooksys/butterpillar/model/GrowthModel.java b/src/main/java/com/cooksys/butterpillar/model/GrowthModel.java index 1b695a0..0f1658e 100644 --- a/src/main/java/com/cooksys/butterpillar/model/GrowthModel.java +++ b/src/main/java/com/cooksys/butterpillar/model/GrowthModel.java @@ -31,7 +31,7 @@ public Catterfly butterpillarToCatterfly(Butterpillar butterpillar) { public Butterpillar catterflyToButterpillar(Catterfly catterfly) { //double le = catterfly.getWingspan(); //double len = catterfly.getWeight(); - return new Butterpillar(catterfly.wingspan / leavesEatenToWeight, catterfly.weight / lengthToWingspan); + return new Butterpillar( catterfly.weight / leavesEatenToWeight, catterfly.wingspan / lengthToWingspan); } public boolean equals(GrowthModel g) {