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/.travis.yml b/.travis.yml
index dff5f3a..935589d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1 +1,4 @@
language: java
+
+jdk:
+ -oraclejdk8
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
+===
+
+[](https://travis-ci.org/retrograzer/jax-ftd-day-4-java-assignment)
diff --git a/src/main/java/com/cooksys/butterpillar/model/Butterpillar.java b/src/main/java/com/cooksys/butterpillar/model/Butterpillar.java
index 1060573..79aab1d 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
+ double length;
+ double leavesEaten;
+
+ public Butterpillar(double d, double e) {
+ leavesEaten = d;
+ length = 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..3779d17 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
+ double wingspan;
+ double weight;
+
+ public Catterfly(double d, double e) {
+ weight = d;
+ wingspan = 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..0f1658e 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(butterpillar.leavesEaten * leavesEatenToWeight, butterpillar.length * 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( catterfly.weight / leavesEatenToWeight, catterfly.wingspan / 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() {