Commit d8b8aedc authored by Xiaoying Pu's avatar Xiaoying Pu

why am i commiting at this hour

parent 7f879443
......@@ -9,14 +9,11 @@
<group>
<file>file:/Users/pxy/dm_task/src/tracker/UDPController.java</file>
<file>file:/Users/pxy/dm_task/src/util/EventType.java</file>
<file>file:/Users/pxy/dm_task/src/tracker/PrimaryTaskController.java</file>
<file>file:/Users/pxy/dm_task/src/digit/controller/SecondaryTaskController.java</file>
<file>file:/Users/pxy/dm_task/src/util/EventListener.java</file>
<file>file:/Users/pxy/dm_task/src/util/Persistence.java</file>
<file>file:/Users/pxy/dm_task/src/digit/DigitTaskFacade.java</file>
</group>
<group/>
</open-files>
</project-private>
......@@ -13,19 +13,22 @@ public class Decision {
private final String male = "Man, Boy, Father, Male, Grandpa, Husband, Son, Uncle";
// from my lovely clojure code!
public final String MALE = "2*Man|2*Boy|2*Father|2*Male|2*Grandpa|2*Husband|2*Son|2*Uncle";
private final String MALE = "2*Man|2*Boy|2*Father|2*Male|2*Grandpa|2*Husband|2*Son|2*Uncle";
private final String female = "Girl, Female, Aunt, Daughter, Wife, Woman, Mother, Grandma";
public final String FEMALE = "2*Girl|2*Female|2*Aunt|2*Daughter|2*Wife|2*Woman|2*Mother|2*Grandma";
private final String FEMALE = "2*Girl|2*Female|2*Aunt|2*Daughter|2*Wife|2*Woman|2*Mother|2*Grandma";
private final String unsplitScience = "Biology, Physics, Chemistry, Math, Geology, Astronomy, Engineering";
public final String SCIENCE = "2*Science|2*Physics|2*Chemistry|2*Math|2*Geology|2*Astronomy|2*Engineering";
private final String SCIENCE = "2*Science|2*Physics|2*Chemistry|2*Math|2*Geology|2*Astronomy|2*Engineering";
private final String arts = "Philosophy, Humanities, Arts, Literature, English, Music, History";
public final String ARTS = "2*Philosophy|2*Humanities|2*Arts|2*Literature|2*English|2*Music|2*History";
private final String ARTS = "2*Philosophy|2*Humanities|2*Arts|2*Literature|2*English|2*Music|2*History";
private final String CONDITION_HIGH = "HWL|HWL|HWL|HWL|HWL|HWL|HWL";
private final String CONDITION_LOW = "LWL|LWL|LWL|LWL|LWL|LWL|LWL";
/**
* Not used
*/
private final String typeChar = "2";
private final String typeRandomPick = "5";
private final String typePause = "0";
......@@ -131,12 +134,17 @@ public class Decision {
}
public String getMix() {
// let me hard code this
String[] result = new String[]{};
return String.join(",", result);
}
public String getBreak() {
String[] result = new String[]{};
List<String> result = new ArrayList<>();
// type pause only needs three col's
result.add(typePause);
result.add("Now take a break...");
result.add("PAUSE");
return String.join(",", result);
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment