import java.io.*;

public class Person
{
   /* [INSTANCE VARIABLES] */
   private Gender gender;
   private Major major;
   private Religion religion;
   private Substances substances;
   private Noise noise;
   private Cleanliness cleanliness;
   private Organizations organizations;
   private SleepTimes sleepTimes;

   /* [CONSTRUCTOR(s)] */
   public Person()
   {
      this.gender = new Gender();
      this.major = new Major();
      this.religion = new Religion();
      this.substances = new Substances();
      this.noise = new Noise();
      this.cleanliness = new Cleanliness();
      this.organizations = new Organizations();
      this.sleepTimes = new sleepTimes();
   }

   /* [METHODS] */


   // Returns true/false if the person being compared is equal to this person
   // -- Overrides 'equals' for Person class
   public boolean equals(Person p)
   {
      if (this.gender.equals(p.gender) &&
          this.major.equals(p.major) &&
          this.religion.equals(p.religion) &&
          this.substances.equals(p.substances) &&
          this.noise.equals(p.noise) &&
          this.cleanliness.equals(p.cleanliness) &&
          this.organizations.equals(p.organizations) &&
          this.sleepTimes.equals(p.sleepTimes))
      {
         return true;
      }
      else
         return false;
          
   }

   // All 'Get' Methods
   public Gender getGender() { return this.gender.getValue(); }
   public Major getMajor() { return this.major; }
   public Religion getReligion() { return this.religion; }
   public Substance getSubstances() { return this.substances; }
   public Noise getNoise() { return this.noise; }
   public Cleanliness getCleanliness() { return this.cleanliness; }
   public Organizations getOrganizations() { return this.organizations; }
   public SleepTimes getSleepTimes() { return this.sleepTimes; }

   // All 'Set' Methods
   public void setGender(Gender g) { this.gender.setValue(g); }
   public void setMajor(Major m) { this.major = m; }
   public void setReligion(Religion r) { this.religion = r; }
   public void setSubstances(Substances s) { this.substances = s; }
   public void setNoise(Noise n) { this.noise = n; }
   public void setCleanliness(Cleanliness c) { this.cleanliness = c; }
   public void setOrganizations(Organizations o) { this.organizations = o; }
   public void setSleepTimes(SleepTimes st) { this.sleepTimes = st; }
}

@@ -356,16 +356,151 @@
  Person(
+String gender, String major, String religion, boolean substances, %0A    int noise, int cleanliness, String organizations, int sleepTimes
 )%0A   %7B%0A 
@@ -529,16 +529,22 @@
  Gender(
+gender
 );%0A     
@@ -567,16 +567,21 @@
 w Major(
+major
 );%0A     
@@ -610,16 +610,24 @@
 eligion(
+religion
 );%0A     
@@ -660,16 +660,26 @@
 stances(
+substances
 );%0A     
@@ -702,16 +702,21 @@
 w Noise(
+noise
 );%0A     
@@ -751,16 +751,27 @@
 nliness(
+cleanliness
 );%0A     
@@ -810,16 +810,29 @@
 zations(
+organizations
 );%0A     
@@ -865,16 +865,26 @@
 epTimes(
+sleepTimes
 );%0A   %7D%0A
@@ -903,17 +903,19 @@
 ODS%5D */%0A
-%0A
+   
 %0A   // R
@@ -1548,32 +1548,101 @@
 ll 'Get' Methods
+ - returns value of each criterion, NOT the criterion object instance
 %0A   public Gende
@@ -1636,22 +1636,22 @@
  public 
-Gender
+String
  getGend
@@ -1700,21 +1700,22 @@
  public 
-Major
+String
  getMajo
@@ -1737,16 +1737,27 @@
 is.major
+.getValue()
 ; %7D%0A   p
@@ -1762,24 +1762,22 @@
  public 
-Religion
+String
  getReli
@@ -1805,16 +1805,27 @@
 religion
+.getValue()
 ; %7D%0A   p
@@ -1830,25 +1830,23 @@
  public 
-Substance
+boolean
  getSubs
@@ -1878,16 +1878,27 @@
 bstances
+.getValue()
 ; %7D%0A   p
@@ -1903,21 +1903,19 @@
  public 
-Noise
+int
  getNois
@@ -1937,16 +1937,27 @@
 is.noise
+.getValue()
 ; %7D%0A   p
@@ -1962,27 +1962,19 @@
  public 
-Cleanliness
+int
  getClea
@@ -2008,16 +2008,27 @@
 anliness
+.getValue()
 ; %7D%0A   p
@@ -2033,29 +2033,22 @@
  public 
-Organizations
+String
  getOrga
@@ -2090,160 +2090,18 @@
 ions
-; %7D%0A   public SleepTimes getSleepTimes() %7B return this.sleepTimes; %7D%0A%0A   // All 'Set' Methods%0A   public void setGender(Gender g) %7B this.gender.s
+.g
 etValue(
 g); 
@@ -2096,17 +2096,16 @@
 etValue(
-g
 ); %7D%0A   
@@ -2115,448 +2115,61 @@
 lic 
-void setMajor(Major m) %7B this.major = m; %7D%0A   public void setReligion(Religion r) %7B this.religion = r; %7D%0A   public void setSubstances(Substances s) %7B this.substances = s; %7D%0A   public void setNoise(Noise n) %7B this.noise = n; %7D%0A   public void setCleanliness(Cleanliness c) %7B this.cleanliness = c; %7D%0A   public void setOrganizations(Organizations o) %7B this.organizations = o; %7D%0A   public void setSleepTimes(SleepTimes st) %7B this.sleepTimes = st
+int getSleepTime() %7B return this.sleepTime.getValue()
 ; %7D%0A

Update Person.java