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

@@ -10,6 +10,11 @@ public class Diner {
private int id;
private Map<Integer,Integer> ratings = new HashMap<Integer,Integer>();
private Map<Integer,Boolean> categories = new HashMap<Integer,Boolean>();
private String description;
public String getDescription() {
return description;
}
public int getId() {
return id;