Work in progress.
This commit is contained in:
@@ -1,15 +1,13 @@
|
||||
package net.woodyfolsom.cs6601.p2;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
import com.thoughtworks.xstream.annotations.XStreamAlias;
|
||||
|
||||
@XStreamAlias("ing")
|
||||
public class Ingredient {
|
||||
public enum TYPE { ALCOHOL, BEEF, DAIRY, EGGS, FISH, GLUTEN, GRAIN, NUTS, PORK, POULTRY, POTATO, SHELLFISH, SPICE, SUGAR, TOMATO}
|
||||
public enum TYPE { ALCOHOL, BEEF, DAIRY, EGGS, FISH, GENERIC_NUTS, GLUTEN, GRAIN, PORK, POULTRY, POTATO, SHELLFISH, SPICE, SUGAR, TOMATO}
|
||||
|
||||
private String item;
|
||||
|
||||
@@ -30,11 +28,15 @@ public class Ingredient {
|
||||
public boolean isType(TYPE type) {
|
||||
switch (type) {
|
||||
case BEEF :
|
||||
return item.contains("beef");
|
||||
//For our purposes, veal is just expensive beef
|
||||
return item.contains("beef") || item.contains("veal");
|
||||
case DAIRY :
|
||||
return item.contains("margarine");
|
||||
return item.contains("margarine") || item.contains("milk");
|
||||
case EGGS :
|
||||
return item.equals("egg") || item.equals("eggs");
|
||||
case GENERIC_NUTS :
|
||||
//cashews, peanuts or generic nuts
|
||||
return item.contains("cashew") || item.contains("peanut") || item.contains("nuts");
|
||||
case GLUTEN :
|
||||
return item.contains("flour");
|
||||
case PORK :
|
||||
|
||||
Reference in New Issue
Block a user