Merge branch 'master' of woodyfolsom.net:/opt/git/cs6601p2

Conflicts:
	src/net/woodyfolsom/cs6601/p2/BayesChef.java
This commit is contained in:
Woody Folsom
2012-03-12 15:59:35 -04:00
11 changed files with 724 additions and 415 deletions

View File

@@ -24,7 +24,6 @@ public class RecipeBookReaderTest {
assertThat(recipeBook.getSize(), is(equalTo(25)));
Recipe recipe = recipeBook.getRecipe(0);
System.out.println(recipe.getHead().getTitle());
assertThat(recipe.getHead().getTitle(), is(equalTo("Honey cake")));
assertTrue(recipe.getIngredients().contains(TYPE.EGGS));
assertTrue(recipe.getIngredients().contains(TYPE.GLUTEN));