/**
 * Created by evachen on 10/27/15.
 */

/**
 * Abstract class for high-level developers to create criterias for 'roommate' ,
 * e.g. cleanliness, loudness, time spent outside.
 */
public Criteria {
    /** Keyword explaining criteria. */
    private String name;
    /** Percentage a `Person` assigns Criteria, showing importance of criteria to subject. */
    private double percentageWeight;
    /** A person's self-evaluation of their criteria as a roommate. */
    private int score;
    
    public Criteria(String name, double weight, int score)
    {
        this.name = name;
        this.percentageWeight = weight;
        this.score = score;
    }
    
    public String getName() { return this.name; }
    public void setName(String name) { this.name = name; }
    public int getScore() { return score; }
    public void setScore(int score) { this.score = score; }
    public double getPercentageWeight() { return percentageWeight; }
    public void setPercentageWeight(double weight) { this.percentageWeight = weight; }
}

@@ -481,24 +481,116 @@
  int score;%0A
+    /** A person's expectation for this criteria in a roommate */%0A    private int expected;%0A
     %0A    pub
@@ -639,16 +639,30 @@
 nt score
+, int expected
 )%0A    %7B%0A
@@ -751,24 +751,58 @@
 re = score;%0A
+        this.expected = expected;%0A
     %7D%0A    %0A 
@@ -945,32 +945,32 @@
 return score; %7D%0A
-
     public void 
@@ -1005,32 +1005,154 @@
 core = score; %7D%0A
+    public int getExpected() %7B return expected; %7D%0A    public void setExpected(int expected) %7B this.expected = expected; %7D%0A
     public doubl

update to include expected