wfolsom/cs6601p2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	src/net/woodyfolsom/cs6601/p2/BayesChef.java
This commit is contained in:
Woody Folsom
2012-03-12 15:59:35 -04:00
parent 16a97ba39a 07ff504781
commit 90874ab065
11 changed files with 724 additions and 415 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test/net/woodyfolsom/cs6601/p2/RecipeBookReaderTest.java
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));

14
test/net/woodyfolsom/cs6601/p2/SurveyReaderTest.java
View File

@@ -16,7 +16,7 @@ public class SurveyReaderTest {
Survey survey = SurveyReader.readSurvey(new File("data/long_survey.xml"));
assertNotNull(survey);
assertThat(survey.getDishCount(), equalTo(10));
assertThat(survey.getDishCount(), equalTo(24));
assertThat(survey.getDinerCount(), equalTo(4));
assertThat(survey.isCategory(0,"vegetarian"), is(false));
@@ -28,9 +28,21 @@ public class SurveyReaderTest {
assertThat(survey.isCategory(2,"vegan"), is(false));
assertThat(survey.isCategory(2,"allergic-nuts"), is(true));
assertThat(survey.isCategory(3,"vegan"), is(false));
assertThat(survey.isCategory(3,"allergic-nuts"), is(false));
assertThat(survey.isDiner("vegetarian"), is(true));
assertThat(survey.isDiner("allergic-nuts"), is(true));
assertThat(survey.isDiner("rastafarian"), is(false));
for (int i=0;i<survey.getDinerCount();i++) {
Diner diner = survey.getDiner(i);
System.out.println("\n");
System.out.println("Diner " + i + " (" + diner.getDescription() + ")");
for (int j=0;j<survey.getDishCount();j++) {
System.out.println(j +") " +survey.getDish(j) + ": " + diner.getRating(j));
}
}
}
@Test