Bryan pegg23

.travis.yml

@@ -1 +1,4 @@
 language: java
+
+jdk:
+  - oraclejdk8

README.md

@@ -0,0 +1,4 @@
+jax-ftd-day-4-java-assignment
+===
+
+[![Build Status](https://travis-ci.org/bryan-pegg23/jax-ftd-day-4-java-assignment.svg?branch=Bryan-pegg23)](https://travis-ci.org/bryan-pegg23/jax-ftd-day-4-java-assignment)

src/main/java/com/cooksys/butterpillar/model/Butterpillar.java

@@ -1,34 +1,50 @@
 package com.cooksys.butterpillar.model;
 
 public class Butterpillar {
-
+
+	private double length;
+	private double leavesEaten;
+
 	// any instance fields should be private
+	public Butterpillar() {
+
+		// TODO Auto-generated constructor stub
+	}
+
+	public Butterpillar(double length, double leavesEaten) {
+		this.length = length;
+		this.leavesEaten = leavesEaten;
+		// 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;// TODO: to be implemented
 	}
 
 	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;// TODO: to be implemented
 	}
-	
+
 	public boolean equals(Butterpillar b) {
+		if ((b.getLength() == this.length) && b.getLeavesEaten() == this.leavesEaten) {
+			return true;
+		}
 		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 Butterpillar) {
@@ -37,7 +53,5 @@ public boolean equals(Object o) {
 			return false;
 		}
 	}
-
-
 
 }

src/main/java/com/cooksys/butterpillar/model/Catterfly.java

@@ -1,34 +1,52 @@
 package com.cooksys.butterpillar.model;
 
 public class Catterfly {
-
+
+	private double wingspan;
+	private double weight;
+
 	// any instance fields should be private
 
+	public Catterfly() {
+
+		// TODO Auto-generated constructor stub
+	}
+
+	public Catterfly(double wingspan, double weight) {
+		this.wingspan = wingspan;
+		this.weight = weight;
+		// 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;// to be implemented
 	}
 
 	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;// TODO: to be implemented
 	}
-	
+
 	public boolean equals(Catterfly c) {
-		return false; // TODO: to be implemented
+		if ((c.getWingspan() == this.wingspan) && (c.getWeight() == this.weight)) {
+			return true; // TODO: to be implemented
+		} else {
+			return false;
+		}
 	}
-	
+
 	@Override
 	public String toString() {
 		return null; // TODO: to be implemented
 	}
-	
+
 	@Override
 	public boolean equals(Object o) {
 		if (o instanceof Catterfly) {

src/main/java/com/cooksys/butterpillar/model/GrowthModel.java

@@ -2,34 +2,42 @@
 
 public class GrowthModel {
 
+	private double lengthToWingspan;
+	private double leavesEatenToWeight;
+
 	// any instance fields should be private
 
 	public double getLengthToWingspan() {
-		return 0; // to be implemented
+		return lengthToWingspan; // to be implemented
 	}
 
 	public void setLengthToWingspan(double lengthToWingspan) {
-		// to be implemented
+		this.lengthToWingspan = lengthToWingspan;// to be implemented
 	}
 
 	public double getLeavesEatenToWeight() {
-		return 0; // to be implemented
+		return leavesEatenToWeight; // to be implemented
 	}
 
 	public void setLeavesEatenToWeight(double leavesEatenToWeight) {
-		// to be implemented
+		this.leavesEatenToWeight = leavesEatenToWeight;// to be implemented
 	}
 
 	public Catterfly butterpillarToCatterfly(Butterpillar butterpillar) {
-		return null; // to be implemented
+
+		return new Catterfly(butterpillar.getLength() * this.lengthToWingspan, butterpillar.getLeavesEaten() * this.leavesEatenToWeight); // to be implemented
 	}
 
 	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
+		if((this.lengthToWingspan == g.lengthToWingspan) && (this.leavesEatenToWeight == g.leavesEatenToWeight)){
+			return true;
+		} else {
+			return false;
+		}// TODO: to be implemented
 	}
 
 	@Override

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;