Merge branch 'master' of woodyfolsom.net:/opt/git/cs6601p2
Conflicts: src/net/woodyfolsom/cs6601/p2/BayesChef.java
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user